From 0a9ce94cee638797e76099840cb751a3762f113f Mon Sep 17 00:00:00 2001
From: Lorenzo Moneta <Lorenzo.Moneta@cern.ch>
Date: Wed, 28 Nov 2007 14:59:55 +0000
Subject: [PATCH] fix test also for using Reflex. CINT dictionaries must not be
loaded in that case
git-svn-id: http://root.cern.ch/svn/root/trunk@21093 27541ba8-7e3a-0410-8455-c3a389f83636
---
test/Makefile | 4 ++--
test/TrackMathCore.h | 7 +++++++
test/TrackMathCoreRflx.xml | 15 +++++++++++++--
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/test/Makefile b/test/Makefile
index a56bedb81f9..9f76896c507 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -75,8 +75,8 @@ STRESSVEC = stressVector$(ExeSuf)
ifneq ($(USE_REFLEX),)
CXXFLAGS += -DUSE_REFLEX
-STRESSMATHO = stressMathCore.$(ObjSuf) TrackMathCoreCint.$(ObjSuf) TrackMathCoreRflx.$(ObjSuf)
-STRESSMATHS = stressMathCore.$(SrcSuf) TrackMathCoreCint.$(SrcSuf) TrackMathCoreRflx.$(SrcSuf)
+STRESSMATHO = stressMathCore.$(ObjSuf) TrackMathCoreRflx.$(ObjSuf)
+STRESSMATHS = stressMathCore.$(SrcSuf) TrackMathCoreRflx.$(SrcSuf)
ifeq ($(PLATFORM),win32)
STRESSMATHLIBS = '$(ROOTSYS)/lib/libMathCore.lib' '$(ROOTSYS)/lib/libReflex.lib' '$(ROOTSYS)/lib/libCintex.lib'
else
diff --git a/test/TrackMathCore.h b/test/TrackMathCore.h
index c0ebc1ce938..5c25f33f9b3 100644
--- a/test/TrackMathCore.h
+++ b/test/TrackMathCore.h
@@ -349,3 +349,10 @@ private:
std::vector<T> fTrks;
};
+
+// for instantiating the template VecTrackD class for reflex
+struct Dummy {
+
+ VecTrack<TrackD> v1;
+ VecTrack<TrackErrD> v2;
+};
diff --git a/test/TrackMathCoreRflx.xml b/test/TrackMathCoreRflx.xml
index 3d940b1907a..3fee98d9f41 100644
--- a/test/TrackMathCoreRflx.xml
+++ b/test/TrackMathCoreRflx.xml
@@ -39,15 +39,26 @@
<class name ="TrackD">
</class>
+<class name ="TrackErrD">
+</class>
+
<class name ="TrackD32">
<field name="fPos" iotype="ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<Double32_t>,ROOT::Math::DefaultCoordinateSystemTag>" />
<field name="fVec" iotype="ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<Double32_t> >" />
+</class>
+
+ <class name ="TrackErrD32">
+ <field name="fPos" iotype="ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<Double32_t>,ROOT::Math::DefaultCoordinateSystemTag>" />
+ <field name="fVec" iotype="ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<Double32_t> >" />
<field name="fMat" iotype="ROOT::Math::SMatrix<Double32_t,4,4,ROOT::Math::MatRepStd<Double32_t,4,4> >" />
<field name="fSymMat" iotype="ROOT::Math::SMatrix<Double32_t,6,6,ROOT::Math::MatRepSym<Double32_t,6> >" />
</class>
-<class pattern="std::vector<TrackD*>" />
-<class name="VecTrackD" />
+<class name="std::vector<TrackD>" />
+<class name="std::vector<TrackErrD>" />
+
+<class name="VecTrack<TrackD>" />
+<class name="VecTrack<TrackErrD>" />
</lcgdict>
--
GitLab