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.

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

Running code-format for dqm #26628

Merged
merged 2 commits into from May 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
541 changes: 299 additions & 242 deletions DQM/EcalMonitorDbModule/interface/DBReaderWorkers.h

Large diffs are not rendered by default.

239 changes: 123 additions & 116 deletions DQM/EcalMonitorDbModule/interface/DBWriterWorkers.h
@@ -1,136 +1,143 @@
#ifndef DBWriterWorkers_H
#define DBWriterWorkers_H

#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "DQM/EcalCommon/interface/MESet.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DQMServices/Core/interface/DQMStore.h"

#include "OnlineDB/EcalCondDB/interface/MonRunDat.h"
#include "OnlineDB/EcalCondDB/interface/EcalCondDBInterface.h"
#include "OnlineDB/EcalCondDB/interface/MonRunDat.h"

#include <map>

class DQMStore;

namespace ecaldqm {

class DBWriterWorker {
public:
DBWriterWorker(std::string const&, edm::ParameterSet const&);
virtual ~DBWriterWorker() {}

void retrieveSource(DQMStore::IGetter&);
virtual bool run(EcalCondDBInterface*, MonRunIOV&) = 0;

bool runsOn(std::string const& _runType) const { return runTypes_.find(_runType) != runTypes_.end(); }

void setVerbosity(int _v) { verbosity_ = _v; }

std::string const& getName() const { return name_; }
bool isActive() const { return active_; }

protected:
std::string const name_;
std::set<std::string> runTypes_;
MESetCollection source_;
bool active_;
int verbosity_;
};

class IntegrityWriter : public DBWriterWorker {
public:
IntegrityWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Integrity", _ps) {}
~IntegrityWriter() {}

bool run(EcalCondDBInterface*, MonRunIOV&) override;
};

class LaserWriter : public DBWriterWorker {
public:
LaserWriter(edm::ParameterSet const&);
~LaserWriter() {}

bool run(EcalCondDBInterface*, MonRunIOV&) override;

private:
std::map<int, unsigned> wlToME_;
};

class PedestalWriter : public DBWriterWorker {
public:
PedestalWriter(edm::ParameterSet const&);
~PedestalWriter() {}

bool run(EcalCondDBInterface*, MonRunIOV&) override;

private:
std::map<int, unsigned> gainToME_;
std::map<int, unsigned> pnGainToME_;
};

class PresampleWriter : public DBWriterWorker {
public:
PresampleWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Presample", _ps) {}
~PresampleWriter() {}

bool run(EcalCondDBInterface*, MonRunIOV&) override;
};

class TestPulseWriter : public DBWriterWorker {
public:
TestPulseWriter(edm::ParameterSet const&);
~TestPulseWriter() {}

bool run(EcalCondDBInterface*, MonRunIOV&) override;

private:
std::map<int, unsigned> gainToME_;
std::map<int, unsigned> pnGainToME_;
};

class TimingWriter : public DBWriterWorker {
public:
TimingWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Timing", _ps) {}
~TimingWriter() {}

bool run(EcalCondDBInterface*, MonRunIOV&) override;
};

class LedWriter : public DBWriterWorker {
public:
LedWriter(edm::ParameterSet const&);
~LedWriter() {}

bool run(EcalCondDBInterface*, MonRunIOV&) override;
class DBWriterWorker {
public:
DBWriterWorker(std::string const &, edm::ParameterSet const &);
virtual ~DBWriterWorker() {}

private:
std::map<int, unsigned> wlToME_;
};
void retrieveSource(DQMStore::IGetter &);
virtual bool run(EcalCondDBInterface *, MonRunIOV &) = 0;

class OccupancyWriter : public DBWriterWorker {
public:
OccupancyWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Occupancy", _ps) {}
~OccupancyWriter() {}
bool runsOn(std::string const &_runType) const {
return runTypes_.find(_runType) != runTypes_.end();
}

void setVerbosity(int _v) { verbosity_ = _v; }

bool run(EcalCondDBInterface*, MonRunIOV&) override;
};

class SummaryWriter : public DBWriterWorker {
public:
SummaryWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Summary", _ps), taskList_(0), outcome_(0), processedEvents_(0) {}
~SummaryWriter() {}

void setTaskList(int _list) { taskList_ = _list; }
void setOutcome(int _outcome) { outcome_ = _outcome; }
void setProcessedEvents(unsigned _n) { processedEvents_ = _n; }
bool run(EcalCondDBInterface*, MonRunIOV&) override;

private:
int taskList_;
int outcome_;
unsigned processedEvents_;
};
}
std::string const &getName() const { return name_; }
bool isActive() const { return active_; }

protected:
std::string const name_;
std::set<std::string> runTypes_;
MESetCollection source_;
bool active_;
int verbosity_;
};

class IntegrityWriter : public DBWriterWorker {
public:
IntegrityWriter(edm::ParameterSet const &_ps)
: DBWriterWorker("Integrity", _ps) {}
~IntegrityWriter() override {}

bool run(EcalCondDBInterface *, MonRunIOV &) override;
};

class LaserWriter : public DBWriterWorker {
public:
LaserWriter(edm::ParameterSet const &);
~LaserWriter() override {}

bool run(EcalCondDBInterface *, MonRunIOV &) override;

private:
std::map<int, unsigned> wlToME_;
};

class PedestalWriter : public DBWriterWorker {
public:
PedestalWriter(edm::ParameterSet const &);
~PedestalWriter() override {}

bool run(EcalCondDBInterface *, MonRunIOV &) override;

private:
std::map<int, unsigned> gainToME_;
std::map<int, unsigned> pnGainToME_;
};

class PresampleWriter : public DBWriterWorker {
public:
PresampleWriter(edm::ParameterSet const &_ps)
: DBWriterWorker("Presample", _ps) {}
~PresampleWriter() override {}

bool run(EcalCondDBInterface *, MonRunIOV &) override;
};

class TestPulseWriter : public DBWriterWorker {
public:
TestPulseWriter(edm::ParameterSet const &);
~TestPulseWriter() override {}

bool run(EcalCondDBInterface *, MonRunIOV &) override;

private:
std::map<int, unsigned> gainToME_;
std::map<int, unsigned> pnGainToME_;
};

class TimingWriter : public DBWriterWorker {
public:
TimingWriter(edm::ParameterSet const &_ps) : DBWriterWorker("Timing", _ps) {}
~TimingWriter() override {}

bool run(EcalCondDBInterface *, MonRunIOV &) override;
};

class LedWriter : public DBWriterWorker {
public:
LedWriter(edm::ParameterSet const &);
~LedWriter() override {}

bool run(EcalCondDBInterface *, MonRunIOV &) override;

private:
std::map<int, unsigned> wlToME_;
};

class OccupancyWriter : public DBWriterWorker {
public:
OccupancyWriter(edm::ParameterSet const &_ps)
: DBWriterWorker("Occupancy", _ps) {}
~OccupancyWriter() override {}

bool run(EcalCondDBInterface *, MonRunIOV &) override;
};

class SummaryWriter : public DBWriterWorker {
public:
SummaryWriter(edm::ParameterSet const &_ps)
: DBWriterWorker("Summary", _ps), taskList_(0), outcome_(0),
processedEvents_(0) {}
~SummaryWriter() override {}

void setTaskList(int _list) { taskList_ = _list; }
void setOutcome(int _outcome) { outcome_ = _outcome; }
void setProcessedEvents(unsigned _n) { processedEvents_ = _n; }
bool run(EcalCondDBInterface *, MonRunIOV &) override;

private:
int taskList_;
int outcome_;
unsigned processedEvents_;
};
} // namespace ecaldqm

#endif
32 changes: 14 additions & 18 deletions DQM/EcalMonitorDbModule/interface/EcalBarrelMonitorDbModule.h
Expand Up @@ -6,7 +6,7 @@
*
* \author G. Della Ricca
*
*/
*/

#include <string>

Expand All @@ -22,45 +22,41 @@ class DQMStore;

class MonitorElementsDb;

class EcalBarrelMonitorDbModule: public edm::EDAnalyzer{

public:
class EcalBarrelMonitorDbModule : public edm::EDAnalyzer {

public:
/// Constructor
EcalBarrelMonitorDbModule( const edm::ParameterSet& ps );
EcalBarrelMonitorDbModule(const edm::ParameterSet &ps);

/// Destructor
virtual ~EcalBarrelMonitorDbModule();

protected:
~EcalBarrelMonitorDbModule() override;

protected:
/// Analyze
void analyze( const edm::Event& e, const edm::EventSetup& c );
void analyze(const edm::Event &e, const edm::EventSetup &c) override;

// BeginJob
void beginJob( void );
void beginJob(void) override;

// EndJob
void endJob( void );
void endJob(void) override;

private:

private:
int icycle_;
DQMStore* dqmStore_;

DQMStore *dqmStore_;

std::string prefixME_;

std::string htmlDir_;

std::string xmlFile_;

MonitorElementsDb* ME_Db_;
MonitorElementsDb *ME_Db_;

unsigned int sleepTime_;

coral::ISessionProxy* session_;

coral::ISessionProxy *session_;
};

#endif
20 changes: 10 additions & 10 deletions DQM/EcalMonitorDbModule/interface/EcalCondDBReader.h
@@ -1,18 +1,18 @@
#ifndef EcalCondDBReader_H
#define EcalCondDBReader_H

#include "DBReaderWorkers.h"
#include "DQM/EcalCommon/interface/MESet.h"
#include "DQMServices/Core/interface/DQMEDHarvester.h"
#include "OnlineDB/EcalCondDB/interface/EcalCondDBInterface.h"
#include "DQM/EcalCommon/interface/MESet.h"
#include "DBReaderWorkers.h"

class EcalCondDBReader : public DQMEDHarvester {
public:
EcalCondDBReader(edm::ParameterSet const&);
~EcalCondDBReader();
public:
EcalCondDBReader(edm::ParameterSet const &);
~EcalCondDBReader() override;

private:
void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
private:
void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;

// DON'T CHANGE - ORDER MATTERS IN DB
enum Tasks {
Expand All @@ -33,11 +33,11 @@ class EcalCondDBReader : public DQMEDHarvester {
nTasks = 14
};

EcalCondDBInterface* db_;
EcalCondDBInterface *db_;
MonRunIOV monIOV_;
ecaldqm::DBReaderWorker* worker_;
ecaldqm::DBReaderWorker *worker_;
std::string formula_;
ecaldqm::MESet* meSet_;
ecaldqm::MESet *meSet_;

int verbosity_;
bool executed_;
Expand Down