Fix the double initialization of FairDetector

Since VMC is initializing TVirtualMCSensitiveDetector,
removed detector->Initialize() from FairMCApplication.

Removed the GetFairVolume function used by FairDetector::ProcessHits().
It now calls the deprecated function with NULL argument.

Changed the propagator example to use the new ProcessHits().

Author: karabowi

base/sim/FairDetector.cxx

@@ -12,10 +12,9 @@
 
 #include "FairDetector.h"
 
-#include "FairGeoNode.h"         // for FairGeoNode
-#include "FairLogger.h"          // for FairLogger, MESSAGE_ORIGIN
-#include "FairMCApplication.h"   // TEMPORARY until the depracated Bool_t ProcessHits() in use
-#include "FairModule.h"          // for FairModule::svList, etc
+#include "FairGeoNode.h"   // for FairGeoNode
+#include "FairLogger.h"    // for FairLogger, MESSAGE_ORIGIN
+#include "FairModule.h"    // for FairModule::svList, etc
 #include "FairRootManager.h"
 #include "FairVolume.h"   // for FairVolume
 
@@ -135,7 +134,8 @@ void FairDetector::ProcessHits()
         LOG(warning) << "        Replace with void FairDetector::ProcessHits(). ";
         return true;
     }();
-    ProcessHits(FairMCApplication::Instance()->GetFairVolume());
+    (void)printOnce;
+    ProcessHits(NULL);
     return;
 }
 

base/sim/FairMCApplication.cxx

@@ -526,9 +526,6 @@ void FairMCApplication::Stepping()
         TrackId = fMC->GetStack()->GetCurrentTrackNumber();
     }
 
-    Int_t copyNo;
-    Int_t id = fMC->CurrentVolID(copyNo);
-
     // If information about the tracks should be stored the information as to be
     // stored for any step.
     // Information about each single step has also to be stored for the other
@@ -546,6 +543,8 @@ 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) {
@@ -1313,51 +1312,4 @@ void FairMCApplication::AddSensitiveModule(std::string volName, FairModule* modu
 {
     fMapSensitiveDetectors[volName] = module;
 }
-
-FairVolume* FairMCApplication::GetFairVolume()
-{
-    // Check if the volume with id is in the volume multimap.
-    // If it is not in the map the volume is not a sensitive volume
-    // and we do not call nay of our ProcessHits functions.
-
-    // If the volume is in the multimap, check in second step if the current
-    // copy is alredy inside the multimap.
-    // If the volume is not in the multimap add the copy of the volume to the
-    // multimap.
-    // In any case call the ProcessHits function for this specific detector.
-    Int_t copyNo;
-    Int_t id = fMC->CurrentVolID(copyNo);
-    fDisVol = 0;
-    Int_t fCopyNo = 0;
-    fVolIter = fVolMap.find(id);
-
-    if (fVolIter != fVolMap.end()) {
-
-        // Call Process hits for FairVolume with this id, copyNo
-        do {
-            fDisVol = fVolIter->second;
-            fCopyNo = fDisVol->getCopyNo();
-            if (copyNo == fCopyNo) {
-                return fDisVol;
-            }
-            ++fVolIter;
-        } while (fVolIter != fVolMap.upper_bound(id));
-
-        // Create new FairVolume with this id, copyNo.
-        // Use the FairVolume with the same id found in the map to get
-        // the link to the detector.
-        // Seems that this never happens (?)
-        // cout << "Volume not in map; fDisVol ? " << fDisVol << endl
-        FairVolume* fNewV = new FairVolume(fMC->CurrentVolName(), id);
-        fNewV->setMCid(id);
-        fNewV->setModId(fDisVol->getModId());
-        fNewV->SetModule(fDisVol->GetModule());
-        fNewV->setCopyNo(copyNo);
-        fVolMap.insert(pair<Int_t, FairVolume*>(id, fNewV));
-
-        return fNewV;
-    }
-    return 0;
-}
-
 ClassImp(FairMCApplication)

base/sim/FairMCApplication.h

@@ -233,7 +233,7 @@ class FairMCApplication : public TVirtualMCApplication
      * Add module to the list of sensitive detectors.
      */
     void AddSensitiveModule(std::string volName, FairModule* module);
- 
+
     /**
      * Return non-owning pointer to FairRadGridManager
      */

base/sim/FairModule.h

@@ -149,11 +149,11 @@ class FairModule : public TVirtualMCSensitiveDetector
     FairVolume* getFairVolume(FairGeoNode* fNode);
     void AddSensitiveVolume(TGeoVolume* v);
 
-    virtual void EndOfEvent() {}
+    void EndOfEvent() override {}
 
-    virtual void Initialize() {}
+    void Initialize() override {}
 
-    virtual void ProcessHits() {}
+    void ProcessHits() override {}
 
   private:
     /** Re-implimented from ROOT:  TGeoMatrix::SetDefaultName()  */

base/sim/fastsim/FairFastSimDetector.cxx

@@ -59,6 +59,9 @@ void FairFastSimDetector::ConstructGeometry()
     }
 }
 
-void FairFastSimDetector::ProcessHits() { FastSimProcessParticle(); }
+void FairFastSimDetector::ProcessHits()
+{
+    FastSimProcessParticle();
+}
 
 ClassImp(FairFastSimDetector);

examples/advanced/propagator/src/FairTutPropDet.cxx

@@ -62,7 +62,7 @@ FairTutPropDet::~FairTutPropDet()
     }
 }
 
-Bool_t FairTutPropDet::ProcessHits(FairVolume* vol)
+void FairTutPropDet::ProcessHits()
 {
 
     /** This method is called from the MC stepping */
@@ -82,10 +82,11 @@ Bool_t FairTutPropDet::ProcessHits(FairVolume* vol)
     if (TVirtualMC::GetMC()->IsTrackExiting() || TVirtualMC::GetMC()->IsTrackStop()
         || TVirtualMC::GetMC()->IsTrackDisappeared()) {
         fTrackID = TVirtualMC::GetMC()->GetStack()->GetCurrentTrackNumber();
-        fVolumeID = vol->getMCid();
+        Int_t copyNo;
+        fVolumeID = fMC->CurrentVolID(copyNo);
 
         if (fELoss == 0.) {
-            return kFALSE;
+            return;
         }
 
         // Taking stationNr from string is almost effortless.
@@ -110,7 +111,7 @@ Bool_t FairTutPropDet::ProcessHits(FairVolume* vol)
         stack->AddPoint(kTutProp);
     }
 
-    return kTRUE;
+    return;
 }
 
 void FairTutPropDet::EndOfEvent() { fFairTutPropPointCollection->Clear(); }

examples/advanced/propagator/src/FairTutPropDet.h

@@ -35,7 +35,7 @@ class FairTutPropDet : public FairDetector
     /**       this method is called for each step during simulation
      *       (see FairMCApplication::Stepping())
      */
-    Bool_t ProcessHits(FairVolume* v = nullptr) override;
+    void ProcessHits() override;
 
     /**       Registers the produced collections in FAIRRootManager.     */
     void Register() override;