Merge pull request cms-sw#32673 from kpedro88/dev-finecalo_CMSSW_11_3_X_2021-01-15-1100

finecalo patches v1 (rebased)

Author: cmsbuild

Configuration/ProcessModifiers/python/fineCalo_cff.py

@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+fineCalo = cms.Modifier()

SimCalorimetry/EcalElectronicsEmulation/src/EcalSimpleProducer.cc

@@ -86,7 +86,7 @@ void EcalSimpleProducer::produce(edm::Event &evt, const edm::EventSetup &) {
         double em = simHitFormula_->Eval(iEta0, iPhi0, ievt - 1);
         double eh = 0.;
         double t = 0.;
-        const PCaloHit hit(EBDetId(iEta1, iPhi).rawId(), em, eh, t, 0);
+        const PCaloHit hit(EBDetId(iEta1, iPhi).rawId(), em, eh, t, 0, 0);
         hits->push_back(hit);
       }
     }

SimDataFormats/CaloHit/src/PCaloHit.cc

@@ -3,13 +3,13 @@
 
 PCaloHit::PCaloHit(float eEM, float eHad, float t, int i, uint16_t d) : myTime(t), myItra(i), myDepth(d) {
   myEnergy = eEM + eHad;
-  myEMFraction = (myEnergy <= 0. ? 1. : eEM / myEnergy);
+  myEMFraction = (myEnergy <= 0.f ? 1.f : eEM / myEnergy);
 }
 
 PCaloHit::PCaloHit(unsigned int id, float eEM, float eHad, float t, int i, uint16_t d)
     : myTime(t), myItra(i), detId(id), myDepth(d) {
   myEnergy = eEM + eHad;
-  myEMFraction = (myEnergy <= 0. ? 1. : eEM / myEnergy);
+  myEMFraction = (myEnergy <= 0.f ? 1.f : eEM / myEnergy);
 }
 
 std::ostream& operator<<(std::ostream& o, const PCaloHit& hit) {

SimDataFormats/Track/interface/SimTrack.h

@@ -2,6 +2,9 @@
 #define SimTrack_H
 
 #include "SimDataFormats/Track/interface/CoreSimTrack.h"
+#include "DataFormats/Math/interface/Vector3D.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 class SimTrack : public CoreSimTrack {
 public:
@@ -44,12 +47,31 @@ class SimTrack : public CoreSimTrack {
 
   inline void setVertexIndex(const int v) { ivert = v; }
 
+  void setCrossedBoundaryVars(bool crossedBoundary,
+                              int idAtBoundary,
+                              math::XYZTLorentzVectorF positionAtBoundary,
+                              math::XYZTLorentzVectorF momentumAtBoundary) {
+    crossedBoundary_ = crossedBoundary;
+    idAtBoundary_ = idAtBoundary;
+    positionAtBoundary_ = positionAtBoundary;
+    momentumAtBoundary_ = momentumAtBoundary;
+  }
+  bool crossedBoundary() const { return crossedBoundary_; }
+  const math::XYZTLorentzVectorF& getPositionAtBoundary() const { return positionAtBoundary_; }
+  const math::XYZTLorentzVectorF& getMomentumAtBoundary() const { return momentumAtBoundary_; }
+  int getIDAtBoundary() const { return idAtBoundary_; }
+
 private:
   int ivert;
   int igenpart;
 
   math::XYZVectorD tkposition;
   math::XYZTLorentzVectorD tkmomentum;
+
+  bool crossedBoundary_;
+  int idAtBoundary_;
+  math::XYZTLorentzVectorF positionAtBoundary_;
+  math::XYZTLorentzVectorF momentumAtBoundary_;
 };
 
 #include <iosfwd>

SimDataFormats/Track/src/SimTrack.cc

@@ -1,21 +1,22 @@
 #include "SimDataFormats/Track/interface/SimTrack.h"
 
-SimTrack::SimTrack() : ivert(-1), igenpart(-1) {}
+SimTrack::SimTrack() : ivert(-1), igenpart(-1), crossedBoundary_(false) {}
 
-SimTrack::SimTrack(int ipart, const math::XYZTLorentzVectorD& p) : Core(ipart, p), ivert(-1), igenpart(-1) {}
+SimTrack::SimTrack(int ipart, const math::XYZTLorentzVectorD& p)
+    : Core(ipart, p), ivert(-1), igenpart(-1), crossedBoundary_(false) {}
 
 SimTrack::SimTrack(int ipart, const math::XYZTLorentzVectorD& p, int iv, int ig)
-    : Core(ipart, p), ivert(iv), igenpart(ig) {}
+    : Core(ipart, p), ivert(iv), igenpart(ig), crossedBoundary_(false) {}
 
 SimTrack::SimTrack(int ipart,
                    const math::XYZTLorentzVectorD& p,
                    int iv,
                    int ig,
                    const math::XYZVectorD& tkp,
                    const math::XYZTLorentzVectorD& tkm)
-    : Core(ipart, p), ivert(iv), igenpart(ig), tkposition(tkp), tkmomentum(tkm) {}
+    : Core(ipart, p), ivert(iv), igenpart(ig), tkposition(tkp), tkmomentum(tkm), crossedBoundary_(false) {}
 
-SimTrack::SimTrack(const CoreSimTrack& t, int iv, int ig) : Core(t), ivert(iv), igenpart(ig) {}
+SimTrack::SimTrack(const CoreSimTrack& t, int iv, int ig) : Core(t), ivert(iv), igenpart(ig), crossedBoundary_(false) {}
 
 std::ostream& operator<<(std::ostream& o, const SimTrack& t) {
   return o << (SimTrack::Core)(t) << ", " << t.vertIndex() << ", " << t.genpartIndex();

SimDataFormats/Track/src/classes_def.xml

@@ -4,7 +4,8 @@
   <class name="CoreSimTrack" ClassVersion="10">
    <version ClassVersion="10" checksum="3936841839"/>
   </class>
-  <class name="SimTrack" ClassVersion="11">
+  <class name="SimTrack" ClassVersion="12">
+   <version ClassVersion="12" checksum="3470347245"/>
    <version ClassVersion="11" checksum="1785575744"/>
    <version ClassVersion="10" checksum="1430205451"/>
   </class>

SimG4CMS/Calo/interface/CaloG4Hit.h

@@ -62,6 +62,7 @@ class CaloG4Hit : public G4VHit {
   void setIncidentEnergy(double e) { theIncidentEnergy = e; }
 
   int getTrackID() const { return hitID.trackID(); }
+
   uint32_t getUnitID() const { return hitID.unitID(); }
   double getTimeSlice() const { return hitID.timeSlice(); }
   int getTimeSliceID() const { return hitID.timeSliceID(); }
@@ -97,6 +98,8 @@ 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());
     }
@@ -107,7 +110,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->getTimeSliceID() == b->getTimeSliceID() && a->getID().fineTrackID() == b->getID().fineTrackID());
   }
 };
 

SimG4CMS/Calo/interface/CaloHitID.h

@@ -25,6 +25,11 @@ class CaloHitID {
   void setID(uint32_t unitID, double timeSlice, int trackID, uint16_t depth = 0);
   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; }
+
   bool operator==(const CaloHitID&) const;
   bool operator<(const CaloHitID&) const;
   bool operator>(const CaloHitID&) const;
@@ -37,6 +42,7 @@ class CaloHitID {
   uint16_t theDepth;
   float timeSliceUnit;
   bool ignoreTrackID;
+  int theFineTrackID;
 };
 
 std::ostream& operator<<(std::ostream&, const CaloHitID&);

SimG4CMS/Calo/interface/CaloSD.h

@@ -84,6 +84,9 @@ class CaloSD : public SensitiveCaloDetector,
   void resetForNewPrimary(const G4Step*);
   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);
+
   void update(const BeginOfRun*) override;
   void update(const BeginOfEvent*) override;
   void update(const BeginOfTrack* trk) override;
@@ -174,7 +177,8 @@ class CaloSD : public SensitiveCaloDetector,
   float timeSlice;
   double eminHitD;
   double correctT;
-  bool useFineCaloID_;
+  bool doFineCalo_;
+  double eMinFine_;
 
   std::map<CaloHitID, CaloG4Hit*> hitMap;
   std::map<int, TrackWithHistory*> tkMap;

SimG4CMS/Calo/interface/CaloTrkProcessing.h

@@ -7,6 +7,8 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "G4VTouchable.hh"
+#include "G4Track.hh"
+#include "DataFormats/Math/interface/LorentzVector.h"
 
 #include <map>
 #include <vector>
@@ -58,7 +60,7 @@ class CaloTrkProcessing : public SensitiveCaloDetector,
   void detectorLevel(const G4VTouchable*, int&, int*, G4String*) const;
 
   bool testBeam_, putHistory_, doFineCalo_;
-  double eMin_, eMinFine_, eMinFinePhoton_;
+  double eMin_, eMinFine_;
   int lastTrackID_;
   std::vector<Detector> detectors_, fineDetectors_;
 };