refactor(Base): Introduce FairGeoLoader::LoadAndCreate

... and use it around

Author: ChristianTackeGSI

examples/common/passive/FairCave.cxx

@@ -9,7 +9,6 @@
 #include "FairCave.h"
 
 #include "FairGeoCave.h"         // for FairGeoCave
-#include "FairGeoInterface.h"    // for FairGeoInterface
 #include "FairGeoLoader.h"       // for FairGeoLoader
 #include "FairGeoNode.h"         // for FairGeoNode
 #include "FairGeoPassivePar.h"   // for FairGeoPassivePar
@@ -24,17 +23,9 @@
 
 void FairCave::ConstructGeometry()
 {
-    FairGeoLoader& loader = GetGeometryLoader();
-    FairGeoInterface* GeoInterface = loader.getGeoInterface();
-    FairGeoCave* MGeo = new FairGeoCave();
-    MGeo->setGeomFile(GetGeometryFileName());
-    GeoInterface->addGeoModule(MGeo);
-    Bool_t rc = GeoInterface->readSet(MGeo);
-    if (rc) {
-        MGeo->create(loader.getGeoBuilder());
-    }
+    FairGeoSet& MGeo = GetGeometryLoader().LoadAndCreate<FairGeoCave>(GetGeometryFileName());
 
-    TList* volList = MGeo->getListOfVolumes();
+    TList* volList = MGeo.getListOfVolumes();
     // store geo parameter
     FairRun* fRun = FairRun::Instance();
     FairRuntimeDb* rtdb = FairRun::Instance()->GetRuntimeDb();

fairroot/base/sim/FairModule.h

@@ -11,8 +11,8 @@
 #include "FairGeoInterface.h"   // for FairGeoInterface
 #include "FairGeoLoader.h"      // for FairGeoLoader
 #include "FairGeoNode.h"        // for FairGeoNode
-#include "FairGeoVolume.h"      // for FairGeoVolume
-#include "FairLogger.h"
+#include "FairGeoSet.h"
+#include "FairGeoVolume.h"
 #include "FairRun.h"         // for FairRun
 #include "FairRuntimeDb.h"   // for FairRuntimeDb
 
@@ -26,7 +26,10 @@
 #include <TRefArray.h>   // for TRefArray
 #include <TString.h>     // for TString, operator!=
 #include <TVirtualMC.h>
+#include <fairlogger/Logger.h>
 #include <string>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
 class FairRunSim;
@@ -197,24 +200,17 @@ class FairModule : public TNamed
 template<class T, class U>
 void FairModule::ConstructASCIIGeometry(TString containerName)
 {
-    FairGeoLoader& loader = GetGeometryLoader();
-    FairGeoInterface* GeoInterface = loader.getGeoInterface();
-    T* MGeo = new T();
-    MGeo->print();
-    MGeo->setGeomFile(GetGeometryFileName());
-    GeoInterface->addGeoModule(MGeo);   // takes ownership!
-    Bool_t rc = GeoInterface->readSet(MGeo);
-    if (rc) {
-        MGeo->create(loader.getGeoBuilder());
-    }
+    static_assert(std::is_base_of_v<FairGeoSet, T>);
+    static_assert(std::is_base_of_v<FairParSet, U>);
+    FairGeoSet& MGeo = GetGeometryLoader().LoadAndCreate<T>(GetGeometryFileName());
 
-    TList* volList = MGeo->getListOfVolumes();
+    TList* volList = MGeo.getListOfVolumes();
     // store geo parameter
     FairRun* fRun = FairRun::Instance();
     FairRuntimeDb* rtdb = FairRun::Instance()->GetRuntimeDb();
 
     if ("" != containerName) {
-        LOG(info) << "Add GeoNodes for " << MGeo->getDescription() << " to container " << containerName;
+        LOG(info) << "Add GeoNodes for " << MGeo.getDescription() << " to container " << containerName;
 
         //    U par=(U)(rtdb->getContainer(containerName));
         U* par = static_cast<U*>(rtdb->getContainer(containerName));

fairroot/geobase/FairGeoLoader.h

@@ -17,6 +17,7 @@
 #define FairGeoLOADER_H
 
 #include "FairGeoInterface.h"
+#include "FairGeoSet.h"
 
 #include <Rtypes.h>   // for FairGeoLoader::Class, etc
 #include <TNamed.h>   // for TNamed
@@ -41,6 +42,12 @@ class FairGeoLoader : public TNamed
     /** static access method*/
     static FairGeoLoader* Instance();
 
+    /**
+     * \brief Even more low level helper function for creating goemetry
+     */
+    template<class T, class... Args>
+    FairGeoSet& LoadAndCreate(const char* geomfile, Args&&... args);
+
   private:
     FairGeoLoader(const FairGeoLoader&);
     FairGeoLoader& operator=(const FairGeoLoader&);
@@ -57,4 +64,19 @@ class FairGeoLoader : public TNamed
     ClassDefOverride(FairGeoLoader, 0);
 };
 
+template<class T, class... Args>
+FairGeoSet& FairGeoLoader::LoadAndCreate(const char* geomfile, Args&&... args)
+{
+    static_assert(std::is_base_of_v<FairGeoSet, T>);
+    FairGeoSet* MGeo = new T(std::forward<Args>(args)...);
+    MGeo->print();
+    MGeo->setGeomFile(geomfile);
+    fInterface.addGeoModule(MGeo);   // takes ownership!
+    Bool_t rc = fInterface.readSet(MGeo);
+    if (rc) {
+        MGeo->create(fGeoBuilder.get());
+    }
+    return *MGeo;
+}
+
 #endif

templates/project_root_containers/passive/MyCave.cxx

@@ -12,7 +12,6 @@
 // -------------------------------------------------------------------------
 #include "MyCave.h"
 
-#include "FairGeoInterface.h"   // for FairGeoInterface
 #include "FairGeoLoader.h"      // for FairGeoLoader
 #include "FairGeoNode.h"        // for FairGeoNode
 #include "FairGeoVolume.h"      // for FairGeoVolume
@@ -27,16 +26,9 @@
 
 void MyCave::ConstructGeometry()
 {
-    FairGeoLoader& loader = GetGeometryLoader();
-    FairGeoInterface* GeoInterface = loader.getGeoInterface();
-    MyGeoCave* MGeo = new MyGeoCave();
-    MGeo->setGeomFile(GetGeometryFileName());
-    GeoInterface->addGeoModule(MGeo);
-    Bool_t rc = GeoInterface->readSet(MGeo);
-    if (rc) {
-        MGeo->create(loader.getGeoBuilder());
-    }
+    GetGeometryLoader().LoadAndCreate<MyGeoCave>(GetGeometryFileName());
 }
+
 MyCave::MyCave()
     : FairModule()
 {}

templates/project_stl_containers/passive/MyCave.cxx

@@ -12,7 +12,6 @@
 // -------------------------------------------------------------------------
 #include "MyCave.h"
 
-#include "FairGeoInterface.h"   // for FairGeoInterface
 #include "FairGeoLoader.h"      // for FairGeoLoader
 #include "FairGeoNode.h"        // for FairGeoNode
 #include "FairGeoVolume.h"      // for FairGeoVolume
@@ -27,16 +26,9 @@
 
 void MyCave::ConstructGeometry()
 {
-    FairGeoLoader& loader = GetGeometryLoader();
-    FairGeoInterface* GeoInterface = loader.getGeoInterface();
-    MyGeoCave* MGeo = new MyGeoCave();
-    MGeo->setGeomFile(GetGeometryFileName());
-    GeoInterface->addGeoModule(MGeo);
-    Bool_t rc = GeoInterface->readSet(MGeo);
-    if (rc) {
-        MGeo->create(loader.getGeoBuilder());
-    }
+    GetGeometryLoader().LoadAndCreate<MyGeoCave>(GetGeometryFileName());
 }
+
 MyCave::MyCave()
     : FairModule()
 {}