Merge pull request #29043 from perrotta/deleteDeadBranchesInCondCoreE…

…calPlugins Delete dead branches in CondCore/EcalPlugins
cms-sw · Mar 3, 2020 · e23ea77 · e23ea77
2 parents 736a698 + 67ddf53
commit e23ea77
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc
@@ -232,17 +232,8 @@ namespace {
       std::shared_ptr<EcalPulseCovariances> payload = fetchPayload(std::get<1>(iov));
       unsigned int run = std::get<0>(iov);
       if (payload.get()) {
-        //	int chan = 0;
         for (int ieta = -MAX_IETA; ieta <= MAX_IETA; ieta++) {
-          Double_t eta = (Double_t)ieta;
-          if (ieta == 0)
-            continue;
-          else if (ieta > 0.)
-            eta = eta - 0.5;  //   0.5 to 84.5
-          else
-            eta = eta + 0.5;  //  -84.5 to -0.5
           for (int iphi = 1; iphi <= MAX_IPHI; iphi++) {
-            //Double_t phi = (Double_t)iphi - 0.5;
             EBDetId id(ieta, iphi);
             for (int i = 0; i < TEMPLATESAMPLES; ++i) {
               for (int j = 0; j < TEMPLATESAMPLES; ++j) {

diff --git a/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc
@@ -204,17 +204,8 @@ namespace {
       std::shared_ptr<EcalPulseShapes> payload = fetchPayload(std::get<1>(iov));
       unsigned int run = std::get<0>(iov);
       if (payload.get()) {
-        //	int chan = 0;
         for (int ieta = -MAX_IETA; ieta <= MAX_IETA; ieta++) {
-          Double_t eta = (Double_t)ieta;
-          if (ieta == 0)
-            continue;
-          else if (ieta > 0.)
-            eta = eta - 0.5;  //   0.5 to 84.5
-          else
-            eta = eta + 0.5;  //  -84.5 to -0.5
           for (int iphi = 1; iphi <= MAX_IPHI; iphi++) {
-            //Double_t phi = (Double_t)iphi - 0.5;
             EBDetId id(ieta, iphi);
             EcalPulseShape pulse = (*payload)[id.rawId()];
             for (int s = 0; s < TEMPLATESAMPLES; s++) {

diff --git a/CondCore/EcalPlugins/plugins/EcalTimeOffsetConstant_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTimeOffsetConstant_PayloadInspector.cc
@@ -106,17 +106,15 @@ namespace {
             align = new TH2F("Ecal Time Offset Constant [ns]", "EB          EE", 2, 0, 2, NbRows, 0, NbRows);
 
           EcalTimeOffsetConstant it = (*payload);
-          double row = NbRows - 0.5;
 
           if (irun == 0) {
             val[0] = it.getEBValue();
             val[1] = it.getEEValue();
 
           } else {
+            double row = NbRows - 0.5;
             align->Fill(0.5, row, it.getEBValue() - val[0]);
             align->Fill(1.5, row, it.getEEValue() - val[1]);
-
-            row = row - 1.;
           }
 
         }  //  if payload.get()
@@ -161,4 +159,4 @@ namespace {
 PAYLOAD_INSPECTOR_MODULE(EcalTimeOffsetConstant) {
   PAYLOAD_INSPECTOR_CLASS(EcalTimeOffsetConstantPlot);
   PAYLOAD_INSPECTOR_CLASS(EcalTimeOffsetConstantDiff);
-}
+}