fix(test): Fix template tests

fuhlig1 · fuhlig1 · commit 9dc1422c0183 · 2025-10-11T12:25:59.000+02:00
Correct errors in the build system.
Correct errors in the code.
diff --git a/cmake/modules/FairMacros.cmake b/cmake/modules/FairMacros.cmake
@@ -343,6 +343,7 @@ IF(FAIRROOT_FOUND)
   Set(SYSTEM_INCLUDE_DIRECTORIES
     ${ROOT_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
+    ${VMC_INCLUDE_DIRS}
   )
   Set(ROOT_INCLUDE_PATH
       ${FAIRROOT_INCLUDE_DIR}
diff --git a/templates/project_root_containers/CMakeLists.txt b/templates/project_root_containers/CMakeLists.txt
@@ -94,6 +94,12 @@ if(SIMPATH)
 endif()
 
 find_package2(PUBLIC ROOT  VERSION 6.10.00  REQUIRED)
+if(ROOT_vmc_FOUND)
+  set(VMCLIB ROOT::VMC)
+else()
+  find_package2(PUBLIC VMC REQUIRED)
+  set(VMCLIB VMCLibrary)
+endif()
 find_package2(PUBLIC FairLogger  VERSION 1.2.0 REQUIRED)
 find_package2(PUBLIC Pythia6)
 find_package2(PUBLIC Pythia8)
diff --git a/templates/project_root_containers/MyProjData/CMakeLists.txt b/templates/project_root_containers/MyProjData/CMakeLists.txt
@@ -25,7 +25,7 @@ MyProjMCTrack.cxx
 Set(HEADERS )
 Set(LINKDEF MCStackLinkDef.h)
 Set(LIBRARY_NAME MyProjData)
-Set(DEPENDENCIES Base EG Physics Core)
+Set(DEPENDENCIES Base EG Physics Core ${VMCLIB} FairLogger)
 
 GENERATE_LIBRARY()
 
diff --git a/templates/project_root_containers/NewDetector/CMakeLists.txt b/templates/project_root_containers/NewDetector/CMakeLists.txt
@@ -40,7 +40,12 @@ NewDetectorPoint.cxx
 Set(LINKDEF NewDetectorLinkDef.h)
 Set(LIBRARY_NAME NewDetector)
 Set(DEPENDENCIES
+    MyProjData
     Base
+    GeoBase
+    ParBase
+    Core
+    ${VMCLIB}
 )
 
 GENERATE_LIBRARY()
diff --git a/templates/project_root_containers/NewDetector/NewDetector.cxx b/templates/project_root_containers/NewDetector/NewDetector.cxx
@@ -149,7 +149,7 @@ void NewDetector::Register()
   */
 
     if (!TVirtualMC::GetMC()->IsMT()) {
-        GetRootManager().Register("NewDetectorPoint", "NewDetector", fNewDetectorPointCollection, kTRUE);
+        FairRootManager::Instance()->Register("NewDetectorPoint", "NewDetector", fNewDetectorPointCollection, kTRUE);
     } else {
         FairRootManager::Instance()->RegisterAny("NewDetectorPoint", fNewDetectorPointCollection, kTRUE);
     }
diff --git a/templates/project_root_containers/field/CMakeLists.txt b/templates/project_root_containers/field/CMakeLists.txt
@@ -28,6 +28,9 @@ set(LINKDEF FieldLinkDef.h)
 Set(LIBRARY_NAME Field)
 Set(DEPENDENCIES
     Base 
+    ParBase
+    FairLogger
+    Core
 )
 
 GENERATE_LIBRARY()
diff --git a/templates/project_root_containers/passive/CMakeLists.txt b/templates/project_root_containers/passive/CMakeLists.txt
@@ -29,6 +29,6 @@ MyPassiveContFact.cxx
 Set(HEADERS )
 Set(LINKDEF PassiveLinkDef.h)
 Set(LIBRARY_NAME Passive)
-Set(DEPENDENCIES Base GeoBase ParBase Geom Core)
+Set(DEPENDENCIES Base GeoBase ParBase Geom Core FairLogger)
 
 GENERATE_LIBRARY()
diff --git a/templates/project_stl_containers/CMakeLists.txt b/templates/project_stl_containers/CMakeLists.txt
@@ -94,6 +94,12 @@ if(SIMPATH)
 endif()
 
 find_package2(PUBLIC ROOT  VERSION 6.10.00  REQUIRED)
+if(ROOT_vmc_FOUND)
+  set(VMCLIB ROOT::VMC)
+else()
+  find_package2(PUBLIC VMC REQUIRED)
+  set(VMCLIB VMCLibrary)
+endif()
 find_package2(PUBLIC FairLogger  VERSION 1.2.0 REQUIRED)
 find_package2(PUBLIC Pythia6)
 find_package2(PUBLIC Pythia8)
diff --git a/templates/project_stl_containers/MyProjData/CMakeLists.txt b/templates/project_stl_containers/MyProjData/CMakeLists.txt
@@ -25,7 +25,7 @@ MyProjMCTrack.cxx
 Set(HEADERS )
 Set(LINKDEF MCStackLinkDef.h)
 Set(LIBRARY_NAME MyProjData)
-Set(DEPENDENCIES Base EG Physics Core)
+Set(DEPENDENCIES Base EG Physics Core ${VMCLIB} FairLogger)
 
 GENERATE_LIBRARY()
 
diff --git a/templates/project_stl_containers/NewDetector/CMakeLists.txt b/templates/project_stl_containers/NewDetector/CMakeLists.txt
@@ -40,7 +40,12 @@ NewDetectorPoint.cxx
 Set(LINKDEF NewDetectorLinkDef.h)
 Set(LIBRARY_NAME NewDetector)
 Set(DEPENDENCIES
+    MyProjData
     Base
+    GeoBase
+    ParBase
+    Core
+    ${VMCLIB}
 )
 
 GENERATE_LIBRARY()
diff --git a/templates/project_stl_containers/NewDetector/NewDetectorPoint.cxx b/templates/project_stl_containers/NewDetector/NewDetectorPoint.cxx
@@ -14,7 +14,6 @@ using std::endl;
 // -----   Default constructor   -------------------------------------------
 NewDetectorPoint::NewDetectorPoint()
     : fTrackID(0)
-    , fEventId(0)
     , fPx(0.)
     , fPy(0.)
     , fPz(0.)
@@ -30,15 +29,13 @@ NewDetectorPoint::NewDetectorPoint()
 
 // -----   Standard constructor   ------------------------------------------
 NewDetectorPoint::NewDetectorPoint(Int_t trackID,
-                                   uint32_t evtId,
                                    Int_t detID,
                                    TVector3 pos,
                                    TVector3 mom,
                                    Double_t tof,
                                    Double_t length,
                                    Double_t eLoss)
     : fTrackID(trackID)
-    , fEventId(evtId)
     , fPx(mom.X())
     , fPy(mom.Y())
     , fPz(mom.Z())
diff --git a/templates/project_stl_containers/NewDetector/NewDetectorPoint.h b/templates/project_stl_containers/NewDetector/NewDetectorPoint.h
@@ -41,7 +41,6 @@ class NewDetectorPoint
     virtual void Print(const Option_t* opt) const;
 
     /** Accessors */
-    uint32_t GetEventID() const { return fEventId; }   /// event identifier
     int GetTrackID() const { return fTrackID; }
     double GetPx() const { return fPx; }
     double GetPy() const { return fPy; }
@@ -57,7 +56,6 @@ class NewDetectorPoint
     void Position(TVector3& pos) const { pos.SetXYZ(fX, fY, fZ); }
 
     /** Modifiers **/
-    void SetEventID(uint32_t eventId) { fEventId = eventId; }
     virtual void SetTrackID(int id) { fTrackID = id; }
     void SetTime(double time) { fTime = time; }
     void SetLength(double length) { fLength = length; }
@@ -72,7 +70,6 @@ class NewDetectorPoint
 
   protected:
     int fTrackID;           ///< Track index
-    uint32_t fEventId;      ///< MC Event id
     double fPx, fPy, fPz;   ///< Momentum components [GeV]
     double fTime;           ///< Time since event start [ns]
     double fLength;         ///< Track length since creation [cm]
diff --git a/templates/project_stl_containers/field/CMakeLists.txt b/templates/project_stl_containers/field/CMakeLists.txt
@@ -28,6 +28,9 @@ set(LINKDEF FieldLinkDef.h)
 Set(LIBRARY_NAME Field)
 Set(DEPENDENCIES
     Base 
+    ParBase
+    FairLogger
+    Core
 )
 
 GENERATE_LIBRARY()
diff --git a/templates/project_stl_containers/passive/CMakeLists.txt b/templates/project_stl_containers/passive/CMakeLists.txt
@@ -29,6 +29,6 @@ MyPassiveContFact.cxx
 Set(HEADERS )
 Set(LINKDEF PassiveLinkDef.h)
 Set(LIBRARY_NAME Passive)
-Set(DEPENDENCIES Base GeoBase ParBase Geom Core)
+Set(DEPENDENCIES Base GeoBase ParBase Geom Core FairLogger)
 
 GENERATE_LIBRARY()

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,7 @@ IF(FAIRROOT_FOUND)`
`343`	`343`	`Set(SYSTEM_INCLUDE_DIRECTORIES`
`344`	`344`	`${ROOT_INCLUDE_DIR}`
`345`	`345`	`${Boost_INCLUDE_DIRS}`
	`346`	`+ ${VMC_INCLUDE_DIRS}`
`346`	`347`	`)`
`347`	`348`	`Set(ROOT_INCLUDE_PATH`
`348`	`349`	`${FAIRROOT_INCLUDE_DIR}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ void NewDetector::Register()`
`149`	`149`	`*/`
`150`	`150`
`151`	`151`	`if (!TVirtualMC::GetMC()->IsMT()) {`
`152`		`- GetRootManager().Register("NewDetectorPoint", "NewDetector", fNewDetectorPointCollection, kTRUE);`
	`152`	`+ FairRootManager::Instance()->Register("NewDetectorPoint", "NewDetector", fNewDetectorPointCollection, kTRUE);`
`153`	`153`	`} else {`
`154`	`154`	`FairRootManager::Instance()->RegisterAny("NewDetectorPoint", fNewDetectorPointCollection, kTRUE);`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ set(LINKDEF FieldLinkDef.h)`
`28`	`28`	`Set(LIBRARY_NAME Field)`
`29`	`29`	`Set(DEPENDENCIES`
`30`	`30`	`Base`
	`31`	`+ ParBase`
	`32`	`+ FairLogger`
	`33`	`+ Core`
`31`	`34`	`)`
`32`	`35`
`33`	`36`	`GENERATE_LIBRARY()`