Merge pull request #28258 from kpedro88/FastDeDxContent_102X

Include dedx collections in fastsim output [102X]
cms-sw · Nov 12, 2019 · 2e25163 · 2e25163
2 parents 21c84ce + 5e8baa6
commit 2e25163
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastTrackDeDxProducer.cc b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastTrackDeDxProducer.cc
@@ -122,8 +122,8 @@ void FastTrackDeDxProducer::fillDescriptions(edm::ConfigurationDescriptions& des
   desc.add<edm::InputTag>("tracks",edm::InputTag("generalTracks"));
   desc.add<bool>("UsePixel",false); 
   desc.add<bool>("UseStrip",true); 
-  desc.add<double>("MeVperADCPixel",3.61e-06*265);
-  desc.add<double>("MeVperADCStrip",3.61e-06);
+  desc.add<double>("MeVperADCStrip",3.61e-06*265);
+  desc.add<double>("MeVperADCPixel",3.61e-06);
   desc.add<bool>("ShapeTest",true);      
   desc.add<bool>("UseCalibration",false);  
   desc.add<string>("calibrationPath", "");

diff --git a/RecoTracker/Configuration/python/RecoTracker_cff.py b/RecoTracker/Configuration/python/RecoTracker_cff.py
@@ -32,5 +32,4 @@
 trackingGlobalReco = cms.Sequence(ckftracks*trackExtrapolator)
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
-_fastSim_trackingGlobalReco = cms.Sequence(trackExtrapolator)
-fastSim.toReplaceWith(trackingGlobalReco,_fastSim_trackingGlobalReco)
+fastSim.toReplaceWith(trackingGlobalReco, cms.Sequence(doAlldEdXEstimators*trackExtrapolator))
diff --git a/RecoTracker/DeDx/python/dedxEstimators_cff.py b/RecoTracker/DeDx/python/dedxEstimators_cff.py
@@ -46,6 +46,20 @@
     calibrationPath = cms.string(""),
 )
 
+from Configuration.Eras.Modifier_fastSim_cff import fastSim
+
+# explicit python dependency
+import FastSimulation.SimplifiedGeometryPropagator.FastTrackDeDxProducer_cfi
+
+# do this before defining dedxPixelHarmonic2 so it automatically comes out right
+fastSim.toReplaceWith(dedxHarmonic2,
+    FastSimulation.SimplifiedGeometryPropagator.FastTrackDeDxProducer_cfi.FastTrackDeDxProducer.clone(
+        ShapeTest = False,
+        simHit2RecHitMap = cms.InputTag("fastMatchedTrackerRecHits","simHit2RecHitMap"),
+        simHits = cms.InputTag("fastSimProducer","TrackerHits"),
+    )
+)
+
 dedxPixelHarmonic2 = dedxHarmonic2.clone(UseStrip = False, UsePixel = True)
 
 dedxPixelAndStripHarmonic2T085 = dedxHarmonic2.clone(
@@ -78,3 +92,5 @@
 
 doAlldEdXEstimatorsTask = cms.Task(dedxTruncated40 , dedxHarmonic2 , dedxPixelHarmonic2 , dedxPixelAndStripHarmonic2T085 , dedxHitInfo)
 doAlldEdXEstimators = cms.Sequence(doAlldEdXEstimatorsTask)
+
+fastSim.toReplaceWith(doAlldEdXEstimatorsTask, cms.Task(dedxHarmonic2, dedxPixelHarmonic2))