Use unique pointers for the simulation config

Changes the FairGenericVMCConfig and FairRunSim,
as well as macros/files using the config.

Author: karabowi

base/sim/FairGenericVMCConfig.cxx

@@ -21,6 +21,11 @@ FairGenericVMCConfig::FairGenericVMCConfig()
     , fPostInitName("g4ConfigPostInit.C")
 {}
 
+FairGenericVMCConfig::FairGenericVMCConfig(const FairGenericVMCConfig& config)
+    : fPostInitFlag(config.fPostInitFlag)
+    , fPostInitName(config.fPostInitName)
+{}
+
 FairGenericVMCConfig::~FairGenericVMCConfig() {}
 
 void FairGenericVMCConfig::Setup(const char* mcEngine)

base/sim/FairGenericVMCConfig.h

@@ -19,6 +19,7 @@ class FairGenericVMCConfig
 {
   public:
     FairGenericVMCConfig();
+    FairGenericVMCConfig(const FairGenericVMCConfig& config);
     virtual ~FairGenericVMCConfig();
 
     virtual void Setup(const char* mcEngine);

base/steer/FairRunSim.cxx

@@ -74,8 +74,6 @@ FairRunSim::FairRunSim(Bool_t isMaster)
     , fUserCuts("SetCuts.C")
     , fIsMT(kFALSE)
     , fImportTGeoToVMC(kTRUE)
-    , fSimulationConfig(nullptr)
-
 {
     if (fginstance) {
         Fatal("FairRun", "Singleton instance already exists.");
@@ -290,7 +288,7 @@ void FairRunSim::SetMCConfig()
         fSimSetup();
     } else {
         if (fSimulationConfig == nullptr)   // RKRKRK COMMENT
-            fSimulationConfig = new FairGenericVMCConfig();
+            fSimulationConfig = std::make_unique<FairGenericVMCConfig>();
         fSimulationConfig->Setup(GetName());
     }
 

base/steer/FairRunSim.h

@@ -8,10 +8,11 @@
 #ifndef FAIRRUNSIM_H
 #define FAIRRUNSIM_H
 
-#include "FairIon.h"             // for FairIon
-#include "FairMCApplication.h"   // for FairMCApplication
-#include "FairParticle.h"        // for FairParticle
-#include "FairRun.h"             // for FairRun
+#include "FairGenericVMCConfig.h"   // for FairGenericVMCConfig
+#include "FairIon.h"                // for FairIon
+#include "FairMCApplication.h"      // for FairMCApplication
+#include "FairParticle.h"           // for FairParticle
+#include "FairRun.h"                // for FairRun
 
 #include <Rtypes.h>      // for Bool_t, Double_t, Int_t, etc
 #include <TMCtls.h>      // for multi-threading
@@ -24,7 +25,6 @@ class FairMCEventHeader;
 class FairMesh;
 class FairModule;
 class FairPrimaryGenerator;
-class FairGenericVMCConfig;
 
 /**
  * Configure the Simulation session
@@ -178,8 +178,8 @@ class FairRunSim : public FairRun
         fUseSimSetupPostInitFunction = true;
     }
 
-    void SetSimulationConfig(FairGenericVMCConfig* tconf) { fSimulationConfig = tconf; }
-    FairGenericVMCConfig* GetSimulationConfig() { return fSimulationConfig; }
+    void SetSimulationConfig(std::unique_ptr<FairGenericVMCConfig>&& tconf) { fSimulationConfig = std::move(tconf); }
+    FairGenericVMCConfig* GetSimulationConfig() { return fSimulationConfig.get(); }
 
     void SetIsMT(Bool_t isMT) { fIsMT = isMT; }
     Bool_t IsMT() const { return fIsMT; }
@@ -234,7 +234,7 @@ class FairRunSim : public FairRun
     std::function<void()> fSimSetupPostInit;   //!                          /** A user provided function to do sim setup
                                                //!                          / instead of using macros **/
     bool fUseSimSetupPostInitFunction = false;
-    FairGenericVMCConfig* fSimulationConfig;   //!                 /** Simulation configuration */
+    std::unique_ptr<FairGenericVMCConfig> fSimulationConfig{};   //!        /** Simulation configuration */
 
     ClassDefOverride(FairRunSim, 2);
 };

examples/MQ/pixelDetector/macros/run_sim.C

@@ -61,8 +61,8 @@ void run_sim(Int_t nEvents = 10, TString mcEngine = "TGeant3", Int_t fileId = 0,
     // -----   Create simulation run   ----------------------------------------
     auto run = std::make_unique<FairRunSim>();
     run->SetName(mcEngine);   // Transport engine
-    run->SetSimulationConfig(new FairVMCConfig());
-    run->SetIsMT(isMT);       // Multi-threading mode (Geant4 only)
+    run->SetSimulationConfig(std::make_unique<FairVMCConfig>());
+    run->SetIsMT(isMT);   // Multi-threading mode (Geant4 only)
     run->SetSink(std::make_unique<FairRootFileSink>(outFile));
     FairRuntimeDb* rtdb = run->GetRuntimeDb();
     // ------------------------------------------------------------------------

examples/MQ/pixelDetector/src/devices/FairMQSimDevice.cxx

@@ -60,7 +60,7 @@ void FairMQSimDevice::InitTask()
     }
 
     fRunSim->SetName(fTransportName.data());
-    fRunSim->SetSimulationConfig(new FairVMCConfig());
+    fRunSim->SetSimulationConfig(std::make_unique<FairVMCConfig>());
     fRunSim->SetIsMT(kFALSE);
 
     if (fUserConfig.Length() > 0)
@@ -88,10 +88,11 @@ void FairMQSimDevice::InitializeRun()
     // -----      ask the fParamMQServer   ------------------------------------
     // -----      receive the run number and sampler id   ---------------------
     std::string* askForRunNumber = new std::string("ReportSimDevice");
-    auto req(NewMessage(const_cast<char*>(askForRunNumber->c_str()),
-                        askForRunNumber->length(),
-                        [](void* /*data*/, void* object) { delete static_cast<std::string*>(object); },
-                        askForRunNumber));
+    auto req(NewMessage(
+        const_cast<char*>(askForRunNumber->c_str()),
+        askForRunNumber->length(),
+        [](void* /*data*/, void* object) { delete static_cast<std::string*>(object); },
+        askForRunNumber));
     auto rep(NewMessage());
 
     unsigned int runId = 0;

examples/advanced/Tutorial3/macro/run_sim.C

@@ -35,7 +35,7 @@ void run_sim(Int_t nEvents = 100, TString mcEngine = "TGeant3")
     // ------------------------
 
     fRun->SetName(mcEngine);
-    fRun->SetSimulationConfig(new FairVMCConfig());
+    fRun->SetSimulationConfig(std::make_unique<FairVMCConfig>());
 
     TString outFile = "data/testrun_";
     outFile = outFile + mcEngine + ".root";

examples/advanced/Tutorial3/macro/run_sim_sep.C

@@ -23,7 +23,7 @@ void run_sim_sep(Int_t fileId, Int_t nEvents = 1000, TString mcEngine = "TGeant3
     // ------------------------
 
     fRun->SetName(mcEngine);
-    fRun->SetSimulationConfig(new FairVMCConfig());
+    fRun->SetSimulationConfig(std::make_unique<FairVMCConfig>());
 
     TString outfile = Form("data/testrun_%s_f%d.root", mcEngine.Data(), fileId);
     TString outparam = Form("data/testpar_%s_f%d.root", mcEngine.Data(), fileId);

examples/advanced/propagator/macros/runMC.C

@@ -57,8 +57,8 @@ int runMC(Int_t nEvents = 1000, TString mcEngine = "TGeant4", Bool_t isMT = fals
     // -----   Create simulation run   ----------------------------------------
     FairRunSim* run = new FairRunSim();
     run->SetName(mcEngine);   // Transport engine
-    run->SetSimulationConfig(new FairVMCConfig());
-    run->SetIsMT(isMT);                            // Multi-threading mode (Geant4 only)
+    run->SetSimulationConfig(std::make_unique<FairVMCConfig>());
+    run->SetIsMT(isMT);   // Multi-threading mode (Geant4 only)
     run->SetSink(std::make_unique<FairRootFileSink>(outFile));
     FairRuntimeDb* rtdb = run->GetRuntimeDb();
     // ------------------------------------------------------------------------

examples/advanced/propagator/macros/runMM.C

@@ -43,7 +43,7 @@ int runMM(Int_t nEvents = 1000, TString mcEngine = "TGeant4", Bool_t isMT = fals
     // -----   Create simulation run   ----------------------------------------
     FairRunSim* run = new FairRunSim();
     run->SetName(mcEngine);   // Transport engine
-    run->SetSimulationConfig(new FairVMCConfig());
+    run->SetSimulationConfig(make_unique<FairVMCConfig>());
     run->SetIsMT(isMT);                            // Multi-threading mode (Geant4 only)
     run->SetSink(new FairRootFileSink(outFile));   // Output file
     FairRuntimeDb* rtdb = run->GetRuntimeDb();
@@ -74,7 +74,7 @@ int runMM(Int_t nEvents = 1000, TString mcEngine = "TGeant4", Bool_t isMT = fals
     FairBoxGenerator* pionBoxGen = new FairBoxGenerator(211, 2);
 
     pionBoxGen->SetThetaRange(0, 30);
-    pionBoxGen->SetPRange(1.,3.);
+    pionBoxGen->SetPRange(1., 3.);
 
     pionBoxGen->SetPhiRange(0., 360.);   // 10.,10. when looking for PCA
     pionBoxGen->SetDebug(kTRUE);
@@ -84,7 +84,7 @@ int runMM(Int_t nEvents = 1000, TString mcEngine = "TGeant4", Bool_t isMT = fals
     FairBoxGenerator* muonBoxGen = new FairBoxGenerator(13, 2);
 
     muonBoxGen->SetThetaRange(0, 30);
-    muonBoxGen->SetPRange(1.,3.);
+    muonBoxGen->SetPRange(1., 3.);
     muonBoxGen->SetPhiRange(0., 360.);   // 10.,10. when looking for PCA
     muonBoxGen->SetDebug(kTRUE);