*** empty log message ***

zhenhu · Oct 22, 2007 · 121144c · 121144c
1 parent 0bf0a98
commit 121144c
Show file tree

Hide file tree

Showing 5 changed files with 415 additions and 120 deletions.
diff --git a/AnalysisExamples/SiStripDetectorPerformance/data/AnaObjProducer.cfi b/AnalysisExamples/SiStripDetectorPerformance/data/AnaObjProducer.cfi
@@ -16,7 +16,7 @@ module modAnaObjProducer = AnaObjProducer {
 
 // This uses all the information (also the rechits)
 // Set updatedState to combinedState to exclude rechits (usefull to evaluate pulls and residuals)
-InputTag TrackInfoLabel=trackinfo:updatedState
+InputTag TrackInfoLabel=trackinfo:combinedState
 
   // Objects Labels
   string TracksLabel = "cosmictrackfinder"

diff --git a/AnalysisExamples/SiStripDetectorPerformance/interface/AnaObjProducer.h b/AnalysisExamples/SiStripDetectorPerformance/interface/AnaObjProducer.h
@@ -205,6 +205,8 @@ class AnaObjProducer : public edm::EDProducer
   const std::vector<short> * rawDigiAmplitudesR_ptr_;
 
   // Tracking particle quantities
+  float    trackingparticleE;
+  float    trackingparticleEt;
   float    trackingparticleP;
   float    trackingparticlePt;
   float    trackingparticleEta;
@@ -218,6 +220,15 @@ class AnaObjProducer : public edm::EDProducer
   float vy;
   float vz;
   float outerPt;
+  float innermostPoint_X;
+  float innermostPoint_Y;
+  float innermostPoint_Z;
+  float outermostPoint_X;
+  float outermostPoint_Y;
+  float outermostPoint_Z;
+  int   nrprojectedHits;
+  int   nrmatchedHits;
+  int   nrsingleHits;
   short found;
   short lost;
 

diff --git a/AnalysisExamples/SiStripDetectorPerformance/interface/TrackLocalAngleTIF.h b/AnalysisExamples/SiStripDetectorPerformance/interface/TrackLocalAngleTIF.h
@@ -50,16 +50,30 @@ class TrackLocalAngleTIF
   typedef std::vector<std::pair<const TrackingRecHit *, float> > HitAngleAssociation;
   typedef std::vector<std::pair<const TrackingRecHit *, LocalVector > > HitLclDirAssociation;
   typedef std::vector<std::pair<const TrackingRecHit *, GlobalVector> > HitGlbDirAssociation;
+  typedef std::vector<std::pair<const TrackingRecHit *, LocalPoint > > LclPosAssociation;
+  typedef std::vector<std::pair<int, int > > HitValidationAssociation;
 
  private:
 
   std::auto_ptr<HitAngleAssociation> oXZHitAngle;
   std::auto_ptr<HitAngleAssociation> oYZHitAngle;
+  std::auto_ptr<HitAngleAssociation> oTrackLocalPitch;
 
   std::auto_ptr<HitLclDirAssociation> oLocalDir;
   std::auto_ptr<HitGlbDirAssociation> oGlobalDir;
 
+  std::auto_ptr<LclPosAssociation> oLocalHitPos;
+  std::auto_ptr<LclPosAssociation> oLocalTrackPos;
+
   std::auto_ptr<HitAngleAssociation> Hit3DAngle;
+  std::auto_ptr<HitAngleAssociation> HitPhiAngle;
+
+  std::auto_ptr<HitValidationAssociation> HitValidation;
+  std::auto_ptr<HitAngleAssociation> HitType;
+
+  int numberProjectedRecHits;
+  int numberMatchedRecHits;
+  int numberSingleRecHits;
 
   const TrackerGeometry * _tracker;
   reco::TrackInfo::TrajectoryInfo::const_iterator _tkinfoiter;
@@ -73,6 +87,8 @@ class TrackLocalAngleTIF
 
   std::vector<std::pair<const TrackingRecHit*,float> > SeparateHits(reco::TrackInfoRef & trackinforef);
 
+  LocalPoint project(const GeomDet *det,const GeomDet* projdet,LocalPoint position,LocalVector trackdirection)const;
+
 /*   inline HitAngleAssociation getXZHitAngle() const throw() {  */
 /*     return (oXZHitAngle); } */
 /*   inline HitAngleAssociation getYZHitAngle() const throw() {  */
@@ -90,14 +106,35 @@ class TrackLocalAngleTIF
     return oXZHitAngle; }
   inline std::auto_ptr<HitAngleAssociation> getYZHitAngle() { 
     return (oYZHitAngle); }
+  inline std::auto_ptr<HitAngleAssociation> getTrackLocalPitch() { 
+    return (oTrackLocalPitch); }
 
   inline std::auto_ptr<HitLclDirAssociation> getLocalDir() {
     return (oLocalDir); }
   inline std::auto_ptr<HitGlbDirAssociation> getGlobalDir() {
     return (oGlobalDir); }
 
+  inline std::auto_ptr<LclPosAssociation> getLocalHitPos() {
+    return (oLocalHitPos); }
+  inline std::auto_ptr<LclPosAssociation> getLocalTrackPos() {
+    return (oLocalTrackPos); }
+
   inline std::auto_ptr<HitAngleAssociation> getHit3DAngle() {
     return (Hit3DAngle); }
+  inline std::auto_ptr<HitAngleAssociation> getHitPhiAngle() {
+    return (HitPhiAngle); }
+
+  inline std::auto_ptr<HitValidationAssociation> getHitValidation() {
+    return (HitValidation); }
+  inline std::auto_ptr<HitAngleAssociation> getHitType() { 
+    return HitType; }
+
+  inline int getNrProjectedRecHits() {
+    return numberProjectedRecHits; }
+  inline int getNrMatchedRecHits() {
+    return numberMatchedRecHits; }
+  inline int getNrSingleRecHits() {
+    return numberSingleRecHits; }
 };