Remove algo as argument from setTopology

cms-sw · Jul 31, 2019 · edab6bc · edab6bc
1 parent 155b8aa
commit edab6bc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/interface/EcalDeadChannelRecoveryAlgos.h b/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/interface/EcalDeadChannelRecoveryAlgos.h
@@ -17,7 +17,7 @@ template <typename DetIdT>
 class EcalDeadChannelRecoveryAlgos {
 public:
   void setParameters(const edm::ParameterSet &ps);
-  void setCaloTopology(std::string algo, const CaloTopology *topology);
+  void setCaloTopology(const CaloTopology *topology);
   float correct(const DetIdT id,
                 const EcalRecHitCollection &hit_collection,
                 std::string algo,

diff --git a/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/src/EcalDeadChannelRecoveryAlgos.cc b/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/src/EcalDeadChannelRecoveryAlgos.cc
@@ -19,7 +19,7 @@ void EcalDeadChannelRecoveryAlgos<T>::setParameters(const edm::ParameterSet &ps)
 }
 
 template <typename T>
-void EcalDeadChannelRecoveryAlgos<T>::setCaloTopology(std::string algo, const CaloTopology *topo) {
+void EcalDeadChannelRecoveryAlgos<T>::setCaloTopology(const CaloTopology *topo) {
   bdtg_.setCaloTopology(topo);
 }
 

diff --git a/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/test/plugins/EcalDeadChannelRecoveryProducers.cc b/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/test/plugins/EcalDeadChannelRecoveryProducers.cc
@@ -67,8 +67,7 @@ void EcalDeadChannelRecoveryProducers<DetIdT>::produce(edm::Event& evt, const ed
   // create a unique_ptr to a EcalRecHitCollection, copy the RecHits into it and
   // put it in the Event:
   auto redCollection = std::make_unique<EcalRecHitCollection>();
-  std::string dummy;
-  deadChannelCorrector.setCaloTopology(dummy, theCaloTopology.product());
+  deadChannelCorrector.setCaloTopology(theCaloTopology.product());
 
   //
   //  Double loop over EcalRecHit collection and "dead" cell RecHits.

diff --git a/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitWorkerRecover.cc b/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitWorkerRecover.cc
@@ -124,7 +124,7 @@ bool EcalRecHitWorkerRecover::run(const edm::Event& evt,
 
   if (flags == EcalRecHitWorkerRecover::EB_single) {
     // recover as single dead channel
-    ebDeadChannelCorrector.setCaloTopology(singleRecoveryMethod_, caloTopology_.product());
+    ebDeadChannelCorrector.setCaloTopology(caloTopology_.product());
 
     // channel recovery. Accepted new RecHit has the flag AcceptRecHit=TRUE
     bool AcceptRecHit = true;
@@ -142,7 +142,7 @@ bool EcalRecHitWorkerRecover::run(const edm::Event& evt,
 
   } else if (flags == EcalRecHitWorkerRecover::EE_single) {
     // recover as single dead channel
-    eeDeadChannelCorrector.setCaloTopology(singleRecoveryMethod_, caloTopology_.product());
+    eeDeadChannelCorrector.setCaloTopology(caloTopology_.product());
 
     // channel recovery. Accepted new RecHit has the flag AcceptRecHit=TRUE
     bool AcceptRecHit = true;