fix multiple leaks in FairMCApplication

Turned multiple member variables from raw pointers to
unique_ptrs so that the allocated objects get destructed at
destruction of FMCA.

Allocation of FairTrajFilter also moved from FairRunSim to
FMCA and that way avoids the ::Instance methods.

Also turned one member variable into a valued member to
simplify some code.

Author: ChristianTackeGSI

fairroot/base/sim/FairMCApplication.cxx

@@ -55,24 +55,21 @@
 #include <TObject.h>            // for TObject
 #include <TParticlePDG.h>       // for TParticlePDG
 #include <TROOT.h>              // for TROOT, gROOT
-#include <TRefArray.h>          // for TRefArray
 #include <TSystem.h>            // for TSystem, gSystem
 #include <TVirtualMC.h>         // for TVirtualMC
 #include <TVirtualMCStack.h>    // for TVirtualMCStack
-class TParticle;
+#include <cfloat>               // for DBL_MAX
+#include <cstdlib>              // for getenv, exit
+#include <mutex>                // std::mutex
+#include <utility>              // for pair, move
 
-#include <float.h>    // for DBL_MAX
-#include <mutex>      // std::mutex
-#include <stdlib.h>   // for getenv, exit
-#include <utility>    // for pair, move
-std::mutex mtx;       // mutex for critical section
+std::mutex mtx;   // mutex for critical section
 
 using std::pair;
 
 //_____________________________________________________________________________
 FairMCApplication::FairMCApplication(const char* name, const char* title, TObjArray* ModList, const char*)
     : TVirtualMCApplication(name, title)
-    , fActiveDetectors(nullptr)
     , fFairTaskList(nullptr)
     , fModules(ModList)
     , fPythiaDecayer(kFALSE)
@@ -81,18 +78,12 @@ FairMCApplication::FairMCApplication(const char* name, const char* title, TObjAr
     , fxField(nullptr)
     , fEvGen(nullptr)
     , fMcVersion(-1)
-    , fTrajFilter(nullptr)
-    , fTrajAccepted(kFALSE)
     , fUserDecay(kFALSE)
     , fUserDecayConfig("")
     , fDebug(kFALSE)
     , fVolMap()
     , fModVolMap()
     , fTrkPos(TLorentzVector(0, 0, 0, 0))
-    , fRadLength(kFALSE)
-    , fRadLenMan(nullptr)
-    , fRadMap(kFALSE)
-    , fRadMapMan(nullptr)
     , fEventHeader(nullptr)
     , fMCEventHeader(nullptr)
     , listActiveDetectors()
@@ -113,8 +104,6 @@ FairMCApplication::FairMCApplication(const char* name, const char* title, TObjAr
     LOG(debug) << "FairMCApplication-ctor " << this;
 
     fRootManager = &fRun->GetRootManager();
-    // Create and fill a list of active detectors
-    fActiveDetectors = new TRefArray();
 
     fListModules.reserve(fModules->GetEntriesFast());
     for (auto module : TRangeDynCast<FairModule>(fModules)) {
@@ -127,7 +116,7 @@ FairMCApplication::FairMCApplication(const char* name, const char* title, TObjAr
         if (detector) {
             listDetectors.push_back(detector);
             if (detector->IsActive()) {
-                fActiveDetectors->Add(detector);
+                fActiveDetectors.Add(detector);
                 listActiveDetectors.push_back(detector);
             }
         }
@@ -137,14 +126,12 @@ FairMCApplication::FairMCApplication(const char* name, const char* title, TObjAr
     fFairTaskList = new FairTask("Task List", 1);
     gROOT->GetListOfBrowsables()->Add(fFairTaskList);
     fMcVersion = -1;
-    // Initialise fTrajFilter pointer
-    fTrajFilter = nullptr;
 }
 
 //_____________________________________________________________________________
 FairMCApplication::FairMCApplication(const FairMCApplication& rhs, std::unique_ptr<FairRunSim> otherRunSim)
     : TVirtualMCApplication(rhs.GetName(), rhs.GetTitle())
-    , fActiveDetectors(nullptr)
+    , fParent(&rhs)
     , fFairTaskList(nullptr)
     , fModules(nullptr)
     , fPythiaDecayer(kFALSE)
@@ -153,18 +140,12 @@ FairMCApplication::FairMCApplication(const FairMCApplication& rhs, std::unique_p
     , fxField(rhs.fxField)
     , fEvGen(nullptr)
     , fMcVersion(rhs.fMcVersion)
-    , fTrajFilter(nullptr)
-    , fTrajAccepted(kFALSE)
     , fUserDecay(kFALSE)
     , fUserDecayConfig(rhs.fUserDecayConfig)
     , fDebug(rhs.fDebug)
     , fVolMap()
     , fModVolMap()
     , fTrkPos(rhs.fTrkPos)
-    , fRadLength(kFALSE)
-    , fRadLenMan(nullptr)
-    , fRadMap(kFALSE)
-    , fRadMapMan(nullptr)
     , fEventHeader(nullptr)
     , fMCEventHeader(nullptr)
     , listActiveDetectors()
@@ -182,7 +163,6 @@ FairMCApplication::FairMCApplication(const FairMCApplication& rhs, std::unique_p
 
     LOG(debug) << "FairMCApplication-copy-ctor " << this;
 
-    fParent = &rhs;
     fRun = fWorkerRunSim.get();
     fRootManager = &fRun->GetRootManager();
 
@@ -199,13 +179,12 @@ FairMCApplication::FairMCApplication(const FairMCApplication& rhs, std::unique_p
     }
 
     // Create and fill a list of active detectors
-    fActiveDetectors = new TRefArray();
     for (auto module : fListModules) {
         auto detector = dynamic_cast<FairDetector*>(module);
         if (detector) {
             listDetectors.push_back(detector);
             if (detector->IsActive()) {
-                fActiveDetectors->Add(detector);
+                fActiveDetectors.Add(detector);
                 listActiveDetectors.push_back(detector);
             }
         }
@@ -226,7 +205,6 @@ FairMCApplication::FairMCApplication(const FairMCApplication& rhs, std::unique_p
 //_____________________________________________________________________________
 FairMCApplication::FairMCApplication()
     : TVirtualMCApplication()
-    , fActiveDetectors(0)
     , fFairTaskList(0)
     , fModules(0)
     , fPythiaDecayer(kFALSE)
@@ -235,18 +213,12 @@ FairMCApplication::FairMCApplication()
     , fxField(0)
     , fEvGen(0)
     , fMcVersion(-1)
-    , fTrajFilter(nullptr)
-    , fTrajAccepted(kFALSE)
     , fUserDecay(kFALSE)
     , fUserDecayConfig("")
     , fDebug(kFALSE)
     , fVolMap()
     , fModVolMap()
     , fTrkPos(TLorentzVector(0, 0, 0, 0))
-    , fRadLength(kFALSE)
-    , fRadLenMan(nullptr)
-    , fRadMap(kFALSE)
-    , fRadMapMan(nullptr)
     , fEventHeader(nullptr)
     , fMCEventHeader(nullptr)
     , listActiveDetectors()
@@ -266,7 +238,6 @@ FairMCApplication::~FairMCApplication()
 {
     // Destructor
     //   LOG(debug3) << "Enter Destructor of FairMCApplication";
-    delete fActiveDetectors;   // don't do fActiveDetectors->Delete() here
     // the modules are already deleted in FairRunSim
     //  LOG(debug3) << "Leave Destructor of FairMCApplication";
     delete fMC;
@@ -306,7 +277,9 @@ void FairMCApplication::InitMC(const char*, const char*)
     } else {
         fMcVersion = 3;   // Geane
     }
-    fTrajFilter = FairTrajFilter::Instance();
+    if ((!fTrajFilter) && fRun->GetStoreTraj()) {
+        fTrajFilter = std::make_unique<FairTrajFilter>();
+    }
 
     LOG(info) << "Monte Carlo Engine Initialisation with: " << MCName.Data();
 }
@@ -319,7 +292,7 @@ void FairMCApplication::RunMC(Int_t nofEvents)
     fRunInfo.Reset();
 
     /** Set the list of active detectors to the stack*/
-    fStack->SetDetArrayList(fActiveDetectors);
+    fStack->SetDetArrayList(&fActiveDetectors);
 
     // MC run.
     fMC->ProcessRun(nofEvents);
@@ -436,7 +409,7 @@ void FairMCApplication::PreTrack()
     }
 
     fTrajAccepted = kFALSE;
-    if (nullptr != fTrajFilter) {
+    if (fTrajFilter) {
         // Get the pointer to current track
         TParticle* particle = fStack->GetCurrentTrack();
         //  LOG(debug) << " FairMCApplication::PreTrack(): " << particle;
@@ -466,12 +439,7 @@ TVirtualMCApplication* FairMCApplication::CloneForWorker() const
     workerRun->SetSink(std::unique_ptr<FairSink>{fRun->GetSink()->CloneSink()});
     workerRun->SetMCEventHeader(new FairMCEventHeader(*(fRun->GetMCEventHeader())));
     workerRun->SetRunId(workerRun->GetMCEventHeader()->GetRunID());
-
-    // Trajectories filter is created explicitly as we do not call
-    // FairRunSim::Init on workers
-    if (fRun->GetStoreTraj()) {
-        new FairTrajFilter();
-    }
+    workerRun->SetStoreTraj(fRun->GetStoreTraj());
 
     // Create new FairMCApplication object on worker
     return new FairMCApplication(*this, std::move(workerRun));
@@ -669,7 +637,7 @@ void FairMCApplication::FinishEvent()
     // --> Fill the stack output array
     fStack->FillTrackArray();
     // --> Update track indizes in MCTracks and MCPoints
-    fStack->UpdateTrackIndex(fActiveDetectors);
+    fStack->UpdateTrackIndex(&fActiveDetectors);
     // --> Screen output of stack
     // fStack->Print();
 
@@ -693,16 +661,16 @@ void FairMCApplication::FinishEvent()
     }
 
     fStack->Reset();
-    if (nullptr != fTrajFilter) {
+    if (fTrajFilter) {
         fTrajFilter->Reset();
         //    TObjArray* fListOfTracks=gGeoManager->GetListOfTracks();
         //    fListOfTracks->Delete();
         gGeoManager->GetListOfTracks()->Delete();
     }
-    if (nullptr != fRadLenMan) {
+    if (fRadLenMan) {
         fRadLenMan->Reset();
     }
-    if (nullptr != fRadMapMan) {
+    if (fRadMapMan) {
         fRadMapMan->Reset();
     }
 
@@ -881,14 +849,16 @@ void FairMCApplication::InitGeometry()
 
     LOG(info) << "Simulation RunID: " << runId;
 
-    fTrajFilter = FairTrajFilter::Instance();
-    if (nullptr != fTrajFilter) {
+    if ((!fTrajFilter) && fRun->GetStoreTraj()) {
+        fTrajFilter = std::make_unique<FairTrajFilter>();
+    }
+    if (fTrajFilter) {
         fTrajFilter->Init();
     }
-    if (nullptr != fRadLenMan) {
+    if (fRadLenMan) {
         fRadLenMan->Init();
     }
-    if (nullptr != fRadMapMan) {
+    if (fRadMapMan) {
         fRadMapMan->Init();
     }
     if (fRadGridMan) {
@@ -1272,7 +1242,7 @@ void FairMCApplication::SetRadiationLengthReg(Bool_t RadLen)
 {
     fRadLength = RadLen;
     if (fRadLength) {
-        fRadLenMan = new FairRadLenManager();
+        fRadLenMan = std::make_unique<FairRadLenManager>();
     }
 }
 
@@ -1281,7 +1251,7 @@ void FairMCApplication::SetRadiationMapReg(Bool_t RadMap)
 {
     fRadMap = RadMap;
     if (fRadMap) {
-        fRadMapMan = new FairRadMapManager();
+        fRadMapMan = std::make_unique<FairRadMapManager>();
     }
 }
 

fairroot/base/sim/FairMCApplication.h

@@ -18,6 +18,7 @@
 
 #include <Rtypes.h>                  // for Int_t, Bool_t, Double_t, etc
 #include <TLorentzVector.h>          // for TLorentzVector
+#include <TRefArray.h>               //
 #include <TString.h>                 // for TString
 #include <TVirtualMC.h>              // for TVirtualMC
 #include <TVirtualMCApplication.h>   // for TVirtualMCApplication
@@ -41,11 +42,7 @@ class FairTrajFilter;
 class FairVolume;
 class FairRunSim;
 class TChain;
-class TIterator;
-class TObjArray;
-class TRefArray;
 class TTask;
-class TVirtualMC;
 
 enum class FairMCApplicationState
 {
@@ -260,7 +257,7 @@ class FairMCApplication : public TVirtualMCApplication
      */
     const FairMCApplication* fParent{nullptr};   //!
     /**List of active detector */
-    TRefArray* fActiveDetectors;
+    TRefArray fActiveDetectors;
     /**List of FairTask*/
     FairTask* fFairTaskList;   //!
     /**Module list in simulation*/
@@ -278,9 +275,9 @@ class FairMCApplication : public TVirtualMCApplication
     /**MC Engine 1= Geant3, 2 = Geant4*/
     Int_t fMcVersion;   // mc Version
     /** Track visualization manager */
-    FairTrajFilter* fTrajFilter;   //!
+    std::unique_ptr<FairTrajFilter> fTrajFilter;   //!
     /**Flag for accepted tracks for visualization*/
-    Bool_t fTrajAccepted;   //!
+    bool fTrajAccepted{false};   //!
     /**Flag for using user decay*/
     Bool_t fUserDecay;
     /**User decay config macro*/
@@ -294,14 +291,14 @@ class FairMCApplication : public TVirtualMCApplication
     std::map<Int_t, Int_t> fModVolMap;   //!
     TLorentzVector fTrkPos;              //!
     /** Flag for Radiation length register mode  */
-    Bool_t fRadLength;   //!
+    bool fRadLength{false};   //!
 
     /**Radiation length Manager*/
-    FairRadLenManager* fRadLenMan;   //!
+    std::unique_ptr<FairRadLenManager> fRadLenMan;   //!
     /** Flag for Radiation map register mode  */
-    Bool_t fRadMap;   //!
+    bool fRadMap{false};   //!
     /**Radiation Map Manager*/
-    FairRadMapManager* fRadMapMan;   //!
+    std::unique_ptr<FairRadMapManager> fRadMapMan;   //!
     /**Radiation map Grid Manager*/
     std::unique_ptr<FairRadGridManager> fRadGridMan{};   //!
 

fairroot/base/steer/FairRunSim.cxx

@@ -28,7 +28,6 @@
 #include "FairRunIdGenerator.h"     // for FairRunIdGenerator
 #include "FairRuntimeDb.h"          // for FairRuntimeDb
 #include "FairTask.h"               // for FairTask
-#include "FairTrajFilter.h"         // for FairTrajFilter
 
 #include <TCollection.h>   // for TIter
 #include <TGeoManager.h>   // for gGeoManager
@@ -54,7 +53,6 @@ FairRunSim::FairRunSim(Bool_t isMaster)
     , fParticles(new TObjArray())
     , ListOfModules(new TObjArray())
     , MatFname("")
-    , fStoreTraj(kFALSE)
     , fPythiaDecayer(kFALSE)
     , fPythiaDecayerConfig("")
     , fUserDecay(kFALSE)
@@ -177,15 +175,15 @@ void FairRunSim::Init()
     /** Add Tasks to simulation if any*/
     fApp->AddTask(fTask);
     /** This call will create the container if it does not exist*/
-    FairBaseParSet* par = dynamic_cast<FairBaseParSet*>(fRtdb->getContainer("FairBaseParSet"));
+    auto par = dynamic_cast<FairBaseParSet*>(fRtdb->getContainer("FairBaseParSet"));
     if (par) {
         par->SetDetList(GetListOfModules());
         par->SetGen(GetPrimaryGenerator());
         par->SetBeamMom(fBeamMom);
     }
 
     /** This call will create the container if it does not exist*/
-    FairGeoParSet* geopar = dynamic_cast<FairGeoParSet*>(fRtdb->getContainer("FairGeoParSet"));
+    auto geopar = dynamic_cast<FairGeoParSet*>(fRtdb->getContainer("FairGeoParSet"));
     if (geopar) {
         geopar->SetGeometry(gGeoManager);
     }
@@ -207,7 +205,6 @@ void FairRunSim::Init()
     // on/off visualisation
     if (fStoreTraj) {
         LOG(info) << "Create visualisation manager ";
-        new FairTrajFilter();
     }
     if (fRadLength) {
         fApp->SetRadiationLengthReg(fRadLength);

fairroot/base/steer/FairRunSim.h

@@ -241,7 +241,7 @@ class FairRunSim : public FairRun
     TObjArray* fParticles;                          //!                         /** Array of user defined particles*/
     TObjArray* ListOfModules;                       //!                       /** Array of used modules */
     TString MatFname;                               //!                           /** Material file name */
-    Bool_t fStoreTraj;                              //!                       /** Trajectory store flags */
+    bool fStoreTraj{false};                         //!< Trajectory store flags
     TString fLoaderName{"TGeo"};                    //!< Geometry Model (TGeo or G3)
     Bool_t fPythiaDecayer;                          //!                    /** flag for using Pythia decayer*/
     TString fPythiaDecayerConfig;                   //!               /** Macro for Pythia decay configuration*/