Add condition for runs without luminosity and fix unittest fail

cms-sw · Nov 7, 2021 · ab48878 · ab48878
1 parent b6d7108
commit ab48878
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/DQM/EcalMonitorClient/src/MLClient.cc b/DQM/EcalMonitorClient/src/MLClient.cc
@@ -35,7 +35,10 @@ namespace ecaldqm {
     //Get the no.of events and the PU per LS calculated in OccupancyTask
     int nEv = sNumEvents.getFloatValue();
     double pu = sPU.getFloatValue();
-
+    //Do not compute ML quality if PU is non existent.
+    if (pu < 0.) {
+      return;
+    }
     uint32_t mask(1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR |
                   1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_WARNING |
                   1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_ERROR);

diff --git a/DQM/EcalMonitorTasks/src/OccupancyTask.cc b/DQM/EcalMonitorTasks/src/OccupancyTask.cc
@@ -14,7 +14,7 @@ namespace ecaldqm {
     recHitThreshold_ = _params.getUntrackedParameter<double>("recHitThreshold");
     tpThreshold_ = _params.getUntrackedParameter<double>("tpThreshold");
     lumiTag = _params.getParameter<edm::InputTag>("scalers");
-    lumiCheck_ = _params.getUntrackedParameter<bool>("lumiCheck");
+    lumiCheck_ = _params.getUntrackedParameter<bool>("lumiCheck", false);
   }
 
   void OccupancyTask::setTokens(edm::ConsumesCollector& _collector) {
@@ -78,8 +78,10 @@ namespace ecaldqm {
       MESet& mePU(static_cast<MESet&>(MEs_.at("PU")));
       edm::Handle<LumiScalersCollection> lumiScalers;
       _evt.getByToken(lumiScalersToken_, lumiScalers);
-      auto scalit = lumiScalers->begin();
-      scal_pu = scalit->pileup();
+      if (lumiScalers.isValid() and not lumiScalers->empty()) {
+        auto scalit = lumiScalers->begin();
+        scal_pu = scalit->pileup();
+      }
       mePU.fill(getEcalDQMSetupObjects(), double(scal_pu));
       FindPUinLS = false;
     }