fix filtering for simulated events

cms-sw · Mar 16, 2020 · 5f46131 · 5f46131
1 parent f4cbf04
commit 5f46131
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/CalibTracker/SiStripCommon/src/SiStripDCSStatus.cc b/CalibTracker/SiStripCommon/src/SiStripDCSStatus.cc
@@ -58,10 +58,14 @@ bool SiStripDCSStatus::getStatus(edm::Event const& e, edm::EventSetup const& eSe
   }
 
   if ((*dcsStatus).empty()) {
-    dcsTIBTID = (*dcsRecord).highVoltageReady(DCSRecord::Partition::TIBTID);
-    dcsTOB = (*dcsRecord).highVoltageReady(DCSRecord::Partition::TOB);
-    dcsTECF = (*dcsRecord).highVoltageReady(DCSRecord::Partition::TECp);
-    dcsTECB = (*dcsRecord).highVoltageReady(DCSRecord::Partition::TECm);
+    if (e.eventAuxiliary().isRealData()) {
+      dcsTIBTID = (*dcsRecord).highVoltageReady(DCSRecord::Partition::TIBTID);
+      dcsTOB = (*dcsRecord).highVoltageReady(DCSRecord::Partition::TOB);
+      dcsTECF = (*dcsRecord).highVoltageReady(DCSRecord::Partition::TECp);
+      dcsTECB = (*dcsRecord).highVoltageReady(DCSRecord::Partition::TECm);
+    } else {
+      return retVal;
+    }
   } else {
     dcsTIBTID = ((*dcsStatus)[0].ready(DcsStatus::TIBTID));
     dcsTOB = ((*dcsStatus)[0].ready(DcsStatus::TOB));

diff --git a/DPGAnalysis/Skims/src/DetStatus.cc b/DPGAnalysis/Skims/src/DetStatus.cc
@@ -130,7 +130,13 @@ bool DetStatus::filter(edm::Event& evt, edm::EventSetup const& es)
   if (dcsStatus.isValid() && !dcsStatus->empty()) {
     accepted = checkForDCSStatus(*dcsStatus);
   } else if (dcsRecord.isValid()) {
-    accepted = checkForDCSRecord(*dcsRecord);
+    if (evt.eventAuxiliary().isRealData()) {
+      // in case of real data check for DCS
+      accepted = checkForDCSRecord(*dcsRecord);
+    } else {
+      // in case of MC accept in any case
+      accepted = true;
+    }
   } else {
     edm::LogError("DetStatus")
         << "Error! can't get the product, neither DCSRecord, nor scalersRawToDigi: accept in any case!";