fixed MC truth data on particle transfer from tracker to calorimeter

cms-sw · Jul 13, 2022 · 1a071cc · 1a071cc
1 parent 8a06f23
commit 1a071cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/SimG4Core/Application/interface/SteppingAction.h b/SimG4Core/Application/interface/SteppingAction.h
@@ -43,7 +43,6 @@ class SteppingAction : public G4UserSteppingAction {
 
   inline bool isInsideDeadRegion(const G4Region* reg) const;
   inline bool isOutOfTimeWindow(const G4Region* reg, const double& time) const;
-  inline bool isThisVolume(const G4VTouchable* touch, const G4VPhysicalVolume* pv) const;
 
   bool isLowEnergy(const G4LogicalVolume*, const G4Track*) const;
   void PrintKilledTrack(const G4Track*, const TrackStatus&) const;
@@ -99,9 +98,4 @@ inline bool SteppingAction::isOutOfTimeWindow(const G4Region* reg, const double&
   return (time > tofM);
 }
 
-inline bool SteppingAction::isThisVolume(const G4VTouchable* touch, const G4VPhysicalVolume* pv) const {
-  int level = (touch->GetHistoryDepth()) + 1;
-  return (level >= 3) ? (touch->GetVolume(level - 3) == pv) : false;
-}
-
 #endif
diff --git a/SimG4Core/Application/src/SteppingAction.cc b/SimG4Core/Application/src/SteppingAction.cc
@@ -1,4 +1,3 @@
-
 #include "SimG4Core/Application/interface/SteppingAction.h"
 #include "SimG4Core/Application/interface/EventAction.h"
 #include "SimG4Core/Notification/interface/CMSSteppingVerbose.h"
@@ -174,13 +173,13 @@ void SteppingAction::UserSteppingAction(const G4Step* aStep) {
   // check transition tracker/calo
   bool isKilled = false;
   if (sAlive == tstat || sVeryForward == tstat) {
-    if (isThisVolume(preStep->GetTouchable(), tracker) && isThisVolume(postStep->GetTouchable(), calo)) {
-      math::XYZVectorD pos((preStep->GetPosition()).x(), (preStep->GetPosition()).y(), (preStep->GetPosition()).z());
+    if (preStep->GetPhysicalVolume() == tracker && postStep->GetPhysicalVolume() == calo) {
+      math::XYZVectorD pos((postStep->GetPosition()).x(), (postStep->GetPosition()).y(), (postStep->GetPosition()).z());
 
-      math::XYZTLorentzVectorD mom((preStep->GetMomentum()).x(),
-                                   (preStep->GetMomentum()).y(),
-                                   (preStep->GetMomentum()).z(),
-                                   preStep->GetTotalEnergy());
+      math::XYZTLorentzVectorD mom((postStep->GetMomentum()).x(),
+                                   (postStep->GetMomentum()).y(),
+                                   (postStep->GetMomentum()).z(),
+                                   postStep->GetTotalEnergy());
 
       uint32_t id = theTrack->GetTrackID();
 
@@ -220,9 +219,9 @@ bool SteppingAction::initPointer() {
   const G4PhysicalVolumeStore* pvs = G4PhysicalVolumeStore::GetInstance();
   for (auto const& pvcite : *pvs) {
     const G4String& pvname = pvcite->GetName();
-    if (pvname == "Tracker")
+    if (pvname == "Tracker" || pvname == "tracker:Tracker_1")
       tracker = pvcite;
-    else if (pvname == "CALO")
+    else if (pvname == "CALO" || pvname == "caloBase:CALO_1")
       calo = pvcite;
 
     if (tracker && calo)