Merge pull request #19025 from bjmarsh/stoppedTracks

Update of isolatedTracks collection in miniAOD to include stopped track information

DataFormats/PatCandidates/interface/IsolatedTrack.h

@@ -3,13 +3,16 @@
 
 /*
   \class    pat::IsolatedTrack IsolatedTrack.h "DataFormats/PatCandidates/interface/IsolatedTrack.h"
-  \brief Small class to store key info isolated packed cands    
-   pat::IsolatedTrack stores important info on isolated packed PF candidates,
-   as a convenience to analyses to prevent having to loop over all pfcands.
+  \brief Small class to store key info on isolated tracks
+   pat::IsolatedTrack stores important info on isolated tracks. Draws from
+   packedPFCandidates, lostTracks, and generalTracks.
   \author   Bennett Marsh
 */
 
 #include "DataFormats/Candidate/interface/LeafCandidate.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackBase.h"
+#include "DataFormats/TrackReco/interface/HitPattern.h"
 #include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 #include "DataFormats/PatCandidates/interface/PFIsolation.h"
 
@@ -22,39 +25,94 @@ namespace pat {
         IsolatedTrack() :
           LeafCandidate(0, LorentzVector(0,0,0,0)),
           pfIsolationDR03_(pat::PFIsolation()),
-          miniIsolation_(pat::PFIsolation()),
-          dz_(0.), dxy_(0.),
+          miniIsolation_(pat::PFIsolation()), 
+          matchedCaloJetEmEnergy_(0.), matchedCaloJetHadEnergy_(0.),
+          dz_(0.), dxy_(0.), dzError_(0.), dxyError_(0.), fromPV_(-1), trackQuality_(0),
+          dEdxStrip_(0), dEdxPixel_(0), hitPattern_(reco::HitPattern()),
+          crossedEcalStatus_(std::vector<uint16_t>()),
+          crossedHcalStatus_(std::vector<uint32_t>()),
+          deltaEta_(0), deltaPhi_(0),
           packedCandRef_(PackedCandidateRef()) {}
 
-        explicit IsolatedTrack(const PFIsolation &iso, const PFIsolation &miniiso,
+        explicit IsolatedTrack(const PFIsolation &iso, const PFIsolation &miniiso, float caloJetEm, float caloJetHad,
                                const LorentzVector &p4, int charge, int id,
-                               float dz, float dxy, const PackedCandidateRef &ref) :
+                               float dz, float dxy, float dzError, float dxyError,
+                               const reco::HitPattern &hp, float dEdxS, float dEdxP, int fromPV, int tkQual,
+                               const std::vector<uint16_t> &ecalst,
+                               const std::vector<uint32_t> & hcalst, int dEta, int dPhi,
+                               const PackedCandidateRef &pcref) :
           LeafCandidate(charge, p4, Point(0.,0.,0.), id),
-          pfIsolationDR03_(iso),
-          miniIsolation_(miniiso),
-          dz_(dz), dxy_(dxy),
-          packedCandRef_(ref) {}
+          pfIsolationDR03_(iso), miniIsolation_(miniiso), 
+          matchedCaloJetEmEnergy_(caloJetEm), matchedCaloJetHadEnergy_(caloJetHad),
+          dz_(dz), dxy_(dxy), dzError_(dzError), dxyError_(dxyError),
+          fromPV_(fromPV), trackQuality_(tkQual), dEdxStrip_(dEdxS), dEdxPixel_(dEdxP), 
+          hitPattern_(hp), 
+          crossedEcalStatus_(ecalst), crossedHcalStatus_(hcalst),
+          deltaEta_(dEta), deltaPhi_(dPhi),
+          packedCandRef_(pcref) {}
 
         ~IsolatedTrack() {}
 
         const PFIsolation& pfIsolationDR03() const  { return pfIsolationDR03_; }
+
         const PFIsolation& miniPFIsolation() const { return miniIsolation_; }
+
+        float matchedCaloJetEmEnergy() const { return matchedCaloJetEmEnergy_; }
+        float matchedCaloJetHadEnergy() const { return matchedCaloJetHadEnergy_; }
+
         float dz() const { return dz_; }
+        float dzError() const { return dzError_; }
         float dxy() const { return dxy_; }
+        float dxyError() const { return dxyError_; }
+
+        int fromPV() const { return fromPV_; }
+
+        bool isHighPurityTrack() const 
+          {  return (trackQuality_ & (1 << reco::TrackBase::highPurity)) >> reco::TrackBase::highPurity; }
+        bool isTightTrack() const 
+          {  return (trackQuality_ & (1 << reco::TrackBase::tight)) >> reco::TrackBase::tight; }
+        bool isLooseTrack() const 
+          {  return (trackQuality_ & (1 << reco::TrackBase::loose)) >> reco::TrackBase::loose; }
+
+        const reco::HitPattern& hitPattern() const { return hitPattern_; }
 
+        float dEdxStrip() const { return dEdxStrip_; }
+        float dEdxPixel() const { return dEdxPixel_; }
+
+        //! just the status code part of an EcalChannelStatusCode for all crossed Ecal cells
+        const std::vector<uint16_t>& crossedEcalStatus() const { return crossedEcalStatus_; }
+        //! just the status code part of an HcalChannelStatus for all crossed Hcal cells
+        const std::vector<uint32_t>& crossedHcalStatus() const { return crossedHcalStatus_; }
+
+        //! difference in eta/phi between initial traj and intersection w/ ecal
+        //! Values are between +-0.5 with a precision of 0.002
+        float deltaEta() const { return float(deltaEta_)/500.f; }
+        float deltaPhi() const { return float(deltaPhi_)/500.f; }
+
         const PackedCandidateRef& packedCandRef() const { return packedCandRef_; }
 
       protected:
         PFIsolation pfIsolationDR03_;
         PFIsolation miniIsolation_;
-        float dz_, dxy_;
+        float matchedCaloJetEmEnergy_;  //energy of nearest calojet within a given dR;
+        float matchedCaloJetHadEnergy_;
+        float dz_, dxy_, dzError_, dxyError_;        
+        int fromPV_;  //only stored for packedPFCandidates
+        int trackQuality_;
+        float dEdxStrip_, dEdxPixel_; //in MeV/mm
+
+        reco::HitPattern hitPattern_;
+
+        std::vector<uint16_t> crossedEcalStatus_;
+        std::vector<uint32_t> crossedHcalStatus_;
+        int deltaEta_, deltaPhi_;
+
+        PackedCandidateRef packedCandRef_; // stored only for packedPFCands/lostTracks. NULL for generalTracks
 
-        PackedCandidateRef packedCandRef_;
     };
 
+    typedef std::vector<IsolatedTrack> IsolatedTrackCollection;
 
-    typedef std::vector<IsolatedTrack>  IsolatedTrackCollection;
 }
 
-
 #endif

DataFormats/PatCandidates/interface/PackedCandidate.h

@@ -500,7 +500,7 @@ namespace pat {
         return nullptr;
     }
     /// Return true if a bestTrack can be extracted from this Candidate
-    bool hasTrackDetails() {return  (packedHits_!=0 || packedLayers_ !=0); }
+    bool hasTrackDetails() const {return  (packedHits_!=0 || packedLayers_ !=0); }
 
 
     /// true if the track had the highPurity quality bit

DataFormats/PatCandidates/src/classes_def_objects.xml

@@ -105,7 +105,8 @@
    <version ClassVersion="10" checksum="2244564938"/>
   </class>
 
-  <class name="pat::IsolatedTrack" ClassVersion="3">
+  <class name="pat::IsolatedTrack" ClassVersion="4">
+   <version ClassVersion="4" checksum="71166093"/>
    <version ClassVersion="3" checksum="550880582"/>
   </class>
 

PhysicsTools/PatAlgos/BuildFile.xml

@@ -19,6 +19,9 @@
 <use   name="PhysicsTools/IsolationAlgos"/>
 <use   name="Geometry/CaloTopology"/>
 <use   name="RecoEgamma/EgammaTools"/>
+<use   name="RecoTracker/DeDx"/>
+<use   name="CondFormats/HcalObjects"/>
+<use   name="CondFormats/EcalObjects"/>
 <use   name="clhep"/>
 <export>
   <lib   name="1"/>