Merge pull request #3861 from deguio/JetMet

Jet met DQM and Validation code
cms-sw · May 16, 2014 · c0d5cc8 · c0d5cc8
2 parents 381ddf7 + a74dee5
commit c0d5cc8
Show file tree

Hide file tree

Showing 25 changed files with 338 additions and 1,200 deletions.
diff --git a/DQMOffline/Configuration/python/DQMOfflineHeavyIons_Certification_cff.py b/DQMOffline/Configuration/python/DQMOfflineHeavyIons_Certification_cff.py
@@ -4,5 +4,4 @@
 
 DQMOfflineHeavyIons_Certification = cms.Sequence(daq_dqmoffline*dcs_dqmoffline*crt_dqmoffline)
 
-DQMOfflineHeavyIons_Certification.remove(jetMETDQMOfflineClient)
 DQMOfflineHeavyIons_Certification.remove(dataCertificationJetMET)
diff --git a/DQMOffline/JetMET/doc/JetMET.doc b/DQMOffline/JetMET/doc/JetMET.doc
@@ -34,7 +34,6 @@
 - JetAnalyzerBase
 - JetMETAnalyzer
 - JetMETDQMDCSFilter
-- JetMETDQMOfflineClient
 - JetPtAnalyzer
 - METAnalyzer
 - METAnalyzerBase
@@ -65,7 +64,6 @@
 - ECALRecHitAnalyzer
 - BeamHaloAnalyzer
 - DataCertificationJetMET
-- JetMETDQMOfflineClient
 - SUSYDQMAnalyzer
 
 \subsection tests Unit tests and examples

diff --git a/DQMOffline/JetMET/interface/CaloTowerAnalyzer.h b/DQMOffline/JetMET/interface/CaloTowerAnalyzer.h
@@ -7,8 +7,6 @@
 // date: 02.28.2007
 // note: code rewrite
 
-#include "DQMServices/Core/interface/DQMStore.h"
-
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -32,14 +30,9 @@ class CaloTowerAnalyzer: public DQMEDAnalyzer {
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
   virtual void dqmbeginRun(const edm::Run& ,const edm::EventSetup&);
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  //virtual void beginJob();
-  virtual void endJob();
 
 private:
 
-  // DAQ Tools
-  DQMStore* dbe_;
-
   // Inputs from Configuration
   edm::EDGetTokenT<edm::View<reco::Candidate> > caloTowersLabel_;
   std::vector< edm::InputTag >  HLTBitLabel_ ;

diff --git a/DQMOffline/JetMET/interface/DataCertificationJetMET.h b/DQMOffline/JetMET/interface/DataCertificationJetMET.h
@@ -17,30 +17,21 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 //
 // class decleration
 //
 
-class DataCertificationJetMET : public edm::EDAnalyzer {
+class DataCertificationJetMET : public DQMEDHarvester {
    public:
       explicit DataCertificationJetMET(const edm::ParameterSet&);
       ~DataCertificationJetMET();
 
    private:
-      virtual void beginJob(void) ;
-      virtual void analyze(const edm::Event&, const edm::EventSetup&);
-      virtual void endJob() ;
-
-
-      virtual void endRun(const edm::Run&, const edm::EventSetup&) ;
-
-      virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
-      virtual void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
+      virtual void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) ;
 
       MonitorElement*  reportSummary;
       MonitorElement*  CertificationSummary;
@@ -50,7 +41,6 @@ class DataCertificationJetMET : public edm::EDAnalyzer {
    // ----------member data ---------------------------
 
    edm::ParameterSet conf_;
-   DQMStore * dbe_;
    edm::Service<TFileService> fs_;
    int verbose_;
    bool InMemory_;

diff --git a/DQMOffline/JetMET/interface/JetMETDQMOfflineClient.h b/DQMOffline/JetMET/interface/JetMETDQMOfflineClient.h
diff --git a/DQMOffline/JetMET/python/dataCertificationJetMET_cff.py b/DQMOffline/JetMET/python/dataCertificationJetMET_cff.py
@@ -1,9 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 
-from DQMOffline.JetMET.jetMETDQMOfflineClient_cfi import *
 from DQMOffline.JetMET.dataCertificationJetMET_cfi import *
 
-dataCertificationJetMETSequence = cms.Sequence(jetMETDQMOfflineClient + qTesterJet + qTesterMET + dataCertificationJetMET)
-
-#dataCertificationJetMETSequence = cms.Sequence(jetMETDQMOfflineClient + qTesterJet + qTesterMET + dataCertificationJetMET)
-#dataCertificationJetMETSequence = cms.Sequence(jetMETDQMOfflineClient + qTesterJet + qTesterMET )
+dataCertificationJetMETSequence = cms.Sequence(qTesterJet + qTesterMET + dataCertificationJetMET)
diff --git a/DQMOffline/JetMET/python/jetMETDQMOfflineClient_cfi.py b/DQMOffline/JetMET/python/jetMETDQMOfflineClient_cfi.py
diff --git a/DQMOffline/JetMET/src/CaloTowerAnalyzer.cc b/DQMOffline/JetMET/src/CaloTowerAnalyzer.cc
@@ -54,7 +54,6 @@
 #include <cmath>
 #include <memory>
 #include <TLorentzVector.h>
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "CommonTools/RecoAlgos/interface/HBHENoiseFilter.h"
 
 using namespace reco;
@@ -84,28 +83,23 @@ CaloTowerAnalyzer::CaloTowerAnalyzer(const edm::ParameterSet & iConfig)
 void CaloTowerAnalyzer::dqmbeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup)
 {
   Nevents = 0;
-  // get ahold of back-end interface
-  dbe_ = edm::Service<DQMStore>().operator->();
-  if (dbe_) {
-
-    dbe_->setCurrentFolder(FolderName_); 
+}
+
+void CaloTowerAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
+					edm::Run const & iRun,
+					edm::EventSetup const & )
+  {
+    ibooker.setCurrentFolder(FolderName_); 
 
     //Store number of events which pass each HLT bit 
     for(unsigned int i = 0 ; i < HLTBitLabel_.size() ; i++ )
       {
 	if( HLTBitLabel_[i].label().size() )
 	  {
-	    hCT_NEvents_HLT.push_back( dbe_->book1D("METTask_CT_"+HLTBitLabel_[i].label(),HLTBitLabel_[i].label(),2,-0.5,1.5) );
+	    hCT_NEvents_HLT.push_back( ibooker.book1D("METTask_CT_"+HLTBitLabel_[i].label(),HLTBitLabel_[i].label(),2,-0.5,1.5) );
 	  }
-      }
-  }
-}
+      } 
 
-void CaloTowerAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-					edm::Run const & iRun,
-					edm::EventSetup const & )
-  {
-    ibooker.setCurrentFolder(FolderName_); 
     //--Store number of events used
     hCT_Nevents          = ibooker.book1D("METTask_CT_Nevents","",1,0,1);  
     //--Data integrated over all events and stored by CaloTower(ieta,iphi) 
@@ -396,6 +390,3 @@ void CaloTowerAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup&
 
 }
 
-void CaloTowerAnalyzer::endJob()
-{
-}