rebase for era standard sequence update

cms-sw · Oct 6, 2016 · 6a71b64 · 6a71b64
1 parent 8e51069
commit 6a71b64
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 364 deletions.
diff --git a/DQMOffline/JetMET/interface/METAnalyzer.h b/DQMOffline/JetMET/interface/METAnalyzer.h
@@ -528,27 +528,12 @@ class METAnalyzer : public DQMEDAnalyzer{
   */
   double ptMinCand_;
 
-  // Smallest raw HCAL energy linked to the track
-  double hcalMin_;
-  MonitorElement* mProfileIsoPFChHad_HadPtCentral;
-  MonitorElement* mProfileIsoPFChHad_HadPtEndcap;
-  MonitorElement* mProfileIsoPFChHad_EMPtCentral;
-  MonitorElement* mProfileIsoPFChHad_EMPtEndcap;
-  MonitorElement* mProfileIsoPFChHad_TrackPt;
-
-  MonitorElement* mProfileIsoPFChHad_HcalOccupancyCentral;
-  MonitorElement* mProfileIsoPFChHad_HcalOccupancyEndcap;
-  MonitorElement* mProfileIsoPFChHad_EcalOccupancyCentral;
-  MonitorElement* mProfileIsoPFChHad_EcalOccupancyEndcap;
-  MonitorElement* mProfileIsoPFChHad_TrackOccupancy;
 
   //PFcandidate maps
-  std::vector<MonitorElement* > profilePFCand_x_,profilePFCand_y_,occupancyPFCand_,ptPFCand_,multiplicityPFCand_;
-  std::vector<std::string> profilePFCand_x_name_,profilePFCand_y_name_,occupancyPFCand_name_,ptPFCand_name_,multiplicityPFCand_name_;
-  std::vector<MonitorElement* > occupancyPFCand_puppiNolepWeight_,ptPFCand_puppiNolepWeight_;
-  std::vector<std::string> occupancyPFCand_name_puppiNolepWeight_,ptPFCand_name_puppiNolepWeight_;
+  std::vector<MonitorElement* > profilePFCand_x_,profilePFCand_y_;
+  std::vector<std::string> profilePFCand_x_name_,profilePFCand_y_name_;
   std::vector<double> etaMinPFCand_, etaMaxPFCand_, MExPFCand_, MEyPFCand_;
-  std::vector<int> typePFCand_, nbinsPFCand_, countsPFCand_, etaNBinsPFCand_;
+  std::vector<int> typePFCand_,  countsPFCand_, etaNBinsPFCand_;
 
   MonitorElement* meMETPhiChargedHadronsBarrel;
   MonitorElement* meMETPhiChargedHadronsEndcapPlus;
@@ -604,8 +589,6 @@ class METAnalyzer : public DQMEDAnalyzer{
   MonitorElement* meZJets_u_perp_ZPt_290;
 
   std::map< std::string,MonitorElement* >map_dijet_MEs;
-  std::vector<unsigned int> nCh;
-  std::vector<unsigned int> nEv;
 
   bool isCaloMet_;
   bool isPFMet_;

diff --git a/DQMOffline/JetMET/python/jetMETDQMOfflineSource_cff.py b/DQMOffline/JetMET/python/jetMETDQMOfflineSource_cff.py
@@ -2,6 +2,7 @@
 
 from DQMOffline.JetMET.metDQMConfig_cff     import *
 from DQMOffline.JetMET.jetAnalyzer_cff   import *
+from DQMOffline.JetMET.pfCandidateDQMConfig_cfi   import *
 from DQMOffline.JetMET.SUSYDQMAnalyzer_cfi  import *
 from DQMOffline.JetMET.goodOfflinePrimaryVerticesDQM_cfi import *
 from RecoJets.JetProducers.PileupJetID_cfi  import *
@@ -106,14 +107,17 @@
                                       dqmAk4CaloL2L3ResidualCorrectorChain*dqmAk4PFL1FastL2L3ResidualCorrectorChain*dqmAk4PFCHSL1FastL2L3ResidualCorrectorChain*dqmAk4PFCHSL1FastL2L3CorrectorChain*
                                       goodOfflinePrimaryVerticesDQM*                                                                            
                                       dqmCorrPfMetType1*pfMETT1*jetDQMAnalyzerSequence*HBHENoiseFilterResultProducer*
-                                      CSCTightHaloFilterDQM*CSCTightHalo2015FilterDQM*eeBadScFilterDQM*EcalDeadCellTriggerPrimitiveFilterDQM*EcalDeadCellBoundaryEnergyFilterDQM*HcalStripHaloFilterDQM
-                                      *METDQMAnalyzerSequence)
+                                      CSCTightHaloFilterDQM*CSCTightHalo2015FilterDQM*eeBadScFilterDQM*EcalDeadCellTriggerPrimitiveFilterDQM*EcalDeadCellBoundaryEnergyFilterDQM*HcalStripHaloFilterDQM                                      
+                                      *METDQMAnalyzerSequence
+                                      *pfCandidateDQMAnalyzer)
+
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 phase1Pixel.toReplaceWith(jetMETDQMOfflineSource, jetMETDQMOfflineSource.copyAndExclude([ # FIXME
     jetDQMAnalyzerSequence, # Excessive printouts because 2017 doesn't have HLT yet
     METDQMAnalyzerSequence, # Excessive printouts because 2017 doesn't have HLT yet
+    pfCandidateDQMAnalyzer
 ]))
 
 jetMETDQMOfflineRedoProductsMiniAOD = cms.Sequence(goodOfflinePrimaryVerticesDQMforMiniAOD)
 
-jetMETDQMOfflineSourceMiniAOD = cms.Sequence(jetDQMAnalyzerSequenceMiniAOD*METDQMAnalyzerSequenceMiniAOD)
+jetMETDQMOfflineSourceMiniAOD = cms.Sequence(jetDQMAnalyzerSequenceMiniAOD*METDQMAnalyzerSequenceMiniAOD*packedCandidateDQMAnalyzerMiniAOD)
diff --git a/DQMOffline/JetMET/python/metDiagnosticParameterSetMiniAOD_cfi.py b/DQMOffline/JetMET/python/metDiagnosticParameterSetMiniAOD_cfi.py
@@ -5,9 +5,9 @@
     cms.PSet(
         name=cms.string("h"),
         type=cms.int32(211),
-        nbins=cms.double(125),
+        nbins=cms.double(100),
         nMin=cms.int32(0),
-        nMax=cms.int32(7500),
+        nMax=cms.int32(2000),
         etaNBins=cms.int32(100),
         etaMin=cms.double(-2.7),
         etaMax=cms.double(2.7),
@@ -18,9 +18,9 @@
     cms.PSet(
         name=cms.string("h0Barrel"),
         type=cms.int32(130),
-        nbins=cms.double(125),
+        nbins=cms.double(50),
         nMin=cms.int32(0),
-        nMax=cms.int32(250),
+        nMax=cms.int32(100),
         etaNBins=cms.int32(32),
         etaMin=cms.double(-1.392),
         etaMax=cms.double(1.392),
@@ -44,9 +44,9 @@
     cms.PSet(
         name=cms.string("h0Endcap"),
         type=cms.int32(130),
-        nbins=cms.double(125),
+        nbins=cms.double(75),
         nMin=cms.int32(0),
-        nMax=cms.int32(250),
+        nMax=cms.int32(150),
         etaNBins=cms.int32(12),
         etaMin=cms.double(-3.0),
         etaMax=cms.double(-1.392),
@@ -57,9 +57,9 @@
     cms.PSet(
         name=cms.string("gammaBarrel"),
         type=cms.int32(22),
-        nbins=cms.double(125),
+        nbins=cms.double(100),
         nMin=cms.int32(0),
-        nMax=cms.int32(2500),
+        nMax=cms.int32(600),
         etaNBins=cms.int32(170),
         etaMin=cms.double(-1.479),
         etaMax=cms.double(1.479),
@@ -83,9 +83,9 @@
     cms.PSet(
         name=cms.string("gammaEndcap"),
         type=cms.int32(22),
-        nbins=cms.double(125),
+        nbins=cms.double(100),
         nMin=cms.int32(0),
-        nMax=cms.int32(750),
+        nMax=cms.int32(300),
         etaNBins=cms.int32(20),
         etaMin=cms.double(-3.0),
         etaMax=cms.double(-1.479),
@@ -109,9 +109,9 @@
     cms.PSet(
         name=cms.string("gammaForward"),
         type=cms.int32(22),
-        nbins=cms.double(50),
+        nbins=cms.double(15),
         nMin=cms.int32(0),
-        nMax=cms.int32(50),
+        nMax=cms.int32(15),
         etaNBins=cms.int32(20),
         etaMin=cms.double(-5.0),
         etaMax=cms.double(-3.0),
@@ -122,9 +122,9 @@
     cms.PSet(
         name=cms.string("e"),
         type=cms.int32(11),
-        nbins=cms.double(50),
+        nbins=cms.double(30),
         nMin=cms.int32(0),
-        nMax=cms.int32(50),
+        nMax=cms.int32(30),
         etaNBins=cms.int32(27),
         etaMin=cms.double(-2.7),
         etaMax=cms.double(2.7),
@@ -135,9 +135,9 @@
     cms.PSet(
         name=cms.string("mu"),
         type=cms.int32(13),
-        nbins=cms.double(50),
+        nbins=cms.double(30),
         nMin=cms.int32(0),
-        nMax=cms.int32(50),
+        nMax=cms.int32(30),
         etaNBins=cms.int32(27),
         etaMin=cms.double(-2.7),
         etaMax=cms.double(2.7),
@@ -148,9 +148,9 @@
     cms.PSet(
         name=cms.string("hHF"),
         type=cms.int32(1),
-        nbins=cms.double(125),
+        nbins=cms.double(100),
         nMin=cms.int32(0),
-        nMax=cms.int32(1250),
+        nMax=cms.int32(1000),
         etaNBins=cms.int32(11),
         etaMin=cms.double(-5.20),
         etaMax=cms.double(-2.901376),
@@ -174,9 +174,9 @@
     cms.PSet(
         name=cms.string("egammaHF"),
         type=cms.int32(2),
-        nbins=cms.double(125),
+        nbins=cms.double(50),
         nMin=cms.int32(0),
-        nMax=cms.int32(1250),
+        nMax=cms.int32(500),
         etaNBins=cms.int32(11),
         etaMin=cms.double(-5.2),
         etaMax=cms.double(-2.901376),

diff --git a/DQMOffline/JetMET/python/metDiagnosticParameterSet_cfi.py b/DQMOffline/JetMET/python/metDiagnosticParameterSet_cfi.py
@@ -6,9 +6,9 @@
     cms.PSet(
         name=cms.string("h"),
         type=cms.int32(1),
-        nbins=cms.double(125),
+        nbins=cms.double(100),
         nMin=cms.int32(0),
-        nMax=cms.int32(7500),
+        nMax=cms.int32(2000),
         etaNBins=cms.int32(100),
         etaMin=cms.double(-2.7),
         etaMax=cms.double(2.7),
@@ -19,9 +19,9 @@
     cms.PSet(
         name=cms.string("h0Barrel"),
         type=cms.int32(5),
-        nbins=cms.double(125),
+        nbins=cms.double(50),
         nMin=cms.int32(0),
-        nMax=cms.int32(250),
+        nMax=cms.int32(100),
         etaNBins=cms.int32(32),
         etaMin=cms.double(-1.392),
         etaMax=cms.double(1.392),
@@ -45,9 +45,9 @@
     cms.PSet(
         name=cms.string("h0Endcap"),
         type=cms.int32(5),
-        nbins=cms.double(125),
+        nbins=cms.double(75),
         nMin=cms.int32(0),
-        nMax=cms.int32(250),
+        nMax=cms.int32(150),
         etaNBins=cms.int32(12),
         etaMin=cms.double(-3.0),
         etaMax=cms.double(-1.392),
@@ -58,9 +58,9 @@
     cms.PSet(
         name=cms.string("gammaBarrel"),
         type=cms.int32(4),
-        nbins=cms.double(125),
+        nbins=cms.double(100),
         nMin=cms.int32(0),
-        nMax=cms.int32(2500),
+        nMax=cms.int32(600),
         etaNBins=cms.int32(75),
         etaMin=cms.double(-1.479),
         etaMax=cms.double(1.479),
@@ -84,9 +84,9 @@
     cms.PSet(
         name=cms.string("gammaEndcap"),
         type=cms.int32(4),
-        nbins=cms.double(125),
+        nbins=cms.double(100),
         nMin=cms.int32(0),
-        nMax=cms.int32(750),
+        nMax=cms.int32(300),
         etaNBins=cms.int32(20),
         etaMin=cms.double(-3.0),
         etaMax=cms.double(-1.479),
@@ -110,9 +110,9 @@
     cms.PSet(
         name=cms.string("gammaForward"),
         type=cms.int32(4),
-        nbins=cms.double(50),
+        nbins=cms.double(15),
         nMin=cms.int32(0),
-        nMax=cms.int32(50),
+        nMax=cms.int32(15),
         etaNBins=cms.int32(20),
         etaMin=cms.double(-5.0),
         etaMax=cms.double(-3.0),
@@ -123,9 +123,9 @@
     cms.PSet(
         name=cms.string("e"),
         type=cms.int32(2),
-        nbins=cms.double(50),
+        nbins=cms.double(30),
         nMin=cms.int32(0),
-        nMax=cms.int32(50),
+        nMax=cms.int32(30),
         etaNBins=cms.int32(27),
         etaMin=cms.double(-2.7),
         etaMax=cms.double(2.7),
@@ -136,9 +136,9 @@
     cms.PSet(
         name=cms.string("mu"),
         type=cms.int32(3),
-        nbins=cms.double(50),
+        nbins=cms.double(30),
         nMin=cms.int32(0),
-        nMax=cms.int32(50),
+        nMax=cms.int32(30),
         etaNBins=cms.int32(27),
         etaMin=cms.double(-2.7),
         etaMax=cms.double(2.7),
@@ -149,9 +149,9 @@
     cms.PSet(
         name=cms.string("hHF"),
         type=cms.int32(6),
-        nbins=cms.double(125),
+        nbins=cms.double(100),
         nMin=cms.int32(0),
-        nMax=cms.int32(1250),
+        nMax=cms.int32(1000),
         etaNBins=cms.int32(11),
         etaMin=cms.double(-5.20),
         etaMax=cms.double(-2.901376),
@@ -175,9 +175,9 @@
     cms.PSet(
         name=cms.string("egammaHF"),
         type=cms.int32(7),
-        nbins=cms.double(125),
+        nbins=cms.double(50),
         nMin=cms.int32(0),
-        nMax=cms.int32(1250),
+        nMax=cms.int32(500),
         etaNBins=cms.int32(11),
         etaMin=cms.double(-5.2),
         etaMax=cms.double(-2.901376),