Skip to content

Commit

Permalink
Merge pull request cms-sw#3262 from deguio/fixUnsafeDQMEDAnalyzersFor…
Browse files Browse the repository at this point in the history 
…710pre6

DQM -- Fix unsafe dqmed analyzers for710pre6
  • Loading branch information
@ktf @nclopezo
ktf authored and nclopezo committed Apr 11, 2014
1 parent 71d057a commit 490e130
Show file tree
Hide file tree
Showing 73 changed files with 5,506 additions and 2,954 deletions.
4 changes: 2 additions & 2 deletions DQMOffline/JetMET/interface/DataCertificationJetMET.h
View file
Expand Up @@ -26,7 +26,7 @@
// class decleration
//

class DataCertificationJetMET : public DQMEDAnalyzer {
class DataCertificationJetMET : public edm::EDAnalyzer {
public:
explicit DataCertificationJetMET(const edm::ParameterSet&);
~DataCertificationJetMET();
Expand All @@ -36,7 +36,7 @@ class DataCertificationJetMET : public DQMEDAnalyzer {
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void endJob() ;

void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

virtual void endRun(const edm::Run&, const edm::EventSetup&) ;

virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
Expand Down
206 changes: 103 additions & 103 deletions DQMOffline/JetMET/interface/JetAnalyzer.h
View file
Expand Up @@ -56,28 +56,26 @@
#include "PhysicsTools/SelectorUtils/interface/JetIDSelectionFunctor.h"
#include "PhysicsTools/SelectorUtils/interface/PFJetIDSelectionFunctor.h"
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
#include <map>
#include <string>

namespace jetAnalysis {
class TrackPropagatorToCalo;
//namespace jetAnalysis {
//class TrackPropagatorToCalo;
//class StripSignalOverNoiseCalculator;
}
//}

class JetAnalyzer : public edm::EDAnalyzer {
class JetAnalyzer : public thread_unsafe::DQMEDAnalyzer {
public:

/// Constructor
JetAnalyzer(const edm::ParameterSet&);

/// Destructor
virtual ~JetAnalyzer();

// This is a temporary fix to make sure we do not have a non thread safe
// analyzer using the thread aware DQM Analyzer base class.
void beginRun(edm::Run const &run, edm::EventSetup const &es) override;

/// Inizialize parameters for histo binning
// void beginJob(void);
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
/// Get the analysis
void analyze(const edm::Event&, const edm::EventSetup&);

Expand All @@ -97,7 +95,7 @@ class JetAnalyzer : public edm::EDAnalyzer {


/// Helper object to propagate tracks to the calo surface
std::auto_ptr<jetAnalysis::TrackPropagatorToCalo> trackPropagator_;
//std::auto_ptr<jetAnalysis::TrackPropagatorToCalo> trackPropagator_;
/// Helper object to calculate strip SoN for tracks
//std::auto_ptr<jetAnalysis::StripSignalOverNoiseCalculator> sOverNCalculator_;

Expand All @@ -121,7 +119,7 @@ class JetAnalyzer : public edm::EDAnalyzer {
edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> gtToken_;
edm::EDGetTokenT<reco::CaloJetCollection> caloJetsToken_;
edm::EDGetTokenT<reco::PFJetCollection> pfJetsToken_;
edm::EDGetTokenT<reco::JPTJetCollection> jptJetsToken_;
//edm::EDGetTokenT<reco::JPTJetCollection> jptJetsToken_;

edm::InputTag inputJetIDValueMap;
edm::EDGetTokenT<edm::ValueMap <reco::JetID> >jetID_ValueMapToken_;
Expand Down Expand Up @@ -299,8 +297,6 @@ class JetAnalyzer : public edm::EDAnalyzer {
std::vector<std::string> highPtJetExpr_;
std::vector<std::string> lowPtJetExpr_;


bool diJetSelectionFlag_;
bool jetCleaningFlag_;

bool runcosmics_;
Expand All @@ -324,97 +320,97 @@ class JetAnalyzer : public edm::EDAnalyzer {
MonitorElement* mresEMF;
MonitorElement* mEMF;

// JPTJet specific
// JPTJet specific -> comment out
// the jet analyzer
// --- Used for Data Certification --in for CaloJets and PFJets
MonitorElement* mE;
MonitorElement* mP;
MonitorElement* mEt;
MonitorElement* mPtSecond;
MonitorElement* mPtThird;
MonitorElement* mPx;
MonitorElement* mPy;
MonitorElement* mPz;
MonitorElement* mnTracks;
MonitorElement* mnTracksVSJetPt;
MonitorElement* mnTracksVSJetEta;

MonitorElement* mnallPionTracksPerJet;
MonitorElement* mallPionTracksPt;
MonitorElement* mallPionTracksPhi;
MonitorElement* mallPionTracksEta;
MonitorElement* mallPionTracksPtVSEta;

MonitorElement* mnInVertexInCaloPionTracksPerJet;
MonitorElement* mInVertexInCaloPionTracksPt;
MonitorElement* mInVertexInCaloPionTracksPhi;
MonitorElement* mInVertexInCaloPionTracksEta;
MonitorElement* mInVertexInCaloPionTracksPtVSEta;

MonitorElement* mnOutVertexInCaloPionTracksPerJet;
MonitorElement* mOutVertexInCaloPionTracksPt;
MonitorElement* mOutVertexInCaloPionTracksPhi;
MonitorElement* mOutVertexInCaloPionTracksEta;
MonitorElement* mOutVertexInCaloPionTracksPtVSEta;

MonitorElement* mnInVertexOutCaloPionTracksPerJet;
MonitorElement* mInVertexOutCaloPionTracksPt;
MonitorElement* mInVertexOutCaloPionTracksPhi;
MonitorElement* mInVertexOutCaloPionTracksEta;
MonitorElement* mInVertexOutCaloPionTracksPtVSEta;

MonitorElement* mnallMuonTracksPerJet;
MonitorElement* mallMuonTracksPt;
MonitorElement* mallMuonTracksPhi;
MonitorElement* mallMuonTracksEta;
MonitorElement* mallMuonTracksPtVSEta;

MonitorElement* mnInVertexInCaloMuonTracksPerJet;
MonitorElement* mInVertexInCaloMuonTracksPt;
MonitorElement* mInVertexInCaloMuonTracksPhi;
MonitorElement* mInVertexInCaloMuonTracksEta;
MonitorElement* mInVertexInCaloMuonTracksPtVSEta;

MonitorElement* mnOutVertexInCaloMuonTracksPerJet;
MonitorElement* mOutVertexInCaloMuonTracksPt;
MonitorElement* mOutVertexInCaloMuonTracksPhi;
MonitorElement* mOutVertexInCaloMuonTracksEta;
MonitorElement* mOutVertexInCaloMuonTracksPtVSEta;

MonitorElement* mnInVertexOutCaloMuonTracksPerJet;
MonitorElement* mInVertexOutCaloMuonTracksPt;
MonitorElement* mInVertexOutCaloMuonTracksPhi;
MonitorElement* mInVertexOutCaloMuonTracksEta;
MonitorElement* mInVertexOutCaloMuonTracksPtVSEta;

MonitorElement* mnallElectronTracksPerJet;
MonitorElement* mallElectronTracksPt;
MonitorElement* mallElectronTracksPhi;
MonitorElement* mallElectronTracksEta;
MonitorElement* mallElectronTracksPtVSEta;

MonitorElement* mnInVertexInCaloElectronTracksPerJet;
MonitorElement* mInVertexInCaloElectronTracksPt;
MonitorElement* mInVertexInCaloElectronTracksPhi;
MonitorElement* mInVertexInCaloElectronTracksEta;
MonitorElement* mInVertexInCaloElectronTracksPtVSEta;

MonitorElement* mnOutVertexInCaloElectronTracksPerJet;
MonitorElement* mOutVertexInCaloElectronTracksPt;
MonitorElement* mOutVertexInCaloElectronTracksPhi;
MonitorElement* mOutVertexInCaloElectronTracksEta;
MonitorElement* mOutVertexInCaloElectronTracksPtVSEta;

MonitorElement* mnInVertexOutCaloElectronTracksPerJet;
MonitorElement* mInVertexOutCaloElectronTracksPt;
MonitorElement* mInVertexOutCaloElectronTracksPhi;
MonitorElement* mInVertexOutCaloElectronTracksEta;
MonitorElement* mInVertexOutCaloElectronTracksPtVSEta;

MonitorElement* mInCaloTrackDirectionJetDRHisto_;
MonitorElement* mOutCaloTrackDirectionJetDRHisto_;
MonitorElement* mInVertexTrackImpactPointJetDRHisto_;
MonitorElement* mOutVertexTrackImpactPointJetDRHisto_;
//MonitorElement* mE;
//MonitorElement* mP;
//MonitorElement* mEt;
//MonitorElement* mPtSecond;
//MonitorElement* mPtThird;
//MonitorElement* mPx;
//MonitorElement* mPy;
//MonitorElement* mPz;
//MonitorElement* mnTracks;
//MonitorElement* mnTracksVSJetPt;
//MonitorElement* mnTracksVSJetEta;

//MonitorElement* mnallPionTracksPerJet;
//MonitorElement* mallPionTracksPt;
//MonitorElement* mallPionTracksPhi;
//MonitorElement* mallPionTracksEta;
//MonitorElement* mallPionTracksPtVSEta;

//MonitorElement* mnInVertexInCaloPionTracksPerJet;
//MonitorElement* mInVertexInCaloPionTracksPt;
//MonitorElement* mInVertexInCaloPionTracksPhi;
//MonitorElement* mInVertexInCaloPionTracksEta;
//MonitorElement* mInVertexInCaloPionTracksPtVSEta;

//MonitorElement* mnOutVertexInCaloPionTracksPerJet;
//MonitorElement* mOutVertexInCaloPionTracksPt;
//MonitorElement* mOutVertexInCaloPionTracksPhi;
//MonitorElement* mOutVertexInCaloPionTracksEta;
//MonitorElement* mOutVertexInCaloPionTracksPtVSEta;

//MonitorElement* mnInVertexOutCaloPionTracksPerJet;
//MonitorElement* mInVertexOutCaloPionTracksPt;
//MonitorElement* mInVertexOutCaloPionTracksPhi;
//MonitorElement* mInVertexOutCaloPionTracksEta;
//MonitorElement* mInVertexOutCaloPionTracksPtVSEta;

//MonitorElement* mnallMuonTracksPerJet;
//MonitorElement* mallMuonTracksPt;
//MonitorElement* mallMuonTracksPhi;
//MonitorElement* mallMuonTracksEta;
//MonitorElement* mallMuonTracksPtVSEta;

//MonitorElement* mnInVertexInCaloMuonTracksPerJet;
//MonitorElement* mInVertexInCaloMuonTracksPt;
//MonitorElement* mInVertexInCaloMuonTracksPhi;
//MonitorElement* mInVertexInCaloMuonTracksEta;
//MonitorElement* mInVertexInCaloMuonTracksPtVSEta;

//MonitorElement* mnOutVertexInCaloMuonTracksPerJet;
//MonitorElement* mOutVertexInCaloMuonTracksPt;
//MonitorElement* mOutVertexInCaloMuonTracksPhi;
//MonitorElement* mOutVertexInCaloMuonTracksEta;
//MonitorElement* mOutVertexInCaloMuonTracksPtVSEta;

//MonitorElement* mnInVertexOutCaloMuonTracksPerJet;
//MonitorElement* mInVertexOutCaloMuonTracksPt;
//MonitorElement* mInVertexOutCaloMuonTracksPhi;
//MonitorElement* mInVertexOutCaloMuonTracksEta;
//MonitorElement* mInVertexOutCaloMuonTracksPtVSEta;

//MonitorElement* mnallElectronTracksPerJet;
//MonitorElement* mallElectronTracksPt;
//MonitorElement* mallElectronTracksPhi;
//MonitorElement* mallElectronTracksEta;
//MonitorElement* mallElectronTracksPtVSEta;

//MonitorElement* mnInVertexInCaloElectronTracksPerJet;
//MonitorElement* mInVertexInCaloElectronTracksPt;
//MonitorElement* mInVertexInCaloElectronTracksPhi;
//MonitorElement* mInVertexInCaloElectronTracksEta;
//MonitorElement* mInVertexInCaloElectronTracksPtVSEta;

//MonitorElement* mnOutVertexInCaloElectronTracksPerJet;
//MonitorElement* mOutVertexInCaloElectronTracksPt;
//MonitorElement* mOutVertexInCaloElectronTracksPhi;
//MonitorElement* mOutVertexInCaloElectronTracksEta;
//MonitorElement* mOutVertexInCaloElectronTracksPtVSEta;

//MonitorElement* mnInVertexOutCaloElectronTracksPerJet;
//MonitorElement* mInVertexOutCaloElectronTracksPt;
//MonitorElement* mInVertexOutCaloElectronTracksPhi;
//MonitorElement* mInVertexOutCaloElectronTracksEta;
//MonitorElement* mInVertexOutCaloElectronTracksPtVSEta;

//MonitorElement* mInCaloTrackDirectionJetDRHisto_;
//MonitorElement* mOutCaloTrackDirectionJetDRHisto_;
//MonitorElement* mInVertexTrackImpactPointJetDRHisto_;
//MonitorElement* mOutVertexTrackImpactPointJetDRHisto_;

//now define PFJet only flags
double thisCHFMin_;
Expand Down Expand Up @@ -610,9 +606,13 @@ class JetAnalyzer : public edm::EDAnalyzer {
JetMETDQMDCSFilter * DCSFilterForJetMonitoring_;
JetMETDQMDCSFilter * DCSFilterForDCSMonitoring_;

std::map< std::string,MonitorElement* >map_of_MEs;

bool isCaloJet_;
bool isJPTJet_;
//bool isJPTJet_;
bool isPFJet_;

bool fill_jet_high_level_histo;

};
#endif
5 changes: 2 additions & 3 deletions DQMOffline/JetMET/interface/JetMETDQMOfflineClient.h
View file
Expand Up @@ -46,7 +46,7 @@
class DQMStore;
class MonitorElement;

class JetMETDQMOfflineClient : public DQMEDAnalyzer {
class JetMETDQMOfflineClient : public edm::EDAnalyzer {

private:
DQMStore* dbe_; //dbe seems to be the standard name for this, I dont know why. We of course dont own it
Expand All @@ -68,8 +68,7 @@ class JetMETDQMOfflineClient : public DQMEDAnalyzer {

virtual void beginJob(void);
virtual void endJob();
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
// virtual void beginRun(const edm::Run& run, const edm::EventSetup& c);
//virtual void beginRun(const edm::Run& run, const edm::EventSetup& c);
virtual void endRun(const edm::Run& run, const edm::EventSetup& c);
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c);
Expand Down

0 comments on commit 490e130

Please sign in to comment.