TVirtualMCSensitiveDetector: Cleanup of functions

Removed FairDetector::DefineSensitiveVolumes() function, the functionality moved to FairMCApplication private special copy constructor. Removed detector initialization from FairMCApplication::RegisterOutput(), the detectors are initialized in the VMC.
FairRootGroup · Jan 30, 2023 · 83bbbc6 · 83bbbc6
1 parent 1566441
commit 83bbbc6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 28 deletions.
diff --git a/base/sim/FairDetector.cxx b/base/sim/FairDetector.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -45,7 +45,10 @@ FairDetector::FairDetector(const FairDetector& rhs)
     , fLogger(rhs.fLogger)
 {}
 
-FairDetector::~FairDetector() { delete flGeoPar; }
+FairDetector::~FairDetector()
+{
+    delete flGeoPar;
+}
 
 FairDetector& FairDetector::operator=(const FairDetector& rhs)
 {
@@ -70,34 +73,12 @@ FairDetector::FairDetector()
 
 // -------------------------------------------------------------------------
 
-void FairDetector::DefineSensitiveVolumes()
-{
-    LOG(info) << "FairDetector::DefineSensitiveVolumes";
-    TObjArray* volumes = gGeoManager->GetListOfVolumes();
-    TIter next(volumes);
-    TGeoVolume* volume;
-    while ((volume = static_cast<TGeoVolume*>(next()))) {
-        if (IsSensitive(volume->GetName())) {
-            LOG(debug) << "Sensitive Volume " << volume->GetName();
-            AddSensitiveVolume(volume);
-        }
-    }
-}
-
-// -------------------------------------------------------------------------
-
 void FairDetector::Initialize()
 {
     // Registers hits collection in Root manager;
     // sets sensitive volumes.
     // ---
 
-    // Define sensitive volumes if in MT
-    if (gMC->IsMT()) {
-        std::cout << "Define sensitive volume " << std::endl;
-        DefineSensitiveVolumes();
-    }
-
     Int_t NoOfEntries = svList->GetEntries();
     Int_t fMCid;
     FairGeoNode* fN;

diff --git a/base/sim/FairDetector.h b/base/sim/FairDetector.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -109,8 +109,6 @@ class FairDetector : public FairModule
     /** Assignment operator */
     FairDetector& operator=(const FairDetector&);
 
-    void DefineSensitiveVolumes();
-
     Int_t fDetId;          // Detector Id has to be set from ctr.
     FairLogger* fLogger;   //! /// FairLogger
 

diff --git a/base/sim/FairMCApplication.cxx b/base/sim/FairMCApplication.cxx
@@ -196,6 +196,11 @@ FairMCApplication::FairMCApplication(const FairMCApplication& rhs, std::unique_p
         auto& clone = fOwnedModules.emplace_back(module->CloneModule());
         fListModules.emplace_back(clone.get());
         fModules->Add(clone.get());
+        for (auto sens : rhs.fMapSensitiveDetectors) {
+            if (sens.second == module) {
+                fMapSensitiveDetectors[sens.first] = clone.get();
+            }
+        }
     }
 
     // Create and fill a list of active detectors
@@ -932,7 +937,6 @@ void FairMCApplication::RegisterOutput()
         if (detector) {
             // check whether detector is active
             if (detector->IsActive()) {
-                detector->Initialize();
                 detector->Register();
             }
         }