FairRunSim: Do not leak fLoaderName

ChristianTackeGSI · karabowi · commit 925099e3f9e1 · 2023-02-03T17:00:00.000+01:00
fLoaderName was not deleted in the destructor. Rewrite it using value semantics. (cherry picked from commit 5681010)
diff --git a/base/steer/FairRunSim.cxx b/base/steer/FairRunSim.cxx
@@ -57,7 +57,6 @@ FairRunSim::FairRunSim(Bool_t isMaster)
     , ListOfModules(new TObjArray())
     , MatFname("")
     , fStoreTraj(kFALSE)
-    , fLoaderName(new TString("TGeo"))
     , fPythiaDecayer(kFALSE)
     , fPythiaDecayerConfig("")
     , fUserDecay(kFALSE)
@@ -152,7 +151,7 @@ void FairRunSim::Init()
     //  fOutFile=fRootManager->OpenOutFile(fOutname);
     LOG(info) << "==============  FairRunSim: Initialising simulation run ==============";
 
-    FairGeoLoader* loader = new FairGeoLoader(fLoaderName->Data(), "Geo Loader");
+    auto loader = new FairGeoLoader(fLoaderName.Data(), "Geo Loader");
     FairGeoInterface* GeoInterFace = loader->getGeoInterface();
     GeoInterFace->SetNoOfSets(ListOfModules->GetEntries());
     GeoInterFace->setMediaFile(MatFname.Data());
@@ -342,11 +341,10 @@ void FairRunSim::SetMaterials(const char* MatFileName)
     LOG(info) << "Media file used: " << MatFname.Data();
 }
 
-void FairRunSim::SetGeoModel(char* name)
+void FairRunSim::SetGeoModel(const char* name)
 {
-    if (strncmp(fName, "TGeant3", 7) == 0) {
-        delete fLoaderName;
-        fLoaderName = new TString(name);
+    if (fName == "TGeant3") {
+        fLoaderName = name;
         LOG(info) << "FairRun::SetGeoModel(): G3 native geometry model used ";
     } else {
         LOG(info) << "FairRun::SetGeoModel(): Geant3 MC engine only !";
diff --git a/base/steer/FairRunSim.h b/base/steer/FairRunSim.h
@@ -29,7 +29,8 @@ class FairModule;
 class FairPrimaryGenerator;
 
 /**
- * Configure the Simulation session
+ * \brief Configure the Simulation session
+ * \ingroup base_steer
  * @author M. Al-Turany  D. Bertini
  * @version 0.1
  * @since 12.01.04
@@ -105,10 +106,10 @@ class FairRunSim : public FairRun
     }
 
     /**Set geometry builder*/
-    void SetGeoModel(char* name);
+    void SetGeoModel(const char* name);
 
     /**return the geometry loader used in this session*/
-    TString* GetGeoModel() { return fLoaderName; }
+    TString* GetGeoModel() { return &fLoaderName; }
 
     /**Get the field used in simulation*/
     FairField* GetField() override { return fField; }
@@ -229,7 +230,7 @@ class FairRunSim : public FairRun
     TObjArray* ListOfModules;                       //!                       /** Array of used modules */
     TString MatFname;                               //!                           /** Material file name */
     Bool_t fStoreTraj;                              //!                       /** Trajectory store flags */
-    TString* fLoaderName;                           //!                       /** Geometry Model (TGeo or G3)*/
+    TString fLoaderName{"TGeo"};                    //!< Geometry Model (TGeo or G3)
     Bool_t fPythiaDecayer;                          //!                    /** flag for using Pythia decayer*/
     TString fPythiaDecayerConfig;                   //!               /** Macro for Pythia decay configuration*/
     Bool_t fUserDecay;                              /** flag for setting user decay */
