merge updates from 21X into HEAD

argiro · May 28, 2008 · ea75ebb · ea75ebb
1 parent 2c07fef
commit ea75ebb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/Validation/RecoTrack/interface/MultiTrackValidatorBase.h b/Validation/RecoTrack/interface/MultiTrackValidatorBase.h
@@ -4,8 +4,8 @@
 /** \class MultiTrackValidatorBase
  *  Base class for analyzers that produces histrograms to validate Track Reconstruction performances
  *
- *  $Date: 2008/04/20 23:44:58 $
- *  $Revision: 1.8 $
+ *  $Date: 2008/05/28 15:36:08 $
+ *  $Revision: 1.9.2.1 $
  *  \author cerati
  */
 
@@ -220,7 +220,7 @@ class MultiTrackValidatorBase {
   std::vector<MonitorElement*> h_tracks, h_fakes, h_hits, h_charge;
   std::vector<MonitorElement*> h_effic, h_efficPt, h_fakerate, h_fakeratePt, h_recoeta, h_assoceta, h_assoc2eta, h_simuleta;
   std::vector<MonitorElement*>  h_effic_vs_hit, h_fake_vs_hit;
-  std::vector<MonitorElement*> h_recopT, h_assocpT, h_assoc2pT, h_simulpT;
+  std::vector<MonitorElement*> h_recopT, h_assocpT, h_assoc2pT, h_simulpT, h_recohit, h_assochit, h_assoc2hit, h_simulhit;
   std::vector<MonitorElement*> h_pt, h_eta, h_pullTheta,h_pullPhi,h_pullDxy,h_pullDz,h_pullQoverp;
 
   //2D  

diff --git a/Validation/RecoTrack/plugins/MultiTrackValidator.cc b/Validation/RecoTrack/plugins/MultiTrackValidator.cc
@@ -86,7 +86,11 @@ void MultiTrackValidator::beginJob( const EventSetup & setup) {
       h_assocpT.push_back( dbe_->book1D("num_assoc(simToReco)_pT","N of associated tracks (simToReco) vs pT",nintpT,minpT,maxpT) );
       h_assoc2pT.push_back( dbe_->book1D("num_assoc(recoToSim)_pT","N of associated (recoToSim) tracks vs pT",nintpT,minpT,maxpT) );
       h_simulpT.push_back( dbe_->book1D("num_simul_pT","N of simulated tracks vs pT",nintpT,minpT,maxpT) );
-
+      h_recohit.push_back( dbe_->book1D("num_reco_hit","N of reco track vs hit",nintHit,minHit,maxHit) );
+      h_assochit.push_back( dbe_->book1D("num_assoc(simToReco)_hit","N of associated tracks (simToReco) vs hit",nintHit,minHit,maxHit) );
+      h_assoc2hit.push_back( dbe_->book1D("num_assoc(recoToSim)_hit","N of associated (recoToSim) tracks vs hit",nintHit,minHit,maxHit) );
+      h_simulhit.push_back( dbe_->book1D("num_simul_hit","N of simulated tracks vs hit",nintHit,minHit,maxHit) );
+
       h_eta.push_back( dbe_->book1D("eta", "pseudorapidity residue", 1000, -0.1, 0.1 ) );
       h_pt.push_back( dbe_->book1D("pullPt", "pull of p_{t}", 100, -10, 10 ) );
       h_pullTheta.push_back( dbe_->book1D("pullTheta","pull of #theta parameter",250,-25,25) );
@@ -296,8 +300,9 @@ void MultiTrackValidator::analyze(const edm::Event& event, const edm::EventSetup
 	    }
 	  }
 	} // END for (unsigned int f=0; f<pTintervals[w].size()-1; f++){
-	totSIM_hit[w][std::min(tp->matchedHit(),nintHit-1)]++;
-	if (rt.size()!=0) totASS_hit[w][std::min(tp->matchedHit(),nintHit-1)]++;
+	int tmp = std::min((int)(tp->pSimHit_end()-tp->pSimHit_begin()),int(maxHit-1));
+	totSIM_hit[w][tmp]++;
+	if (rt.size()!=0) totASS_hit[w][tmp]++;
       }
       if (st!=0) h_tracksSIM[w]->Fill(st);
 
@@ -573,6 +578,11 @@ void MultiTrackValidator::endJob() {
       fillPlotFromVector(h_simulpT[w],totSIMpT[w]);
       fillPlotFromVector(h_assocpT[w],totASSpT[w]);
       fillPlotFromVector(h_assoc2pT[w],totASS2pT[w]);
+
+      fillPlotFromVector(h_recohit[w],totREC_hit[w]);
+      fillPlotFromVector(h_simulhit[w],totSIM_hit[w]);
+      fillPlotFromVector(h_assochit[w],totASS_hit[w]);
+      fillPlotFromVector(h_assoc2hit[w],totASS2_hit[w]);
       w++;
     }
   }