Extended warning and dubug printouts

Author: civanch

SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc

@@ -383,7 +383,8 @@ void HcalDigitizer::accumulateCaloHits(edm::Handle<std::vector<PCaloHit>> const
       DetId id(hcalHitsOrig[i].id());
       HcalDetId hid(id);
       if (!htopoP->validHcal(hid)) {
-        edm::LogError("HcalDigitizer") << "bad hcal id found in digitizer. Skipping " << id.rawId() << " " << hid;
+        edm::LogError("HcalDigitizer") << "bad hcal id found in digitizer. Skipping " << id.rawId() << " " << hid
+	         		       << "  hit#" << i << " Nhits=" << hcalHitsOrig.size();
         continue;
       } else if (hid.subdet() == HcalForward && !doHFWindow_ && hcalHitsOrig[i].depth() != 0) {
         // skip HF window hits unless desired
@@ -440,13 +441,14 @@ void HcalDigitizer::accumulateCaloHits(edm::Handle<std::vector<PCaloHit>> const
         HcalZDCDetId hid(id);
         if (!ztopoP->valid(hid)) {
           edm::LogError("HcalDigitizer") << "bad zdc id found in digitizer. Skipping " << std::hex << id.rawId()
-                                         << std::dec << " " << hid;
+                                         << std::dec << " " << hid
+					 << "  hit#" << i << " Nhits=" << zdcHitsOrig.size();
           continue;
         }
         zdcHits.push_back(zdcHitsOrig[i]);
 #ifdef EDM_ML_DEBUG
         edm::LogVerbatim("HcalSim") << "Hit " << i << " out of " << zdcHitsOrig.size() << " " << std::hex << id.rawId()
-                                    << " " << hid;
+                                    << " " << hid << "  hit#" << i << " Nhits=" << zdcHitsOrig.size();
 #endif
       }
       theZDCDigitizer->add(zdcHits, bunchCrossing, engine);
@@ -528,21 +530,13 @@ void HcalDigitizer::finalizeEvent(edm::Event &e, const edm::EventSetup &eventSet
     theZDCDigitizer->run(*zdcResult, engine);
   }
 
-  edm::LogVerbatim("HcalDigitizer") << "HCAL HBHE digis : " << hbheResult->size();
-  edm::LogVerbatim("HcalDigitizer") << "HCAL HO digis   : " << hoResult->size();
-  edm::LogVerbatim("HcalDigitizer") << "HCAL HF digis   : " << hfResult->size();
-  edm::LogVerbatim("HcalDigitizer") << "HCAL ZDC digis  : " << zdcResult->size();
-  edm::LogVerbatim("HcalDigitizer") << "HCAL HF QIE10 digis : " << hfQIE10Result->size();
-  edm::LogVerbatim("HcalDigitizer") << "HCAL HBHE QIE11 digis : " << hbheQIE11Result->size();
-
-#ifdef EDM_ML_DEBUG
-  edm::LogVerbatim("HcalSim") << "\nHCAL HBHE digis : " << hbheResult->size();
-  edm::LogVerbatim("HcalSim") << "HCAL HO   digis : " << hoResult->size();
-  edm::LogVerbatim("HcalSim") << "HCAL HF   digis : " << hfResult->size();
-  edm::LogVerbatim("HcalSim") << "HCAL ZDC  digis : " << zdcResult->size();
-  edm::LogVerbatim("HcalSim") << "HCAL HF QIE10 digis : " << hfQIE10Result->size();
-  edm::LogVerbatim("HcalSim") << "HCAL HBHE QIE11 digis : " << hbheQIE11Result->size();
-#endif
+  edm::LogVerbatim("HcalDigitizer")
+      << "HCAL HBHE digis : " << hbheResult->size() << "\n"
+      << "HCAL HO digis   : " << hoResult->size() << "\n"
+      << "HCAL HF digis   : " << hfResult->size()  << "\n"
+      << "HCAL ZDC digis  : " << zdcResult->size() << "\n"
+      << "HCAL HF QIE10 digis : " << hfQIE10Result->size() << "\n"
+      << "HCAL HBHE QIE11 digis : " << hbheQIE11Result->size();
 
   // Step D: Put outputs into event
   e.put(std::move(hbheResult));