Skip to content

Commit

Permalink
Merge pull request #2737 from mtosi/from-CMSSW_7_1_0_pre3_DQMEDAnalyzer
Browse files Browse the repository at this point in the history 
DQM/TrackingMonitor -- conversion from EDAnalyzer to DQMEDAnalyzer
  • Loading branch information
@nclopezo
nclopezo committed Mar 14, 2014
2 parents 3270220 + 113a0fe commit 1a40144
Show file tree
Hide file tree
Showing 16 changed files with 365 additions and 305 deletions.
9 changes: 6 additions & 3 deletions DQM/TrackingMonitor/interface/LogMessageMonitor.h
View file
Expand Up @@ -35,6 +35,7 @@
#include "DQMServices/Core/interface/MonitorElement.h"
#include "FWCore/MessageLogger/interface/ErrorSummaryEntry.h"

#include <DQMServices/Core/interface/DQMEDAnalyzer.h>

#include <vector>
#include <string>
Expand All @@ -49,7 +50,7 @@ class GetLumi;
// class declaration
//

class LogMessageMonitor : public edm::EDAnalyzer {
class LogMessageMonitor : public DQMEDAnalyzer {
public:
explicit LogMessageMonitor(const edm::ParameterSet&);
~LogMessageMonitor();
Expand All @@ -58,15 +59,17 @@ class LogMessageMonitor : public edm::EDAnalyzer {


private:
virtual void beginJob() ;
// virtual void beginJob() ;
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void endJob() ;

virtual void beginRun(edm::Run const&, edm::EventSetup const&);
// virtual void beginRun(edm::Run const&, edm::EventSetup const&);
virtual void endRun(edm::Run const&, edm::EventSetup const&);
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);

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

// ----------member data ---------------------------
edm::EDGetTokenT<std::vector<edm::ErrorSummaryEntry> > errorToken_;

Expand Down
15 changes: 7 additions & 8 deletions DQM/TrackingMonitor/interface/TrackAnalyzer.h
View file
Expand Up @@ -34,24 +34,23 @@ class TrackAnalyzer
TrackAnalyzer(const edm::ParameterSet&);
TrackAnalyzer(const edm::ParameterSet&, edm::ConsumesCollector& iC);
virtual ~TrackAnalyzer();
virtual void beginJob(DQMStore * dqmStore_);
virtual void beginRun(DQMStore * dqmStore_);
virtual void initHisto(DQMStore::IBooker & ibooker);

virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup, const reco::Track& track);

void doSoftReset (DQMStore * dqmStore_);
void doReset (DQMStore * dqmStore_);
void doReset ();
void undoSoftReset(DQMStore * dqmStore_);
void setLumiFlag();

private:
void initHistos();
void fillHistosForState(const edm::EventSetup& iSetup, const reco::Track & track, std::string sname);
void bookHistosForState(std::string sname,DQMStore * dqmStore_);
void bookHistosForHitProperties(DQMStore * dqmStore_);
void bookHistosForLScertification(DQMStore * dqmStore_);
void bookHistosForBeamSpot(DQMStore * dqmStore_);
void bookHistosForTrackerSpecific(DQMStore * dqmStore_);
void bookHistosForState(std::string sname,DQMStore::IBooker & ibooker);
void bookHistosForHitProperties(DQMStore::IBooker & ibooker);
void bookHistosForLScertification(DQMStore::IBooker & ibooker);
void bookHistosForBeamSpot(DQMStore::IBooker & ibooker);
void bookHistosForTrackerSpecific(DQMStore::IBooker & ibooker);
void fillHistosForHitProperties(const edm::EventSetup& iSetup, const reco::Track & track, std::string sname);
void fillHistosForLScertification(const edm::EventSetup& iSetup, const reco::Track & track, std::string sname);
void fillHistosForTrackerSpecific(const reco::Track & track);
Expand Down
4 changes: 2 additions & 2 deletions DQM/TrackingMonitor/interface/TrackBuildingAnalyzer.h
View file
Expand Up @@ -36,7 +36,7 @@ class TrackBuildingAnalyzer
public:
TrackBuildingAnalyzer(const edm::ParameterSet&);
virtual ~TrackBuildingAnalyzer();
virtual void beginRun(DQMStore * dqmStore_);
virtual void initHisto(DQMStore::IBooker & ibooker);
virtual void analyze
(
const edm::Event& iEvent,
Expand All @@ -59,7 +59,7 @@ class TrackBuildingAnalyzer
private:

void fillHistos(const edm::EventSetup& iSetup, const reco::Track & track, std::string sname);
void bookHistos(std::string sname, DQMStore * dqmStore_);
void bookHistos(std::string sname, DQMStore::IBooker & ibooker);

// ----------member data ---------------------------

Expand Down
8 changes: 6 additions & 2 deletions DQM/TrackingMonitor/interface/TrackEfficiencyMonitor.h
View file
Expand Up @@ -23,6 +23,8 @@ Monitoring source to measure the track efficiency
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "DQMServices/Core/interface/MonitorElement.h"

#include <DQMServices/Core/interface/DQMEDAnalyzer.h>

#include "RecoMuon/GlobalTrackingTools/interface/DirectTrackerNavigation.h"
#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
#include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h"
Expand All @@ -37,7 +39,7 @@ namespace reco{class TransientTrack;}

class DQMStore;

class TrackEfficiencyMonitor : public edm::EDAnalyzer {
class TrackEfficiencyMonitor : public DQMEDAnalyzer {
public:
typedef reco::Track Track;
typedef reco::TrackCollection TrackCollection;
Expand All @@ -46,7 +48,9 @@ class TrackEfficiencyMonitor : public edm::EDAnalyzer {
virtual void beginJob(void);
virtual void endJob(void);
virtual void analyze(const edm::Event&, const edm::EventSetup&);


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

enum SemiCylinder{Up,Down};
std::pair<TrajectoryStateOnSurface, const DetLayer*> findNextLayer( TrajectoryStateOnSurface startTSOS, const std::vector< const DetLayer*>& trackCompatibleLayers , bool isUpMuon );
SemiCylinder checkSemiCylinder(const Track&);
Expand Down
7 changes: 6 additions & 1 deletion DQM/TrackingMonitor/interface/TrackSplittingMonitor.h
View file
Expand Up @@ -21,6 +21,8 @@
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "DQMServices/Core/interface/MonitorElement.h"
#include <DQMServices/Core/interface/DQMEDAnalyzer.h>

#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h"

#include "Geometry/DTGeometry/interface/DTGeometry.h"
Expand All @@ -29,6 +31,8 @@
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"



class DQMStore;
class TrackAnalyzer;
class TProfile;
Expand All @@ -38,14 +42,15 @@ class TProfile;



class TrackSplittingMonitor : public edm::EDAnalyzer {
class TrackSplittingMonitor : public DQMEDAnalyzer {
public:
explicit TrackSplittingMonitor(const edm::ParameterSet&);
~TrackSplittingMonitor();
virtual void beginJob(void);
virtual void endJob(void);

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

private:
void doProfileX(TH2 * th2, MonitorElement* me);
Expand Down
7 changes: 5 additions & 2 deletions DQM/TrackingMonitor/interface/TrackingMonitor.h
View file
Expand Up @@ -21,6 +21,8 @@ Monitoring source for general quantities related to tracks.
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "DQMServices/Core/interface/MonitorElement.h"
#include <DQMServices/Core/interface/DQMEDAnalyzer.h>

#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h"
#include "DataFormats/VertexReco/interface/Vertex.h"
#include "DataFormats/VertexReco/interface/VertexFwd.h"
Expand All @@ -43,7 +45,7 @@ class GetLumi;
class TProfile;
class GenericTriggerEventFlag;

class TrackingMonitor : public edm::EDAnalyzer
class TrackingMonitor : public DQMEDAnalyzer
{
public:
explicit TrackingMonitor(const edm::ParameterSet&);
Expand All @@ -56,7 +58,8 @@ class TrackingMonitor : public edm::EDAnalyzer

virtual void beginLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& eSetup);
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void beginRun(const edm::Run&, const edm::EventSetup&);
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
// virtual void beginRun(const edm::Run&, const edm::EventSetup&);
virtual void endRun(const edm::Run&, const edm::EventSetup&);

private:
Expand Down
2 changes: 1 addition & 1 deletion DQM/TrackingMonitor/interface/VertexMonitor.h
View file
Expand Up @@ -38,7 +38,7 @@ class VertexMonitor
virtual ~VertexMonitor();
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

virtual void beginJob(DQMStore * dqmStore_);
virtual void initHisto(DQMStore::IBooker & ibooker);
virtual void analyze(const edm::Event&, const edm::EventSetup&);

virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
Expand Down
8 changes: 6 additions & 2 deletions DQM/TrackingMonitor/interface/dEdxAnalyzer.h
View file
Expand Up @@ -27,10 +27,12 @@ Monitoring source for general quantities related to track dEdx.
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"

#include <DQMServices/Core/interface/DQMEDAnalyzer.h>

class DQMStore;
class GenericTriggerEventFlag;

class dEdxAnalyzer : public edm::EDAnalyzer {
class dEdxAnalyzer : public DQMEDAnalyzer {
public:
explicit dEdxAnalyzer(const edm::ParameterSet&);
~dEdxAnalyzer();
Expand All @@ -43,9 +45,11 @@ class dEdxAnalyzer : public edm::EDAnalyzer {

double mass(double P, double I);

virtual void beginRun(const edm::Run&, const edm::EventSetup&);
// virtual void beginRun(const edm::Run&, const edm::EventSetup&);
virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);

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

private:
// ----------member data ---------------------------
Expand Down
39 changes: 25 additions & 14 deletions DQM/TrackingMonitor/src/LogMessageMonitor.cc
View file
Expand Up @@ -197,21 +197,23 @@ LogMessageMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& iSet
}
}


// ------------ method called once each job just before starting event loop ------------
void
LogMessageMonitor::beginJob()
void LogMessageMonitor::bookHistograms(DQMStore::IBooker & ibooker,
edm::Run const & iRun,
edm::EventSetup const & iSetup)
{

if ( genTriggerEventFlag_->on() ) genTriggerEventFlag_->initRun( iRun, iSetup );

std::string MEFolderName = conf_.getParameter<std::string>("LogFolderName");

dqmStore_->setCurrentFolder(MEFolderName);
ibooker.setCurrentFolder(MEFolderName);

categories_vector_.push_back("others");
size_t nModules = modules_vector_.size();
size_t nCategories = categories_vector_.size();

histname = pluginsMonName_+"ErrorsVsModules";
CategoriesVsModules = dqmStore_->book2D(histname, histname, nModules, 0., double(nModules), nCategories, 0., double(nCategories) );
CategoriesVsModules = ibooker.book2D(histname, histname, nModules, 0., double(nModules), nCategories, 0., double(nCategories) );
CategoriesVsModules->setAxisTitle("modules",1);
for (size_t imodule = 0; imodule < nModules; imodule++)
CategoriesVsModules->setBinLabel(imodule+1,modules_vector_[imodule],1);
Expand All @@ -237,18 +239,18 @@ LogMessageMonitor::beginJob()
for(std::map<std::string,int>::const_iterator it = modulesMap.begin();
it != modulesMap.end(); ++it, i++){

dqmStore_->setCurrentFolder(MEFolderName + "/PUmonitoring/Errors");
ibooker.setCurrentFolder(MEFolderName + "/PUmonitoring/Errors");

histname = "errorsVsBXlumi_" + it->first;
ModulesErrorsVsBXlumi.push_back( dynamic_cast<MonitorElement*>(dqmStore_->bookProfile( histname, histname, BXlumiBin, BXlumiMin, BXlumiMax, 0.,100, "")) );
ModulesErrorsVsBXlumi.push_back( dynamic_cast<MonitorElement*>(ibooker.bookProfile( histname, histname, BXlumiBin, BXlumiMin, BXlumiMax, 0.,100, "")) );
ModulesErrorsVsBXlumi[i] -> setAxisTitle("BXlumi [10^{30} Hz cm^{-2}]", 1);
ModulesErrorsVsBXlumi[i] -> setAxisTitle("Mean number of errors", 2);

if ( doWarningsPlots_ ) {
dqmStore_->setCurrentFolder(MEFolderName + "/PUmonitoring/Warnings");
ibooker.setCurrentFolder(MEFolderName + "/PUmonitoring/Warnings");

histname = "warningVsBXlumi_" + it->first;
ModulesWarningsVsBXlumi.push_back( dynamic_cast<MonitorElement*>(dqmStore_->bookProfile( histname, histname, BXlumiBin, BXlumiMin, BXlumiMax, 0.,100, "")) );
ModulesWarningsVsBXlumi.push_back( dynamic_cast<MonitorElement*>(ibooker.bookProfile( histname, histname, BXlumiBin, BXlumiMin, BXlumiMax, 0.,100, "")) );
ModulesWarningsVsBXlumi[i] -> setAxisTitle("BXlumi [10^{30} Hz cm^{-2}]", 1);
ModulesWarningsVsBXlumi[i] -> setAxisTitle("Mean number of warnings", 2);
}
Expand All @@ -257,6 +259,14 @@ LogMessageMonitor::beginJob()

}

/*
// ------------ method called once each job just before starting event loop ------------
void
LogMessageMonitor::beginJob()
{
}
*/
// ------------ method called once each job just after ending the event loop ------------
void
LogMessageMonitor::endJob()
Expand All @@ -265,18 +275,19 @@ LogMessageMonitor::endJob()
std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
if(outputMEsInRootFile)
{
dqmStore_->showDirStructure();
dqmStore_->save(outputFileName);
dqmStore_->showDirStructure();
dqmStore_->save(outputFileName);
}
}

/*
// ------------ method called when starting to processes a run ------------
void
LogMessageMonitor::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup)
{
if ( genTriggerEventFlag_->on() ) genTriggerEventFlag_->initRun( iRun, iSetup );
}
}
*/
// ------------ method called when ending the processing of a run ------------
void
LogMessageMonitor::endRun(edm::Run const&, edm::EventSetup const&)
Expand Down

0 comments on commit 1a40144

Please sign in to comment.