Merge pull request #14936 from mbandrews/Noise80X

Add noise correlation+difference plots
cms-sw · Jun 24, 2016 · 231c2ed · 231c2ed
2 parents dac1e7c + 2a5203e
commit 231c2ed
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 5 deletions.
diff --git a/DQM/EcalCommon/src/MESetBinningUtils2.cc b/DQM/EcalCommon/src/MESetBinningUtils2.cc
@@ -216,14 +216,14 @@ namespace ecaldqm
         case kPseudoStrip:
           specs.nbins = isBarrel ? 68 : (2*nTTOuter + 2*nTTInner); // For EE: numbering of bins
           // is in the order (inner1, inner2, outer1, outer2). ("inner"" := closer to the beam)
-          specs.low = 0.;
-          specs.high = specs.nbins;
+          specs.low = 1.;
+          specs.high = specs.nbins + specs.low;
           specs.title = "tower";
           break;
         case kSuperCrystal:
           specs.nbins = isBarrel ? 68 : nSuperCrystals(iSM + 1);
-          specs.low = 0.;
-          specs.high = specs.nbins;
+          specs.low = 1.;
+          specs.high = specs.nbins + specs.low;
           specs.title = "tower";
           break;
         default:

diff --git a/DQM/EcalMonitorTasks/python/OccupancyTask_cfi.py b/DQM/EcalMonitorTasks/python/OccupancyTask_cfi.py
@@ -180,13 +180,46 @@
             btype = cms.untracked.string('ProjPhi'),
             description = cms.untracked.string('Projection of the occupancy of rec hits with GOOD reconstruction flag and E > ' + str(recHitThreshold) + ' GeV.')
         ),
+        RecHitThrmvp = cms.untracked.PSet(
+            kind = cms.untracked.string('TH2F'),
+            yaxis = cms.untracked.PSet(
+                high = cms.untracked.double(500.0),
+                nbins = cms.untracked.int32(50),
+                low = cms.untracked.double(0.0),
+                title = cms.untracked.string('Nrechits(z-,near)')
+            ),
+            otype = cms.untracked.string('Ecal2P'),
+            xaxis = cms.untracked.PSet(
+                high = cms.untracked.double(500.0),
+                nbins = cms.untracked.int32(50),
+                low = cms.untracked.double(0.0),
+                title = cms.untracked.string('Nrechits(z+,far)')
+            ),
+            btype = cms.untracked.string('User'),
+            path = cms.untracked.string('%(subdet)s/%(prefix)sOccupancyTask/%(prefix)sOT rec hit thr occupancy correlation'),
+            description = cms.untracked.string('Filtered rechit occupancy correlation.')
+        ),
+        RecHitThrpm = cms.untracked.PSet(
+            kind = cms.untracked.string('TH1F'),
+            otype = cms.untracked.string('Ecal2P'),
+            xaxis = cms.untracked.PSet(
+                high = cms.untracked.double(1000.0),
+                nbins = cms.untracked.int32(100),
+                low = cms.untracked.double(-1000.0),
+                title = cms.untracked.string('Nrechits(z+,far) - Nrechits(z-,near)')
+            ),
+            btype = cms.untracked.string('User'),
+            path = cms.untracked.string('%(subdet)s/%(prefix)sOccupancyTask/%(prefix)sOT rec hit thr occupancy z+(far) - z-(near)'),
+            description = cms.untracked.string('Filtered rechit occupancy difference.')
+        )
 #        TPDigiProjPhi = cms.untracked.PSet(
 #            path = cms.untracked.string('%(subdet)s/%(prefix)sOccupancyTask/%(prefix)sOT TP digi occupancy%(suffix)s projection phi'),
 #            kind = cms.untracked.string('TH1F'),
 #            otype = cms.untracked.string('Ecal3P'),
 #            btype = cms.untracked.string('ProjPhi'),
 #            description = cms.untracked.string('Projection of TP digi occupancy.')
 #        )
+
     )
 )
 
diff --git a/DQM/EcalMonitorTasks/src/OccupancyTask.cc b/DQM/EcalMonitorTasks/src/OccupancyTask.cc
@@ -1,5 +1,6 @@
 #include "../interface/OccupancyTask.h"
 
+#include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "DataFormats/EcalRawData/interface/EcalDCCHeaderBlock.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -111,6 +112,8 @@ namespace ecaldqm
     MESet& meRecHitProjEta(MEs_.at("RecHitProjEta"));
     MESet& meRecHitProjPhi(MEs_.at("RecHitProjPhi"));
     MESet& meRecHitThrAll(MEs_.at("RecHitThrAll"));
+    MESet& meRecHitThrmvp(MEs_.at("RecHitThrmvp"));
+    MESet& meRecHitThrpm(MEs_.at("RecHitThrpm"));
     MESet& meRecHitThrProjEta(MEs_.at("RecHitThrProjEta"));
     MESet& meRecHitThrProjPhi(MEs_.at("RecHitThrProjPhi"));
     MESet& meRecHitThr1D(MEs_.at("RecHitThr1D"));
@@ -119,6 +122,8 @@ namespace ecaldqm
     uint32_t mask(~(0x1 << EcalRecHit::kGood));
     double nFiltered(0.);
 
+    float nRHThrp(0), nRHThrm(0);
+    int iSubdet(_collection == kEBRecHit ? EcalBarrel : EcalEndcap);
     std::for_each(_hits.begin(), _hits.end(), [&](EcalRecHitCollection::value_type const& hit){
                     DetId id(hit.id());
 
@@ -131,12 +136,18 @@ namespace ecaldqm
                       meRecHitThrProjPhi.fill(id);
                       meRecHitThrAll.fill(id);
                       nFiltered += 1.;
+                      bool isPlusFar ( iSubdet == EcalBarrel ? (EBDetId(id).iphi() > 100 && EBDetId(id).iphi() < 280) : zside(id) > 0 );
+                      if ( isPlusFar )
+                        nRHThrp++;
+                      else
+                        nRHThrm++;
                     }
                   });
 
-    int iSubdet(_collection == kEBRecHit ? EcalBarrel : EcalEndcap);
     meRecHitThr1D.fill(iSubdet, nFiltered);
     meTrendNRecHitThr.fill(iSubdet, double(timestamp_.iLumi), nFiltered);
+    meRecHitThrmvp.fill(iSubdet,nRHThrp,nRHThrm);
+    meRecHitThrpm.fill(iSubdet,nRHThrp-nRHThrm);
   }
 
   DEFINE_ECALDQM_WORKER(OccupancyTask);