Merge pull request #20764 from davidlange6/compfix6

remove some divide by 0s and extend blacklist of histograms
cms-sw · Oct 6, 2017 · a37ee8e · a37ee8e
2 parents 01dc855 + 623b178
commit a37ee8e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
@@ -943,7 +943,9 @@ CTPPSDiamondDQMSource::endLuminosityBlock( const edm::LuminosityBlock&, const ed
   }
 
   for ( auto& plot : potPlots_ ) {
-    double HundredOverHitCounterPot = 100. / plot.second.HitCounter;
+    double HundredOverHitCounterPot = 0.;
+    if ( plot.second.HitCounter !=0 )
+      HundredOverHitCounterPot = 100. / plot.second.HitCounter;
     plot.second.HPTDCErrorFlags_cumulative->setBinContent( 16, HundredOverHitCounterPot * plot.second.MHCounter );
     plot.second.leadingWithoutTrailingCumulativePot->setBinContent(1, HundredOverHitCounterPot * plot.second.LeadingOnlyCounter ); 
     plot.second.leadingWithoutTrailingCumulativePot->setBinContent(2, HundredOverHitCounterPot * plot.second.TrailingOnlyCounter ); 

diff --git a/Utilities/RelMon/data/blacklist.txt b/Utilities/RelMon/data/blacklist.txt
@@ -80,3 +80,4 @@ Tracking/TrackParameters/LSanalysis/NumberOfTracks_lumiFlag_GenTk
 EcalPreshower/ESIntegrityTask/ES
 Hcal/LSbyLS_Hcal/LSvalues/ProblemsThisLS
 AlcaBeamMonitor/Service/hHistoLumiValues
+DQM/TimerService
diff --git a/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc b/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc
@@ -143,7 +143,7 @@ void BDHadronTrackMonitoringHarvester::dqmEndJob(DQMStore::IBooker & ibook, DQMS
     float mean_bjets[6];
     float std_bjets[6];
     float meanAll_bjets;
-    meanAll_bjets = nTrkAll_bjet->getMean(1);
+    meanAll_bjets = std::max(0.01,nTrkAll_bjet->getMean(1));
     for (unsigned int i = 0; i< BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++){
         mean_bjets[i] = nTrk_bjet[i]->getMean(1); // mean number of tracks per category
         std_bjets[i] = nTrk_bjet[i]->getRMS(1);
@@ -156,7 +156,7 @@ void BDHadronTrackMonitoringHarvester::dqmEndJob(DQMStore::IBooker & ibook, DQMS
     float mean_cjets[6];
     float std_cjets[6];
     float meanAll_cjets;
-    meanAll_cjets = nTrkAll_cjet->getMean(1);
+    meanAll_cjets = std::max(0.01,nTrkAll_cjet->getMean(1));
     for (unsigned int i = 0; i< BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++){
         mean_cjets[i] = nTrk_cjet[i]->getMean(1); // mean number of tracks per category
         std_cjets[i] = nTrk_cjet[i]->getRMS(1);
@@ -170,7 +170,7 @@ void BDHadronTrackMonitoringHarvester::dqmEndJob(DQMStore::IBooker & ibook, DQMS
     float mean_dusgjets[6];
     float std_dusgjets[6];
     float meanAll_dusgjets;
-    meanAll_dusgjets = nTrkAll_dusgjet->getMean(1);
+    meanAll_dusgjets = std::max(0.01,nTrkAll_dusgjet->getMean(1));
     for (unsigned int i = 0; i< BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++){
         mean_dusgjets[i] = nTrk_dusgjet[i]->getMean(1); // mean number of tracks per category
         std_dusgjets[i] = nTrk_dusgjet[i]->getRMS(1);