track down everywhere where DigiSimLinks are sourced, remove hard-wir…

…ed InputTags
mdhildreth · Sep 11, 2015 · 302f97a · 302f97a
1 parent 45af043
commit 302f97a
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 0 deletions.
diff --git a/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py b/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py
@@ -64,6 +64,8 @@
     #
     associatePixel = cms.bool(True),
     associateStrip = cms.bool(True),
+    pixelSimLinkSrc = cms.InputTag("simSiPixelDigis"),
+    stripSimLinkSrc = cms.InputTag("simSiStripDigis"),
     associateRecoTracks = cms.bool(True),
     #                                
     ROUList = cms.vstring('TrackerHitsTIBLowTof', 

diff --git a/SimTracker/TrackAssociatorProducers/plugins/QuickTrackAssociatorByHitsProducer.cc b/SimTracker/TrackAssociatorProducers/plugins/QuickTrackAssociatorByHitsProducer.cc
@@ -148,6 +148,10 @@ QuickTrackAssociatorByHitsProducer::makeHitAssociatorParameters(const edm::Param
   // I only want to use the hit associator methods that work on the hit IDs (i.e. the uint32_t trackId
   // and the EncodedEventId eventId) so I'm not interested in matching that to the PSimHit objects.
   hitAssociatorParameters.addParameter<bool>("associateRecoTracks",true);
+  // add these new ones to allow redirection of inputs:
+  hitAssociatorParameters.addParameter<edm::InputTag>( "pixelSimLinkSrc", iConfig.getParameter<edm::InputTag>("pixelSimLinkSrc") );
+  hitAssociatorParameters.addParameter<edm::InputTag>( "stripSimLinkSrc", iConfig.getParameter<edm::InputTag>("stripSimLinkSrc") );
+
   return hitAssociatorParameters;
 }
 

diff --git a/SimTracker/TrackAssociatorProducers/python/trackAssociatorByHits_cfi.py b/SimTracker/TrackAssociatorProducers/python/trackAssociatorByHits_cfi.py
@@ -22,6 +22,8 @@
     ThreeHitTracksAreSpecial = cms.bool(True),
     AbsoluteNumberOfHits = cms.bool(False),
     associateStrip = cms.bool(True),
+    pixelSimLinkSrc = cms.InputTag("simSiPixelDigis"),
+    stripSimLinkSrc = cms.InputTag("simSiStripDigis"),
     Purity_SimToReco = cms.double(0.75),
     Cut_RecoToSim = cms.double(0.75),
     SimToRecoDenominator = cms.string('sim'), ##"reco"

diff --git a/Validation/GlobalRecHits/python/globalrechits_analyze_cfi.py b/Validation/GlobalRecHits/python/globalrechits_analyze_cfi.py
@@ -30,6 +30,8 @@
     ECalUncalEESrc = cms.InputTag("ecalWeightUncalibRecHit","EcalUncalibRecHitsEE"),
     Name = cms.untracked.string('GlobalRecHitsAnalyzer'),
     Verbosity = cms.untracked.int32(0), ## 0 provides no output
+    pixelSimLinkSrc = cms.InputTag("simSiPixelDigis"),
+    stripSimLinkSrc = cms.InputTag("simSiStripDigis"),
 
     associateStrip = cms.bool(True),
     MuRPCSrc = cms.InputTag("rpcRecHits"),

diff --git a/Validation/RecoTrack/python/SiPixelTrackingRecHitsValid_cfi.py b/Validation/RecoTrack/python/SiPixelTrackingRecHitsValid_cfi.py
@@ -16,6 +16,8 @@
                                          associatePixel = cms.bool(True),
                                          associateRecoTracks = cms.bool(False),
                                          associateStrip = cms.bool(False),
+                                         pixelSimLinkSrc = cms.InputTag("simSiPixelDigis"),
+                                         stripSimLinkSrc = cms.InputTag("simSiStripDigis"),
                                          ROUList = cms.vstring('g4SimHitsTrackerHitsPixelBarrelLowTof', 
                                                                'g4SimHitsTrackerHitsPixelBarrelHighTof', 
                                                                'g4SimHitsTrackerHitsPixelEndcapLowTof', 

diff --git a/Validation/RecoTrack/python/SiStripTrackingRecHitsValid_cfi.py b/Validation/RecoTrack/python/SiStripTrackingRecHitsValid_cfi.py
@@ -992,6 +992,8 @@
 			'g4SimHitsTrackerHitsTECHighTof'),
     associateRecoTracks = cms.bool(False),
     #	string trajectoryInput = "rsWithMaterialTracks"
+    pixelSimLinkSrc = cms.InputTag("simSiPixelDigis"),
+    stripSimLinkSrc = cms.InputTag("simSiStripDigis"),
     associateStrip = cms.bool(True)
 )
 

diff --git a/Validation/TrackerRecHits/python/SiPixelRecHitsValid_cfi.py b/Validation/TrackerRecHits/python/SiPixelRecHitsValid_cfi.py
@@ -9,6 +9,8 @@
         'g4SimHitsTrackerHitsPixelEndcapHighTof'),
     associateRecoTracks = cms.bool(False),
     associateStrip = cms.bool(False),
+    pixelSimLinkSrc = cms.InputTag("simSiPixelDigis"),
+    stripSimLinkSrc = cms.InputTag("simSiStripDigis"),
     verbose = cms.untracked.bool(False)
 )
 

diff --git a/Validation/TrackerRecHits/python/SiStripRecHitsValid_cfi.py b/Validation/TrackerRecHits/python/SiStripRecHitsValid_cfi.py
@@ -289,6 +289,8 @@
     associateStrip = cms.bool(True),
     rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
     RecHitProducer = cms.string('siStripMatchedRecHits'),
+    pixelSimLinkSrc = cms.InputTag("simSiPixelDigis"),
+    stripSimLinkSrc = cms.InputTag("simSiStripDigis"),
     verbose = cms.untracked.bool(False)
 )