Fixed finecalo performance

cms-sw · Jul 22, 2021 · 8882912 · 8882912
1 parent a9f33e5
commit 8882912
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 156 deletions.
diff --git a/SimG4CMS/Calo/interface/CaloG4Hit.h b/SimG4CMS/Calo/interface/CaloG4Hit.h
@@ -67,6 +67,7 @@ class CaloG4Hit : public G4VHit {
   double getTimeSlice() const { return hitID.timeSlice(); }
   int getTimeSliceID() const { return hitID.timeSliceID(); }
   uint16_t getDepth() const { return hitID.depth(); }
+  bool isFinecaloTrackID() const { return hitID.isFinecaloTrackID(); }
 
   CaloHitID getID() const { return hitID; }
   void setID(uint32_t i, double d, int j, uint16_t k = 0) { hitID.setID(i, d, j, k); }
@@ -98,8 +99,6 @@ class CaloG4HitLess {
       return (a->getUnitID() < b->getUnitID());
     } else if (a->getDepth() != b->getDepth()) {
       return (a->getDepth() < b->getDepth());
-    } else if (a->getID().fineTrackID() != b->getID().fineTrackID()) {
-      return (a->getID().fineTrackID() < b->getID().fineTrackID());
     } else {
       return (a->getTimeSliceID() < b->getTimeSliceID());
     }
@@ -110,7 +109,7 @@ class CaloG4HitEqual {
 public:
   bool operator()(const CaloG4Hit* a, const CaloG4Hit* b) {
     return (a->getTrackID() == b->getTrackID() && a->getUnitID() == b->getUnitID() && a->getDepth() == b->getDepth() &&
-            a->getTimeSliceID() == b->getTimeSliceID() && a->getID().fineTrackID() == b->getID().fineTrackID());
+            a->getTimeSliceID() == b->getTimeSliceID());
   }
 };
 

diff --git a/SimG4CMS/Calo/interface/CaloHitID.h b/SimG4CMS/Calo/interface/CaloHitID.h
@@ -26,9 +26,8 @@ class CaloHitID {
   void reset();
 
   void setTrackID(int trackID) { theTrackID = trackID; }
-  bool hasFineTrackID() const { return theFineTrackID != -1; }
-  void setFineTrackID(int fineTrackID) { theFineTrackID = fineTrackID; }
-  int fineTrackID() const { return hasFineTrackID() ? theFineTrackID : theTrackID; }
+  void markAsFinecaloTrackID(bool flag = true) { isFinecaloTrackID_ = flag; }
+  bool isFinecaloTrackID() const { return isFinecaloTrackID_; }
 
   bool operator==(const CaloHitID&) const;
   bool operator<(const CaloHitID&) const;
@@ -42,7 +41,7 @@ class CaloHitID {
   uint16_t theDepth;
   float timeSliceUnit;
   bool ignoreTrackID;
-  int theFineTrackID;
+  bool isFinecaloTrackID_;
 };
 
 std::ostream& operator<<(std::ostream&, const CaloHitID&);

diff --git a/SimG4CMS/Calo/interface/CaloSD.h b/SimG4CMS/Calo/interface/CaloSD.h
@@ -28,6 +28,7 @@
 
 #include <vector>
 #include <map>
+#include <unordered_map>
 #include <memory>
 
 class G4Step;
@@ -85,7 +86,9 @@ class CaloSD : public SensitiveCaloDetector,
   double getAttenuation(const G4Step* aStep, double birk1, double birk2, double birk3) const;
 
   static std::string printableDecayChain(const std::vector<unsigned int>& decayChain);
-  void hitBookkeepingFineCalo(const G4Step* step, const G4Track* currentTrack, CaloG4Hit* hit);
+  std::string shortreprID(const CaloHitID& ID);
+  std::string shortreprID(const CaloG4Hit* hit);
+  unsigned int findBoundaryCrossingParent(const G4Track* track, bool markParentAsSaveable = true);
 
   void update(const BeginOfRun*) override;
   void update(const BeginOfEvent*) override;
@@ -183,8 +186,10 @@ class CaloSD : public SensitiveCaloDetector,
 
   std::map<CaloHitID, CaloG4Hit*> hitMap;
   std::map<int, TrackWithHistory*> tkMap;
+  std::unordered_map<unsigned int, unsigned int> boundaryCrossingParentMap_;
   std::vector<std::unique_ptr<CaloG4Hit>> reusehit;
   std::vector<Detector> fineDetectors_;
+  bool doFineCaloThisStep_;
 };
 
 #endif  // SimG4CMS_CaloSD_h
diff --git a/SimG4CMS/Calo/src/CaloHitID.cc b/SimG4CMS/Calo/src/CaloHitID.cc
@@ -7,7 +7,7 @@
 #include <iomanip>
 
 CaloHitID::CaloHitID(uint32_t unitID, double timeSlice, int trackID, uint16_t depth, float tSlice, bool ignoreTkID)
-    : timeSliceUnit(tSlice), ignoreTrackID(ignoreTkID), theFineTrackID(-1) {
+    : timeSliceUnit(tSlice), ignoreTrackID(ignoreTkID), isFinecaloTrackID_(false) {
   setID(unitID, timeSlice, trackID, depth);
 }
 
@@ -21,7 +21,7 @@ CaloHitID::CaloHitID(const CaloHitID& id) {
   theDepth = id.theDepth;
   timeSliceUnit = id.timeSliceUnit;
   ignoreTrackID = id.ignoreTrackID;
-  theFineTrackID = id.theFineTrackID;
+  isFinecaloTrackID_ = id.isFinecaloTrackID_;
 }
 
 const CaloHitID& CaloHitID::operator=(const CaloHitID& id) {
@@ -32,7 +32,7 @@ const CaloHitID& CaloHitID::operator=(const CaloHitID& id) {
   theDepth = id.theDepth;
   timeSliceUnit = id.timeSliceUnit;
   ignoreTrackID = id.ignoreTrackID;
-  theFineTrackID = id.theFineTrackID;
+  isFinecaloTrackID_ = id.isFinecaloTrackID_;
   return *this;
 }
 
@@ -52,21 +52,19 @@ void CaloHitID::reset() {
   theTrackID = -2;
   theTimeSliceID = (int)(theTimeSlice / timeSliceUnit);
   theDepth = 0;
-  theFineTrackID = -1;
+  isFinecaloTrackID_ = false;
 }
 
 bool CaloHitID::operator==(const CaloHitID& id) const {
   return ((theUnitID == id.unitID()) && (theTrackID == id.trackID() || ignoreTrackID) &&
-          (theTimeSliceID == id.timeSliceID()) && (theDepth == id.depth()) && (fineTrackID() == id.fineTrackID()))
+          (theTimeSliceID == id.timeSliceID()) && (theDepth == id.depth()))
              ? true
              : false;
 }
 
 bool CaloHitID::operator<(const CaloHitID& id) const {
   if (theTrackID != id.trackID()) {
     return (theTrackID > id.trackID());
-  } else if (fineTrackID() != id.fineTrackID()) {
-    return (fineTrackID() > id.fineTrackID());
   } else if (theUnitID != id.unitID()) {
     return (theUnitID > id.unitID());
   } else if (theDepth != id.depth()) {
@@ -79,8 +77,6 @@ bool CaloHitID::operator<(const CaloHitID& id) const {
 bool CaloHitID::operator>(const CaloHitID& id) const {
   if (theTrackID != id.trackID()) {
     return (theTrackID < id.trackID());
-  } else if (fineTrackID() != id.fineTrackID()) {
-    return (fineTrackID() < id.fineTrackID());
   } else if (theUnitID != id.unitID()) {
     return (theUnitID < id.unitID());
   } else if (theDepth != id.depth()) {
@@ -93,7 +89,5 @@ bool CaloHitID::operator>(const CaloHitID& id) const {
 std::ostream& operator<<(std::ostream& os, const CaloHitID& id) {
   os << "UnitID 0x" << std::hex << id.unitID() << std::dec << " Depth " << std::setw(6) << id.depth() << " Time "
      << std::setw(6) << id.timeSlice() << " TrackID " << std::setw(8) << id.trackID();
-  if (id.hasFineTrackID())
-    os << " fineTrackID " << id.fineTrackID();
   return os;
 }