---

yaml --- r: 77854 b: "refs/heads/CMSSW_7_1_X" c: 2bcf6fe h: "refs/heads/CMSSW_7_1_X" v: v3
cms-sw · Nov 13, 2009 · d204a8f · d204a8f
1 parent 5616555
commit d204a8f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": 852270a607caaeb327035764e75e3d1e4a1034be
+"refs/heads/CMSSW_7_1_X": 2bcf6fea66d152bb401513ba1cbced97fe7ccd00
diff --git a/trunk/DQMOffline/JetMET/interface/JetMETAnalyzer.h b/trunk/DQMOffline/JetMET/interface/JetMETAnalyzer.h
@@ -6,8 +6,8 @@
  *
  *  DQM jetMET analysis monitoring
  *
- *  $Date: 2009/07/27 07:40:17 $
- *  $Revision: 1.4 $
+ *  $Date: 2009/11/08 14:33:01 $
+ *  $Revision: 1.5 $
  *  \author F. Chlebana - Fermilab
  *          K. Hatakeyama - Rockefeller University
  */
@@ -80,9 +80,9 @@ class JetMETAnalyzer : public edm::EDAnalyzer {
 /*   edm::InputTag theCaloMETNoHFCollectionLabel; */
 /*   edm::InputTag theCaloMETHOCollectionLabel; */
 /*   edm::InputTag theCaloMETNoHFHOCollectionLabel; */
-  edm::InputTag theTcMETCollectionLabel;
-  edm::InputTag thePfMETCollectionLabel;
-  edm::InputTag theJetCollectionForHTMHTLabel;
+/*   edm::InputTag theTcMETCollectionLabel; */
+/*   edm::InputTag thePfMETCollectionLabel; */
+/*   edm::InputTag theJetCollectionForHTMHTLabel; */
   edm::InputTag theTriggerResultsLabel;
   //
 

diff --git a/trunk/DQMOffline/JetMET/python/jetMETAnalyzer_cfi.py b/trunk/DQMOffline/JetMET/python/jetMETAnalyzer_cfi.py
@@ -75,7 +75,7 @@
     HighMETThreshold = cms.double(110.),
     LowMETThreshold  = cms.double(30.),
     verbose     = cms.int32(0),
-    etThreshold = cms.double(1.),                            # default MET threshold
+    etThreshold = cms.double(2.),                            # default MET threshold
     allHist     = cms.bool(True),
     allSelection= cms.bool(False)
     ),
@@ -110,7 +110,7 @@
     HighMETThreshold = cms.double(110.),
     LowMETThreshold  = cms.double(30.),
     verbose     = cms.int32(0),
-    etThreshold = cms.double(1.),
+    etThreshold = cms.double(2.),
     allHist     = cms.bool(False),
     allSelection= cms.bool(False)
     ),
@@ -145,7 +145,7 @@
     HighMETThreshold = cms.double(110.),
     LowMETThreshold  = cms.double(30.),
     verbose     = cms.int32(0),
-    etThreshold = cms.double(1.),
+    etThreshold = cms.double(2.),
     allHist     = cms.bool(False),
     allSelection= cms.bool(False)
     ),
@@ -180,7 +180,7 @@
     HighMETThreshold = cms.double(110.),
     LowMETThreshold  = cms.double(30.),
     verbose     = cms.int32(0),
-    etThreshold = cms.double(1.),
+    etThreshold = cms.double(2.),
     allHist     = cms.bool(False),
     allSelection= cms.bool(False)
     ),
@@ -214,7 +214,7 @@
     LowPtTcJetThreshold  = cms.double(15.),
     HighTcMETThreshold = cms.double(110.),
     LowTcMETThreshold  = cms.double(30.),
-    etThreshold = cms.double(1.),
+    etThreshold = cms.double(2.),
     allHist     = cms.bool(True),
     allSelection= cms.bool(False)
     ),
@@ -250,7 +250,7 @@
     LowPtPFJetThreshold  = cms.double(15.),
     HighPFMETThreshold = cms.double(110.),
     LowPFMETThreshold  = cms.double(30.),
-    etThreshold = cms.double(1.),
+    etThreshold = cms.double(2.),
     allHist     = cms.bool(True),
     allSelection= cms.bool(False)
     ),
@@ -284,7 +284,7 @@
     LowPtMuCorrJetThreshold  = cms.double(15.),
     HighMuCorrMETThreshold = cms.double(110.),
     LowMuCorrMETThreshold  = cms.double(30.),
-    etThreshold = cms.double(1.),
+    etThreshold = cms.double(2.),
     allHist     = cms.bool(True),
     allSelection= cms.bool(False)
     ),

diff --git a/trunk/DQMOffline/JetMET/src/JetMETAnalyzer.cc b/trunk/DQMOffline/JetMET/src/JetMETAnalyzer.cc
@@ -1,8 +1,8 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2009/11/09 18:29:02 $
- *  $Revision: 1.30 $
+ *  $Date: 2009/11/12 17:30:00 $
+ *  $Revision: 1.31 $
  *  \author F. Chlebana - Fermilab
  *          K. Hatakeyama - Rockefeller University
  */
@@ -110,7 +110,7 @@ JetMETAnalyzer::JetMETAnalyzer(const edm::ParameterSet& pSet) {
      theCaloMETNoHFHOAnalyzer = new CaloMETAnalyzer(parameters.getParameter<ParameterSet>("caloMETNoHFHOAnalysis"));
   }
   if(theTcMETAnalyzerFlag){
-     theTcMETAnalyzer = new TcMETAnalyzer(parameters.getParameter<ParameterSet>("tcMETAnalysis"));
+     theTcMETAnalyzer = new METAnalyzer(parameters.getParameter<ParameterSet>("tcMETAnalysis"));
   }
   if(thePfMETAnalyzerFlag){
      thePfMETAnalyzer = new PFMETAnalyzer(parameters.getParameter<ParameterSet>("pfMETAnalysis"));
@@ -240,7 +240,7 @@ void JetMETAnalyzer::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetu
     theCaloMETNoHFHOAnalyzer->beginRun(iRun, iSetup);
   }
   //if(theTcMETAnalyzerFlag) theTcMETAnalyzer->beginRun(iRun, iSetup);
-  //if(thePfMETAnalyzerFlag) thePfMETAnalyzer->beginRun(iRun, iSetup);
+  if(thePfMETAnalyzerFlag) thePfMETAnalyzer->beginRun(iRun, iSetup);
   //if(theHTMHTAnalyzerFlag) theHTMHTAnalyzer->beginRun(iRun, iSetup);
 
 }
@@ -260,6 +260,9 @@ void JetMETAnalyzer::endRun(const edm::Run& iRun, const edm::EventSetup& iSetup)
     theCaloMETHOAnalyzer->endRun(iRun, iSetup, dbe);
     theCaloMETNoHFHOAnalyzer->endRun(iRun, iSetup, dbe);
   }
+  //if(theTcMETAnalyzerFlag) theTcMETAnalyzer->endRun(iRun, iSetup, dbe);
+  if(thePfMETAnalyzerFlag) thePfMETAnalyzer->endRun(iRun, iSetup, dbe);
+  //if(theHTMHTAnalyzerFlag) theHTMHTAnalyzer->endRun(iRun, iSetup, dbe);
 
 }
 
@@ -471,8 +474,14 @@ void JetMETAnalyzer::endJob(void) {
     dbe->save(outputFileName);
   }
 
-  if(theCaloMETAnalyzerFlag) theCaloMETAnalyzer->endJob();
-  if(theTcMETAnalyzerFlag)   theTcMETAnalyzer->endJob();
+  if(theCaloMETAnalyzerFlag){
+    theCaloMETAnalyzer->endJob();
+    theCaloMETNoHFAnalyzer->endJob();
+    theCaloMETHOAnalyzer->endJob();
+    theCaloMETNoHFHOAnalyzer->endJob();
+  }
+  if(theCaloMETAnalyzerFlag) 
+  //if(theTcMETAnalyzerFlag) theTcMETAnalyzer->endJob();
   if(thePfMETAnalyzerFlag)   thePfMETAnalyzer->endJob();
   //if(theHTMHTAnalyzerFlag) theHTMHTAnalyzer->endJob();