Restore name check behavior in BaseNumber

cms-sw · Oct 28, 2020 · 08b8ac3 · 08b8ac3
1 parent 19c19e3
commit 08b8ac3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/Geometry/EcalCommonData/src/EcalBaseNumber.cc b/Geometry/EcalCommonData/src/EcalBaseNumber.cc
@@ -25,7 +25,7 @@ int EcalBaseNumber::getCopyNumber(int level) const { return _sortedCopyNumber[le
 
 int EcalBaseNumber::getCopyNumber(const std::string& levelName) const {
   for (int iLevel = 0; iLevel < _theLevels; iLevel++) {
-    if (_sortedName[iLevel].find(levelName) != std::string::npos) {
+    if (_sortedName[iLevel] == levelName) {
       return _sortedCopyNumber[iLevel];
     }
   }

diff --git a/SimG4CMS/Calo/src/ECalSD.cc b/SimG4CMS/Calo/src/ECalSD.cc
@@ -222,9 +222,9 @@ double ECalSD::getEnergyDeposit(const G4Step* aStep) {
     edep *= wt2;
   }
 #ifdef EDM_ML_DEBUG
-  edm::LogVerbatim("EcalSim") << lv->GetName() << " " << dd4hep::dd::noNamespace(lv->GetName()) << " Light Collection Efficiency "
-                              << weight << ":" << wt1 << " wt2= " << wt2 << " Weighted Energy Deposit "
-                              << edep / CLHEP::MeV << " MeV";
+  edm::LogVerbatim("EcalSim") << lv->GetName() << " " << dd4hep::dd::noNamespace(lv->GetName())
+                              << " Light Collection Efficiency " << weight << ":" << wt1 << " wt2= " << wt2
+                              << " Weighted Energy Deposit " << edep / CLHEP::MeV << " MeV";
 #endif
   return edep;
 }
@@ -456,9 +456,8 @@ void ECalSD::getBaseNumber(const G4Step* aStep) {
       std::string_view name = dd4hep::dd::noNamespace(touch->GetVolume(ii)->GetName());
       theBaseNumber.addLevel(std::string(name), touch->GetReplicaNumber(ii));
 #ifdef EDM_ML_DEBUG
-      edm::LogVerbatim("EcalSim") << "ECalSD::getBaseNumber(): Adding level " << ii << ": "
-				  << name << "[" << touch->GetReplicaNumber(ii)
-                                  << "]";
+      edm::LogVerbatim("EcalSim") << "ECalSD::getBaseNumber(): Adding level " << ii << ": " << name << "["
+                                  << touch->GetReplicaNumber(ii) << "]";
 #endif
     }
   }
@@ -482,9 +481,9 @@ double ECalSD::getBirkL3(const G4Step* aStep) {
         weight = 1.;
     }
 #ifdef EDM_ML_DEBUG
-    edm::LogVerbatim("EcalSim") << "ECalSD::getBirkL3 in " << dd4hep::dd::noNamespace(mat->GetName()) << " Charge " << charge
-                                << " dE/dx " << dedx << " Birk Const " << rkb << " Weight = " << weight << " dE "
-                                << aStep->GetTotalEnergyDeposit();
+    edm::LogVerbatim("EcalSim") << "ECalSD::getBirkL3 in " << dd4hep::dd::noNamespace(mat->GetName()) << " Charge "
+                                << charge << " dE/dx " << dedx << " Birk Const " << rkb << " Weight = " << weight
+                                << " dE " << aStep->GetTotalEnergyDeposit();
 #endif
   }
   return weight;