Merge pull request #28257 from kpedro88/FastDeDxContent_1100pre10

Include dedx collections in fastsim output
cms-sw · Oct 27, 2019 · 5723015 · 5723015
2 parents 796acec + 3ffdf28
commit 5723015
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastTrackDeDxProducer.cc b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastTrackDeDxProducer.cc
@@ -118,8 +118,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", "");
@@ -249,8 +249,7 @@ void FastTrackDeDxProducer::processHit(const FastTrackerRecHit& recHit,
   auto const& thit = static_cast<BaseTrackerRecHit const&>(recHit);
   if (!thit.isValid())
     return;
-  auto const& clus = thit.firstClusterRef();
-  if (!clus.isValid())
+  if (!thit.hasPositionAndError())
     return;
 
   if (recHit.isPixel()) {

diff --git a/RecoTracker/Configuration/python/RecoTracker_cff.py b/RecoTracker/Configuration/python/RecoTracker_cff.py
@@ -38,5 +38,4 @@
 trackingGlobalReco = cms.Sequence(trackingGlobalRecoTask)
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
-_fastSim_trackingGlobalReco = cms.Sequence(trackExtrapolator)
-fastSim.toReplaceWith(trackingGlobalReco,_fastSim_trackingGlobalReco)
+fastSim.toReplaceWith(trackingGlobalRecoTask, cms.Task(doAlldEdXEstimatorsTask, 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))