---

yaml --- r: 77791 b: "refs/heads/CMSSW_7_1_X" c: 65fa6b2 h: "refs/heads/CMSSW_7_1_X" i: 77789: 2aae171 77787: bddfd60 77783: a1e4f93 77775: 832e7d7 77759: cad2e54 v: v3
cms-sw · Nov 12, 2009 · 1b1bef9 · 1b1bef9
1 parent f2fdb95
commit 1b1bef9
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 27 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": 9331fd40d1b562566338dd68f789fcf02aa450c9
+"refs/heads/CMSSW_7_1_X": 65fa6b2e5856462d2fccb1fcf0f2cfb44dfd08d2
diff --git a/trunk/DQMOffline/JetMET/interface/MuCorrMETAnalyzer.h b/trunk/DQMOffline/JetMET/interface/MuCorrMETAnalyzer.h
@@ -6,8 +6,8 @@
  *
  *  DQM monitoring source for CaloMET
  *
- *  $Date: 2009/10/08 10:08:28 $
- *  $Revision: 1.2 $
+ *  $Date: 2009/11/08 13:47:03 $
+ *  $Revision: 1.1 $
  *  \author A.Apresyan - Caltech
  */
 
@@ -49,6 +49,9 @@ class MuCorrMETAnalyzer : public MuCorrMETAnalyzerBase {
   /// Inizialize parameters for histo binning
   void beginJob(edm::EventSetup const& iSetup, DQMStore *dbe);
 
+  /// Finish up a job
+  void endJob();
+
   // Book MonitorElements
   void bookMESet(std::string);
   void bookMonitorElement(std::string, bool);

diff --git a/trunk/DQMOffline/JetMET/interface/PFMETAnalyzer.h b/trunk/DQMOffline/JetMET/interface/PFMETAnalyzer.h
@@ -6,8 +6,8 @@
  *
  *  DQM monitoring source for CaloMET
  *
- *  $Date: 2009/10/08 10:08:28 $
- *  $Revision: 1.2 $
+ *  $Date: 2009/10/28 13:23:07 $
+ *  $Revision: 1.3 $
  *  \author K. Hatakeyama - Rockefeller University
  *          A.Apresyan - Caltech 
  */
@@ -53,6 +53,9 @@ class PFMETAnalyzer : public PFMETAnalyzerBase {
   /// Inizialize parameters for histo binning
   void beginJob(edm::EventSetup const& iSetup, DQMStore *dbe);
 
+  /// Finish up a job
+  void endJob();
+
   // Book MonitorElements
   void bookMESet(std::string);
   void bookMonitorElement(std::string, bool);
@@ -133,7 +136,7 @@ class PFMETAnalyzer : public PFMETAnalyzerBase {
   double hfCalibFactor_;  //
 
   // JetID helper
-  reco::helper::JetIDHelper jetID;
+  reco::helper::JetIDHelper *jetID;
 
   //
   bool _allhist;

diff --git a/trunk/DQMOffline/JetMET/interface/TcMETAnalyzer.h b/trunk/DQMOffline/JetMET/interface/TcMETAnalyzer.h
@@ -6,8 +6,8 @@
  *
  *  DQM monitoring source for CaloMET
  *
- *  $Date: 2009/10/08 10:08:28 $
- *  $Revision: 1.2 $
+ *  $Date: 2009/11/08 13:45:20 $
+ *  $Revision: 1.1 $
  *  \author A.Apresyan - Caltech
  */
 
@@ -49,6 +49,9 @@ class TcMETAnalyzer : public TcMETAnalyzerBase {
   /// Inizialize parameters for histo binning
   void beginJob(edm::EventSetup const& iSetup, DQMStore *dbe);
 
+  /// Finish up a job
+  void endJob();
+
   // Book MonitorElements
   void bookMESet(std::string);
   void bookMonitorElement(std::string, bool);

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/08 14:33:02 $
- *  $Revision: 1.29 $
+ *  $Date: 2009/11/09 18:29:02 $
+ *  $Revision: 1.30 $
  *  \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 METAnalyzer(parameters.getParameter<ParameterSet>("tcMETAnalysis"));
+     theTcMETAnalyzer = new TcMETAnalyzer(parameters.getParameter<ParameterSet>("tcMETAnalysis"));
   }
   if(thePfMETAnalyzerFlag){
      thePfMETAnalyzer = new PFMETAnalyzer(parameters.getParameter<ParameterSet>("pfMETAnalysis"));
@@ -472,8 +472,8 @@ void JetMETAnalyzer::endJob(void) {
   }
 
   if(theCaloMETAnalyzerFlag) theCaloMETAnalyzer->endJob();
-  //if(theTcMETAnalyzerFlag) theTcMETAnalyzer->endJob();
-  //if(thePfMETAnalyzerFlag) thePfMETAnalyzer->endJob();
+  if(theTcMETAnalyzerFlag)   theTcMETAnalyzer->endJob();
+  if(thePfMETAnalyzerFlag)   thePfMETAnalyzer->endJob();
   //if(theHTMHTAnalyzerFlag) theHTMHTAnalyzer->endJob();
 
 }

diff --git a/trunk/DQMOffline/JetMET/src/MuCorrMETAnalyzer.cc b/trunk/DQMOffline/JetMET/src/MuCorrMETAnalyzer.cc
@@ -1,8 +1,8 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2009/10/08 10:14:36 $
- *  $Revision: 1.3 $
+ *  $Date: 2009/11/08 13:47:03 $
+ *  $Revision: 1.1 $
  *  \author A.Apresyan - Caltech
  */
 
@@ -107,6 +107,13 @@ void MuCorrMETAnalyzer::beginJob(edm::EventSetup const& iSetup,DQMStore * dbe) {
   }
 }
 
+// ***********************************************************
+void MuCorrMETAnalyzer::endJob() {
+
+  delete jetID;
+
+}
+
 // ***********************************************************
 void MuCorrMETAnalyzer::bookMESet(std::string DirName)
 {

diff --git a/trunk/DQMOffline/JetMET/src/PFMETAnalyzer.cc b/trunk/DQMOffline/JetMET/src/PFMETAnalyzer.cc
@@ -1,8 +1,8 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2009/10/08 10:14:36 $
- *  $Revision: 1.3 $
+ *  $Date: 2009/10/28 13:23:06 $
+ *  $Revision: 1.4 $
  *  \author K. Hatakeyama - Rockefeller University
  *          A.Apresyan - Caltech
  */
@@ -78,6 +78,9 @@ void PFMETAnalyzer::beginJob(edm::EventSetup const& iSetup,DQMStore * dbe) {
   _highPFMETThreshold = parameters.getParameter<double>("HighPFMETThreshold");     // High MET threshold
   _lowPFMETThreshold = parameters.getParameter<double>("LowPFMETThreshold");       // Low MET threshold
 
+  //
+  jetID = new reco::helper::JetIDHelper(parameters.getParameter<ParameterSet>("JetIDParams"));
+
   // DQStore stuff
   LogTrace(metname)<<"[PFMETAnalyzer] Parameters initialization";
   std::string DirName = "JetMET/MET/"+_source;
@@ -108,6 +111,13 @@ void PFMETAnalyzer::beginJob(edm::EventSetup const& iSetup,DQMStore * dbe) {
   }
 }
 
+// ***********************************************************
+void PFMETAnalyzer::endJob() {
+
+  delete jetID;
+
+}
+
 // ***********************************************************
 void PFMETAnalyzer::bookMESet(std::string DirName)
 {
@@ -433,16 +443,16 @@ void PFMETAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe
   bool bJetID=true;
   for (reco::CaloJetCollection::const_iterator cal = caloJets->begin(); 
        cal!=caloJets->end(); ++cal){ 
-    jetID.calculate(iEvent, *cal);
-    if (_verbose) std::cout << jetID.n90Hits() << " " 
-			    << jetID.restrictedEMF() << " "
+    jetID->calculate(iEvent, *cal);
+    if (_verbose) std::cout << jetID->n90Hits() << " " 
+			    << jetID->restrictedEMF() << " "
 			    << cal->pt() << std::endl;
     if (cal->pt()>10.){
       //
       // for all regions
-      if (jetID.n90Hits()<2)  bJetID=false; 
-      if (jetID.fHPD()>=0.98) bJetID=false; 
-      //if (jetID.restrictedEMF()<0.01) bJetID=false; 
+      if (jetID->n90Hits()<2)  bJetID=false; 
+      if (jetID->fHPD()>=0.98) bJetID=false; 
+      //if (jetID->restrictedEMF()<0.01) bJetID=false; 
       //
       // for non-forward
       if (fabs(cal->eta())<2.55){
@@ -465,11 +475,11 @@ void PFMETAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe
   bJetIDTight=bJetID;
   for (reco::CaloJetCollection::const_iterator cal = caloJets->begin(); 
        cal!=caloJets->end(); ++cal){
-    jetID.calculate(iEvent, *cal);
+    jetID->calculate(iEvent, *cal);
     if (cal->pt()>25.){
       //
       // for all regions
-      if (jetID.fHPD()>=0.95) bJetIDTight=false; 
+      if (jetID->fHPD()>=0.95) bJetIDTight=false; 
       //
       // for 1.0<|eta|<1.75
       if (fabs(cal->eta())>=1.00 && fabs(cal->eta())<1.75){

diff --git a/trunk/DQMOffline/JetMET/src/TcMETAnalyzer.cc b/trunk/DQMOffline/JetMET/src/TcMETAnalyzer.cc
@@ -1,8 +1,8 @@
 /*
  *  See header file for a description of this class.
  *
- *  $Date: 2009/10/08 10:14:36 $
- *  $Revision: 1.3 $
+ *  $Date: 2009/11/08 13:45:20 $
+ *  $Revision: 1.1 $
  *  \author A.Apresyan - Caltech
  */
 
@@ -107,6 +107,13 @@ void TcMETAnalyzer::beginJob(edm::EventSetup const& iSetup,DQMStore * dbe) {
   }
 }
 
+// ***********************************************************
+void TcMETAnalyzer::endJob() {
+
+  delete jetID;
+
+}
+
 // ***********************************************************
 void TcMETAnalyzer::bookMESet(std::string DirName)
 {