Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jet met DQM and Validation code #3861

Merged
merged 13 commits into from May 16, 2014
Merged

Jet met DQM and Validation code #3861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8220b7e
first version of Harvesting step rewrite
webermat May 9, 2014
3a4ccfc
harvesting step changes
webermat May 12, 2014
7b9d858
harvesting step changes
webermat May 12, 2014
5272685
first commit : changed recojets for threaded
sordini May 12, 2014
bed88c7
threaded safe changes also for recoMET
sordini May 13, 2014
360c9c0
commented out obsolete jet and met collections
sordini May 13, 2014
88b17b2
minor change, commented an obsolete line in a local use python file
sordini May 14, 2014
c889818
Merged refs/pull/3856/head from repository cms-sw
deguio May 14, 2014
247858b
Merged refs/pull/3855/head from repository cms-sw
deguio May 14, 2014
fe5961a
move one module to be thread_unsafe and general cleanup
deguio May 14, 2014
7478490
general cleanup and remove calls to DQMStore
deguio May 14, 2014
3b534f4
fix use of DQMStore in DQMEDAnalyzer
deguio May 14, 2014
a74dee5
remove for real unused module
deguio May 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion DQMOffline/Configuration/python/DQMOfflineHeavyIons_Certification_cff.py
View file
Open in desktop
Expand Up @@ -4,5 +4,4 @@

DQMOfflineHeavyIons_Certification = cms.Sequence(daq_dqmoffline*dcs_dqmoffline*crt_dqmoffline)

DQMOfflineHeavyIons_Certification.remove(jetMETDQMOfflineClient)
DQMOfflineHeavyIons_Certification.remove(dataCertificationJetMET)
2 changes: 0 additions & 2 deletions DQMOffline/JetMET/doc/JetMET.doc
View file
Open in desktop
Expand Up @@ -34,7 +34,6 @@
- JetAnalyzerBase
- JetMETAnalyzer
- JetMETDQMDCSFilter
- JetMETDQMOfflineClient
- JetPtAnalyzer
- METAnalyzer
- METAnalyzerBase
Expand Down Expand Up @@ -65,7 +64,6 @@
- ECALRecHitAnalyzer
- BeamHaloAnalyzer
- DataCertificationJetMET
- JetMETDQMOfflineClient
- SUSYDQMAnalyzer

\subsection tests Unit tests and examples
Expand Down
7 changes: 0 additions & 7 deletions DQMOffline/JetMET/interface/CaloTowerAnalyzer.h
View file
Open in desktop
Expand Up @@ -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"
Expand All @@ -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_ ;
Expand Down
16 changes: 3 additions & 13 deletions DQMOffline/JetMET/interface/DataCertificationJetMET.h
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -50,7 +41,6 @@ class DataCertificationJetMET : public edm::EDAnalyzer {
// ----------member data ---------------------------

edm::ParameterSet conf_;
DQMStore * dbe_;
edm::Service<TFileService> fs_;
int verbose_;
bool InMemory_;
Expand Down
79 changes: 0 additions & 79 deletions DQMOffline/JetMET/interface/JetMETDQMOfflineClient.h
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions DQMOffline/JetMET/python/dataCertificationJetMET_cff.py
View file
Open in desktop
@@ -1,9 +1,5 @@
import FWCore.ParameterSet.Config as cms
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@webermat
have a look here
F.


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)
11 changes: 0 additions & 11 deletions DQMOffline/JetMET/python/jetMETDQMOfflineClient_cfi.py
View file
Open in desktop

This file was deleted.

27 changes: 9 additions & 18 deletions DQMOffline/JetMET/src/CaloTowerAnalyzer.cc
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -396,6 +390,3 @@ void CaloTowerAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup&

}

void CaloTowerAnalyzer::endJob()
{
}