re-work AlignmentStats and SiPhase2BadStripChannelBuilder in order to…

… comply with deleted copy constructors
cms-sw · Jun 8, 2023 · 6486f5e · 6486f5e
1 parent 1914ab2
commit 6486f5e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc
@@ -88,7 +88,7 @@ void AlignmentStats::beginJob() {  // const edm::EventSetup &iSetup
 void AlignmentStats::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   //load list of detunits needed then in endJob
   if (!trackerGeometry_) {
-    trackerGeometry_ = std::make_unique<TrackerGeometry>(iSetup.getData(esTokenTkGeo_));
+    trackerGeometry_ = &iSetup.getData(esTokenTkGeo_);
   }
 
   if (!trackerTopology_) {
@@ -308,7 +308,7 @@ void AlignmentStats::endJob() {
   */
 
   std::unique_ptr<AlignableTracker> theAliTracker =
-      std::make_unique<AlignableTracker>(trackerGeometry_.get(), trackerTopology_.get());
+      std::make_unique<AlignableTracker>(trackerGeometry_, trackerTopology_.get());
   const auto &Detunitslist = theAliTracker->deepComponents();
   int ndetunits = Detunitslist.size();
   edm::LogInfo("AlignmentStats") << "Number of DetUnits in the AlignableTracker: " << ndetunits;

diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.h b/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.h
@@ -73,7 +73,7 @@ class AlignmentStats : public edm::one::EDAnalyzer<> {
   DetHitMap overlapmap_;
 
   std::unique_ptr<TrackerTopology> trackerTopology_;
-  std::unique_ptr<TrackerGeometry> trackerGeometry_;
+  const TrackerGeometry *trackerGeometry_;
 };
 
 #endif
diff --git a/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc b/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc
@@ -47,7 +47,7 @@ class SiPhase2BadStripChannelBuilder : public ConditionDBWriter<SiStripBadStrip>
   void algoBeginRun(const edm::Run& run, const edm::EventSetup& es) override {
     if (!tTopo_) {
       tTopo_ = std::make_unique<TrackerTopology>(es.getData(topoToken_));
-      tGeom_ = std::make_unique<TrackerGeometry>(es.getData(geomToken_));
+      tGeom_ = &es.getData(geomToken_);
     }
   };
 
@@ -63,7 +63,7 @@ class SiPhase2BadStripChannelBuilder : public ConditionDBWriter<SiStripBadStrip>
 
   // ----------member data ---------------------------
   std::unique_ptr<TrackerTopology> tTopo_;
-  std::unique_ptr<TrackerGeometry> tGeom_;
+  const TrackerGeometry* tGeom_;
   CLHEP::HepRandomEngine* engine_;
 
   const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topoToken_;
@@ -220,8 +220,6 @@ std::unique_ptr<SiStripBadStrip> SiPhase2BadStripChannelBuilder::getNewObject()
   } else {
     edm::LogError("SiPhase2BadStripChannelBuilder") << "Service is unavailable" << std::endl;
   }
-
-  tGeom_.release();
   return obj;
 }