Merge pull request cms-sw#175 from mandrenguyen/tp_fix_HI

Switch from triplet only tracks to all tracks, to avoid problems with tr...
cbernet · Sep 10, 2013 · a48a4b2 · a48a4b2
2 parents 7c9bf4e + 5c02aae
commit a48a4b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 25 deletions.
diff --git a/Validation/RecoHI/plugins/HitPixelLayersTPSelector.h b/Validation/RecoHI/plugins/HitPixelLayersTPSelector.h
@@ -96,25 +96,8 @@ class HitPixelLayersTPSelector
     std::vector<bool> pixelHitPattern( const TrackingParticleRef& simTrack, const TrackerTopology *tTopo )
       {
 	std::vector<bool> hitpattern(5,false); // PXB 0,1,2  PXF 0,1
-
-#warning "This file has been modified just to get it to compile without any regard as to whether it still functions as intended"
-#ifdef REMOVED_JUST_TO_GET_IT_TO_COMPILE__THIS_CODE_NEEDS_TO_BE_CHECKED
-	for(std::vector<PSimHit>::const_iterator simHit = simTrack->pSimHit_begin();simHit!= simTrack->pSimHit_end();simHit++){
-
-	  DetId id = DetId(simHit->detUnitId());
-	  uint32_t detid = id.det();
-	  uint32_t subdet = id.subdetId();
-
-	  if (detid == DetId::Tracker) {
-	    if (subdet == PixelSubdetector::PixelBarrel) 
-	      hitpattern[tTopo->pxbLayer(id)-1]=true;
-	    else if (subdet == PixelSubdetector::PixelEndcap) 
-	      hitpattern[tTopo->pxfDisk(id)+2]=true;
-	  }
-
-	}// end simhit loop
-#endif
-
+	// This currently will always return false, since we can no loger use the sim hits to check for triplets.  This would need to be fixed if we want to enable this feature, but it's not being used at the moment, since tripletSeedOnly is always set to False  - Matt Nguyen, 24/7/2013
+
 	return hitpattern;
       }
 

diff --git a/Validation/RecoHI/python/TrackValidationHeavyIons_cff.py b/Validation/RecoHI/python/TrackValidationHeavyIons_cff.py
@@ -24,7 +24,7 @@
 # setup multi-track validator
 from Validation.RecoTrack.MultiTrackValidator_cff import *
 hiTrackValidator = multiTrackValidator.clone(
-    label_tp_effic = cms.InputTag("findableSimTracks"),
+    label_tp_effic = cms.InputTag("primaryChgSimTracks"),
     label_tp_fake  = cms.InputTag("cutsTPFake"),
     signalOnlyTP = cms.bool(False),
     skipHistoFit = cms.untracked.bool(True), # done in post-processing
@@ -40,11 +40,11 @@
 
 # track prevalidation
 hiTrackPrevalidation = cms.Sequence(
-    findableSimTracks
-  * cutsTPFake
-  * cutsRecoTracks
-  * cutsRecoTracksHP
-)
+    primaryChgSimTracks
+    * cutsTPFake
+    * cutsRecoTracks
+    * cutsRecoTracksHP
+    )
 
 # track validation sequence
 hiTrackValidation = cms.Sequence( hiTrackValidator )
diff --git a/Validation/RecoHI/python/selectSimTracks_cff.py b/Validation/RecoHI/python/selectSimTracks_cff.py
@@ -1,5 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
+# Not actually functioning at the moment, use primaryChgSimTracks - Matt Nguyen, 24/7/2013
 findableSimTracks = cms.EDFilter("HitPixelLayersTPSelection",
     src = cms.InputTag("mix","MergedTrackTruth"),
 	tripletSeedOnly = cms.bool(True),