resolve conflict in TkStackMeasurementDet.h

cms-sw · Aug 27, 2020 · 922c8ac · 922c8ac
1 parent 045ec6d
commit 922c8ac
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py b/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py
@@ -23,7 +23,7 @@
 
 from RecoLocalTracker.SiPhase2Clusterizer.phase2TrackerClusterizer_cfi import *
 from RecoLocalTracker.Phase2TrackerRecHits.Phase2StripCPEGeometricESProducer_cfi import *
-from RecoLocalTracker.SiPhase2VectorHitBuilder.SiPhase2RecHitMatcher_cfi import *
+from RecoLocalTracker.SiPhase2VectorHitBuilder.siPhase2RecHitMatcherESProducer_cfi import *
 
 _pixeltrackerlocalrecoTask_phase2 = pixeltrackerlocalrecoTask.copy()
 _pixeltrackerlocalrecoTask_phase2.add(siPhase2Clusters)

diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/plugins/SiPhase2RecHitMatcherESProducer.cc b/RecoLocalTracker/SiPhase2VectorHitBuilder/plugins/SiPhase2RecHitMatcherESProducer.cc
@@ -15,33 +15,30 @@ class SiPhase2RecHitMatcherESProducer : public edm::ESProducer {
   SiPhase2RecHitMatcherESProducer(const edm::ParameterSet&);
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
   std::shared_ptr<VectorHitBuilderEDProducer> produce(const TkPhase2OTCPERecord&);
+  edm::ESGetToken<TrackerGeometry, TkPhase2OTCPERecord> tGeomToken_;
+  edm::ESGetToken<TrackerTopology, TkPhase2OTCPERecord> tTopoToken_;
 
 private:
   std::string name_;
-  std::shared_ptr<VectorHitBuilderEDProducer> matcher_;
   edm::ParameterSet pset_;
 };
 
 SiPhase2RecHitMatcherESProducer::SiPhase2RecHitMatcherESProducer(const edm::ParameterSet& p) {
   name_ = p.getParameter<std::string>("ComponentName");
   pset_ = p;
-  setWhatProduced(this, name_);
+  auto cc = setWhatProduced(this, name_);
+  tGeomToken_ = cc.consumes<TrackerGeometry>();
+  tTopoToken_ = cc.consumes<TrackerTopology>();
 }
 
 std::shared_ptr<VectorHitBuilderEDProducer> SiPhase2RecHitMatcherESProducer::produce(
     const TkPhase2OTCPERecord& iRecord) {
-  if (name_ == "SiPhase2VectorHitMatcher") {
-    matcher_ = std::make_shared<VectorHitBuilderEDProducer>(pset_);
+//  if (name_ == "SiPhase2VectorHitMatcher") {
+    std::shared_ptr<VectorHitBuilderEDProducer> matcher_ = std::make_shared<VectorHitBuilderEDProducer>(pset_);
 
-    edm::ESHandle<TrackerGeometry> tGeomHandle;
-    edm::ESHandle<TrackerTopology> tTopoHandle;
-
-    iRecord.getRecord<TrackerDigiGeometryRecord>().get(tGeomHandle);
-    iRecord.getRecord<TrackerTopologyRcd>().get(tTopoHandle);
-
-    matcher_->algo()->initTkGeom(tGeomHandle);
-    matcher_->algo()->initTkTopo(tTopoHandle);
-  }
+    matcher_->algo()->initTkGeom(iRecord.getHandle(tGeomToken_));
+    matcher_->algo()->initTkTopo(iRecord.getHandle(tTopoToken_));
+//  }
   return matcher_;
 }
 
@@ -74,7 +71,7 @@ void SiPhase2RecHitMatcherESProducer::fillDescriptions(edm::ConfigurationDescrip
                                     0.1,
                                     0.1,
                                 });
-  descriptions.add("SiPhase2RecHitMatcherESProducer", desc);
+  descriptions.add("siPhase2RecHitMatcherESProducer", desc);
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(SiPhase2RecHitMatcherESProducer);
diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/python/SiPhase2RecHitMatcher_cfi.py b/RecoLocalTracker/SiPhase2VectorHitBuilder/python/SiPhase2RecHitMatcher_cfi.py
diff --git a/RecoTracker/GeometryESProducer/python/TrackerRecoGeometryESProducer_cfi.py b/RecoTracker/GeometryESProducer/python/TrackerRecoGeometryESProducer_cfi.py
@@ -5,5 +5,5 @@
 )
 
 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
-trackingPhase2PU140.toModify(TrackerRecoGeometryESProducer, usePhase2Stacks = False)
+trackingPhase2PU140.toModify(TrackerRecoGeometryESProducer, usePhase2Stacks = True)