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.

Added few overrides for ProcessHits.

Author: karabowi

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;

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
 

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
@@ -545,7 +550,6 @@ void FairMCApplication::Stepping()
     if (fRadLenMan || fRadMapMan) {
         Int_t copyNo;
         Int_t id = fMC->CurrentVolID(copyNo);
-        id = fMC->CurrentVolID(copyNo);
         auto modvoliter = (fParent ? fParent : this)->fModVolMap.find(id);
         if (fRadLenMan) {
             fRadLenMan->AddPoint(fMC, modvoliter->second);
@@ -932,7 +936,6 @@ void FairMCApplication::RegisterOutput()
         if (detector) {
             // check whether detector is active
             if (detector->IsActive()) {
-                detector->Initialize();
                 detector->Register();
             }
         }
@@ -1295,8 +1298,7 @@ void FairMCApplication::ConstructSensitiveDetectors()
         std::string volName = x.first;   //.substr(0, x.first.find("#", 0));
         if (volName.find('#') != std::string::npos) {
             volName = volName.substr(0, volName.find("#", 0));
-            std::map<std::string, FairModule*>::iterator it;
-            it = cloneVolumeMap.find(volName);
+            auto it = cloneVolumeMap.find(volName);
             LOG(debug) << "FairMCApplication::ConstructSensitiveDetectors got clone " << x.first << " " << x.second;
             if (it != cloneVolumeMap.end())
                 continue;

base/sim/FairMCApplication.h

@@ -336,10 +336,6 @@ class FairMCApplication : public TVirtualMCApplication
     /** Current state */
     FairMCApplicationState fState;   //!
 
-    /** List of sensitive detectors.
-     * To be used with TVirtualMCSensitiveDetector. */
-    std::map<std::string, FairModule*> fMapSensitiveDetectors;
-
     ClassDefOverride(FairMCApplication, 5);
 
   private:
@@ -354,6 +350,12 @@ class FairMCApplication : public TVirtualMCApplication
      */
     std::vector<FairModule*> fListModules{};   //!
 
+    /**
+     * List of sensitive detectors.
+     * To be used with TVirtualMCSensitiveDetector.
+     */
+    std::map<std::string, FairModule*> fMapSensitiveDetectors;
+
     /**
      * Owned Modules (inside the worker)
      */

base/sim/FairModule.h

@@ -15,13 +15,14 @@
 #include "FairLogger.h"
 #include "FairRun.h"         // for FairRun
 #include "FairRuntimeDb.h"   // for FairRuntimeDb
-#include "TVirtualMCSensitiveDetector.h"
 
 #include <Rtypes.h>      // for Bool_t, Int_t, etc
 #include <TList.h>       // for TList (ptr only), TListIter
 #include <TNamed.h>      // for TNamed
 #include <TObjArray.h>   // for TObjArray
 #include <TString.h>     // for TString, operator!=
+#include <TVirtualMCSensitiveDetector.h>
+
 #include <string>        // for string
 
 class FairVolumeList;

examples/MQ/pixelDetector/src/Pixel.h

@@ -36,7 +36,7 @@ class Pixel : public FairDetector
     /**       this method is called for each step during simulation
      *       (see FairMCApplication::Stepping())
      */
-    virtual void ProcessHits();
+    void ProcessHits() override;
 
     /**       Registers the produced collections in FAIRRootManager.     */
     void Register() override;

examples/advanced/Tutorial3/simulation/FairTestDetector.h

@@ -39,7 +39,7 @@ class FairTestDetector : public FairDetector
     /**       this method is called for each step during simulation
      *       (see FairMCApplication::Stepping())
      */
-    virtual void ProcessHits();
+    void ProcessHits() override;
 
     /**       Registers the produced collections in FAIRRootManager.     */
     void Register() override;

examples/advanced/propagator/src/FairTutPropDet.cxx

@@ -110,8 +110,6 @@ void FairTutPropDet::ProcessHits()
         FairStack* stack = static_cast<FairStack*>(TVirtualMC::GetMC()->GetStack());
         stack->AddPoint(kTutProp);
     }
-
-    return;
 }
 
 void FairTutPropDet::EndOfEvent() { fFairTutPropPointCollection->Clear(); }