Merge pull request #15493 from threus/fedplots_80

fixing FEDFatal ME and reportSummaryMap in DQM for 8_0

DQMServices/Components/src/DQMFEDIntegrityClient.cc

@@ -269,26 +269,24 @@ void DQMFEDIntegrityClient::fillHistograms(void){
 
         //      cout << "FED ID range : " << xmin << " - " << xmax << endl;
 
+	float binentry = 0.;
         for(int bin = 1; bin <= Nbins ; ++bin) {
           int id = xmin+bin;
-          entry += rootHisto->GetBinContent(bin);
+	  binentry = rootHisto->GetBinContent(bin);
+          entry += binentry;
           norm += rootHistoNorm->GetBinContent(bin);
           //      cout << *fat << "errors = " << entry << "\tnorm = " << norm << endl;
           //      cout << "Bin content : " << entry << endl;
-          if(entry > 0.) FedFatal->setBinContent(id, entry);
+	  FedFatal->setBinContent(id, binentry);
         }
-
       }
     }
 
     if (norm > 0) SummaryContent[k] = 1.0 - entry/norm;
     //      cout << "Summary Content : " << SummaryContent[k] << endl;
     reportSummaryContent[k]->Fill(SummaryContent[k]);
-    float threshold = 1.;
-    if (k==2 || k==3)          // for EE and EB only show yellow when more than 1% errors.
-         threshold = 0.99;
-    if (SummaryContent[k] < threshold && SummaryContent[k] >=0.95) 
-         SummaryContent[k] = 0.949;
+    if ( (k==2 || k==3)          // for EE and EB only show yellow when more than 1% errors.
+	 && SummaryContent[k] >=0.95 && SummaryContent[k] < 0.99 ) SummaryContent[k] = 0.949;
     reportSummaryMap->setBinContent(1, nSubsystems-k, SummaryContent[k]);
     sum = sum + SummaryContent[k];