Timing, Laser and Hot cell quality plots adjustments [12_5_X]

DQM/EcalMonitorClient/interface/LaserClient.h

@@ -19,6 +19,7 @@ namespace ecaldqm {
     int minChannelEntries_;
     std::vector<float> expectedAmplitude_;
     float toleranceAmplitudeLo_;
+    float toleranceAmplitudeFwdLo_;
     float toleranceAmplitudeHi_;
     float toleranceAmpRMSRatio_;
     std::vector<float> expectedTiming_;

DQM/EcalMonitorClient/interface/TimingClient.h

@@ -15,7 +15,8 @@ namespace ecaldqm {
   private:
     void setParams(edm::ParameterSet const&) override;
 
-    float toleranceMean_;
+    float ebtoleranceMean_;
+    float eetoleranceMean_;
     float toleranceMeanFwd_;
     float toleranceRMS_;
     float toleranceRMSFwd_;

DQM/EcalMonitorClient/python/LaserClient_cfi.py

@@ -8,6 +8,7 @@
 minChannelEntries = 3
 expectedAmplitude = [1700.0, 1300.0, 1700.0, 1700.0]
 toleranceAmplitudeLo = 0.1
+toleranceAmplitudeFwdLo = 0.01
 toleranceAmplitudeHi = 2.06
 toleranceAmpRMSRatio = 0.3
 expectedPNAmplitude = [800.0, 800.0, 800.0, 800.0]
@@ -23,6 +24,7 @@
         minChannelEntries = cms.untracked.int32(minChannelEntries),
         expectedAmplitude = cms.untracked.vdouble(expectedAmplitude),
         toleranceAmplitudeLo = cms.untracked.double(toleranceAmplitudeLo),
+	toleranceAmplitudeFwdLo = cms.untracked.double(toleranceAmplitudeFwdLo),
         toleranceAmplitudeHi = cms.untracked.double(toleranceAmplitudeHi),
         toleranceAmpRMSRatio = cms.untracked.double(toleranceAmpRMSRatio),
         expectedPNAmplitude = cms.untracked.vdouble(expectedPNAmplitude),

DQM/EcalMonitorClient/python/TimingClient_cfi.py

@@ -5,7 +5,8 @@
 
 minChannelEntries = 1
 minTowerEntries = 3
-toleranceMean = 2.
+ebtoleranceMean = 2.
+eetoleranceMean = 3.
 toleranceRMS = 6.
 minChannelEntriesFwd = 8
 minTowerEntriesFwd = 24
@@ -18,7 +19,8 @@
     params = cms.untracked.PSet(
         minChannelEntries = cms.untracked.int32(minChannelEntries),
         minTowerEntries = cms.untracked.int32(minTowerEntries),
-        toleranceMean = cms.untracked.double(toleranceMean),
+        ebtoleranceMean = cms.untracked.double(ebtoleranceMean),
+	eetoleranceMean = cms.untracked.double(eetoleranceMean),
         toleranceRMS = cms.untracked.double(toleranceRMS),
         minChannelEntriesFwd = cms.untracked.int32(minChannelEntriesFwd),
         minTowerEntriesFwd = cms.untracked.int32(minTowerEntriesFwd),
@@ -127,14 +129,14 @@
             kind = cms.untracked.string('TH2F'),
             otype = cms.untracked.string('Ecal3P'),
             btype = cms.untracked.string('SuperCrystal'),
-            description = cms.untracked.string('Summary of the timing data quality. A 5x5 tower is red if the mean timing of the tower is off by more than ' + str(toleranceMean) + ' or RMS is greater than ' + str(toleranceRMS) + ' (' + str(toleranceMeanFwd) + ' and ' + str(toleranceRMSFwd) + ' in forward region). Towers with total entries less than ' + str(minTowerEntries) + ' are not subject to this evaluation. Since 5x5 tower timings are calculated with a tighter time-window than per-channel timings, a tower can additionally become red if its the sum of per-channel timing histogram entries is greater than per-tower histogram entries by factor ' + str(1. / (1. - tailPopulThreshold)) + ' (significant fraction of events fall outside the tight time-window).')
+            description = cms.untracked.string('Summary of the timing data quality. A 5x5 tower is red if the mean timing of the tower is off by more than ' + str(ebtoleranceMean) + 'for EB and ' + str(eetoleranceMean) + 'for EE, or RMS is greater than ' + str(toleranceRMS) + ' (' + str(toleranceMeanFwd) + ' and ' + str(toleranceRMSFwd) + ' in forward region). Towers with total entries less than ' + str(minTowerEntries) + ' are not subject to this evaluation. Since 5x5 tower timings are calculated with a tighter time-window than per-channel timings, a tower can additionally become red if its the sum of per-channel timing histogram entries is greater than per-tower histogram entries by factor ' + str(1. / (1. - tailPopulThreshold)) + ' (significant fraction of events fall outside the tight time-window).')
         ),
         Quality = cms.untracked.PSet(
             path = cms.untracked.string('%(subdet)s/%(prefix)sTimingClient/%(prefix)sTMT timing quality %(sm)s'),
             kind = cms.untracked.string('TH2F'),
             otype = cms.untracked.string('SM'),
             btype = cms.untracked.string('Crystal'),
-            description = cms.untracked.string('Summary of the timing data quality. A channel is red if its mean timing is off by more than ' + str(toleranceMean) + ' or RMS is greater than ' + str(toleranceRMS) + '. Channels with entries less than ' + str(minChannelEntries) + ' are not considered.')
+            description = cms.untracked.string('Summary of the timing data quality. A channel is red if its mean timing is off by more than ' + str(ebtoleranceMean) + 'for EB and' + str(eetoleranceMean) + 'for EE, or RMS is greater than ' + str(toleranceRMS) + '. Channels with entries less than ' + str(minChannelEntries) + ' are not considered.')
         ),
         MeanAll = cms.untracked.PSet(
             path = cms.untracked.string('%(subdet)s/%(prefix)sSummaryClient/%(prefix)sTMT%(suffix)s timing mean 1D summary'),

DQM/EcalMonitorClient/src/LaserClient.cc

@@ -18,6 +18,7 @@ namespace ecaldqm {
         minChannelEntries_(0),
         expectedAmplitude_(0),
         toleranceAmplitudeLo_(0.),
+        toleranceAmplitudeFwdLo_(0.),
         toleranceAmplitudeHi_(0.),
         toleranceAmpRMSRatio_(0.),
         expectedTiming_(0),
@@ -31,6 +32,7 @@ namespace ecaldqm {
   void LaserClient::setParams(edm::ParameterSet const& _params) {
     minChannelEntries_ = _params.getUntrackedParameter<int>("minChannelEntries");
     toleranceAmplitudeLo_ = _params.getUntrackedParameter<double>("toleranceAmplitudeLo");
+    toleranceAmplitudeFwdLo_ = _params.getUntrackedParameter<double>("toleranceAmplitudeFwdLo");
     toleranceAmplitudeHi_ = _params.getUntrackedParameter<double>("toleranceAmplitudeHi");
     toleranceAmpRMSRatio_ = _params.getUntrackedParameter<double>("toleranceAmpRMSRatio");
     toleranceTiming_ = _params.getUntrackedParameter<double>("toleranceTiming");
@@ -148,16 +150,20 @@ namespace ecaldqm {
 
         float tMean(tItr->getBinContent());
         float tRms(tItr->getBinError() * sqrt(tEntries));
+        float threshAmplitudeLo_;
 
         meTimingMean.fill(getEcalDQMSetupObjects(), id, tMean);
         meTimingRMS.fill(getEcalDQMSetupObjects(), id, tRms);
         meTimingRMSMap.setBinContent(getEcalDQMSetupObjects(), id, tRms);
 
         float intensity(aMean / expectedAmplitude_[wlItr->second]);
-        if (isForward(id))
+        if (isForward(id)) {
           intensity /= forwardFactor_;
+          threshAmplitudeLo_ = toleranceAmplitudeFwdLo_;
+        } else
+          threshAmplitudeLo_ = toleranceAmplitudeLo_;
 
-        if (intensity < toleranceAmplitudeLo_ || intensity > toleranceAmplitudeHi_ ||
+        if (intensity < threshAmplitudeLo_ || intensity > toleranceAmplitudeHi_ ||
             aRms > aMean * toleranceAmpRMSRatio_ ||
             std::abs(tMean - expectedTiming_[wlItr->second]) > toleranceTiming_ /*|| tRms > toleranceTimRMS_*/)
           qItr->setBinContent(doMask ? kMBad : kBad);

DQM/EcalMonitorClient/src/OccupancyClient.cc

@@ -180,7 +180,7 @@ namespace ecaldqm {
             meQualitySummary.maskMatches(id, mask, statusManager_, GetTrigTowerMap()) ? kMBad : kBad);
       }
     }
-
+    /* Disabling as it's creating false alarms with whole FEDs RED when few hot towers show up. To be tuned.
     // Quality check: set entire FED to BAD if its occupancy begins to vanish
     // Fill FED statistics from (filtered) RecHit Occupancy
     float meanFEDEB(0), meanFEDEE(0), rmsFEDEB(0), rmsFEDEE(0);
@@ -223,7 +223,7 @@ namespace ecaldqm {
             id,
             meQualitySummary.maskMatches(id, mask, statusManager_, GetTrigTowerMap()) ? kMBad : kBad);
     }
-
+    */
   }  // producePlots()
 
   DEFINE_ECALDQM_WORKER(OccupancyClient);

DQM/EcalMonitorClient/src/TimingClient.cc

@@ -12,7 +12,8 @@
 namespace ecaldqm {
   TimingClient::TimingClient()
       : DQWorkerClient(),
-        toleranceMean_(0.),
+        ebtoleranceMean_(0.),
+        eetoleranceMean_(0.),
         toleranceMeanFwd_(0.),
         toleranceRMS_(0.),
         toleranceRMSFwd_(0.),
@@ -26,7 +27,8 @@ namespace ecaldqm {
   }
 
   void TimingClient::setParams(edm::ParameterSet const& _params) {
-    toleranceMean_ = _params.getUntrackedParameter<double>("toleranceMean");
+    ebtoleranceMean_ = _params.getUntrackedParameter<double>("ebtoleranceMean");
+    eetoleranceMean_ = _params.getUntrackedParameter<double>("eetoleranceMean");
     toleranceMeanFwd_ = _params.getUntrackedParameter<double>("toleranceMeanFwd");
     toleranceRMS_ = _params.getUntrackedParameter<double>("toleranceRMS");
     toleranceRMSFwd_ = _params.getUntrackedParameter<double>("toleranceRMSFwd");
@@ -73,9 +75,14 @@ namespace ecaldqm {
       DetId id(qItr->getId());
 
       int minChannelEntries(minChannelEntries_);
-      float meanThresh(toleranceMean_);
+      float meanThresh;
       float rmsThresh(toleranceRMS_);
 
+      if (id.subdetId() == EcalBarrel)
+        meanThresh = ebtoleranceMean_;
+      else
+        meanThresh = eetoleranceMean_;
+
       if (isForward(id)) {
         minChannelEntries = minChannelEntriesFwd_;
         meanThresh = toleranceMeanFwd_;
@@ -185,9 +192,14 @@ namespace ecaldqm {
         ids = scConstituents(EcalScDetId(tId));
 
       int minTowerEntries(minTowerEntries_);
-      float meanThresh(toleranceMean_);
+      float meanThresh;
       float rmsThresh(toleranceRMS_);
 
+      if (tId.subdetId() == EcalBarrel)
+        meanThresh = ebtoleranceMean_;
+      else
+        meanThresh = eetoleranceMean_;
+
       if (isForward(tId)) {
         minTowerEntries = minTowerEntriesFwd_;
         meanThresh = toleranceMeanFwd_;