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

Running code-format for dqm #26713

Merged
merged 1 commit into from May 9, 2019
Merged

Running code-format for dqm #26713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions DQM/CastorMonitor/interface/CastorDigiMonitor.h
View file
Open in desktop
Expand Up @@ -18,21 +18,19 @@
//#include "FWCore/Framework/interface/Run.h"

class CastorDigiMonitor {

public:
CastorDigiMonitor(const edm::ParameterSet &ps);
~CastorDigiMonitor();

void bookHistograms(DQMStore::IBooker &, edm::Run const &,
edm::EventSetup const &);
void processEvent(edm::Event const &event, const CastorDigiCollection &cast,
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
void processEvent(edm::Event const &event,
const CastorDigiCollection &cast,
const edm::TriggerResults &trig,
const CastorDbService &cond);
void endRun();
void getDbData(const edm::EventSetup &iSetup);
int ModSecToIndex(int module, int sector);
void fillTrigRes(edm::Event const &event,
const edm::TriggerResults &TrigResults, double Etot);
void fillTrigRes(edm::Event const &event, const edm::TriggerResults &TrigResults, double Etot);

private:
std::string subsystemname_;
Expand Down
32 changes: 12 additions & 20 deletions DQM/CastorMonitor/interface/CastorLEDMonitor.h
View file
Open in desktop
Expand Up @@ -10,36 +10,28 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"

static const float LedMonAdc2fc[128] = {
-0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 15., 17., 19.,
21., 23., 25., 27., 29.5, 32.5, 35.5, 38.5, 42.,
46., 50., 54.5, 59.5, 64.5, 59.5, 64.5, 69.5, 74.5,
79.5, 84.5, 89.5, 94.5, 99.5, 104.5, 109.5, 114.5, 119.5,
124.5, 129.5, 137., 147., 157., 167., 177., 187., 197.,
209.5, 224.5, 239.5, 254.5, 272., 292., 312., 334.5, 359.5,
384.5, 359.5, 384.5, 409.5, 434.5, 459.5, 484.5, 509.5, 534.5,
559.5, 584.5, 609.5, 634.5, 659.5, 684.5, 709.5, 747., 797.,
847., 897., 947., 997., 1047., 1109.5, 1184.5, 1259.5, 1334.5,
1422., 1522., 1622., 1734.5, 1859.5, 1984.5, 1859.5, 1984.5, 2109.5,
2234.5, 2359.5, 2484.5, 2609.5, 2734.5, 2859.5, 2984.5, 3109.5, 3234.5,
3359.5, 3484.5, 3609.5, 3797., 4047., 4297., 4547., 4797., 5047.,
5297., 5609.5, 5984.5, 6359.5, 6734.5, 7172., 7672., 8172., 8734.5,
9359.5, 9984.5};
-0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5,
12.5, 13.5, 15., 17., 19., 21., 23., 25., 27., 29.5, 32.5, 35.5, 38.5,
42., 46., 50., 54.5, 59.5, 64.5, 59.5, 64.5, 69.5, 74.5, 79.5, 84.5, 89.5,
94.5, 99.5, 104.5, 109.5, 114.5, 119.5, 124.5, 129.5, 137., 147., 157., 167., 177.,
187., 197., 209.5, 224.5, 239.5, 254.5, 272., 292., 312., 334.5, 359.5, 384.5, 359.5,
384.5, 409.5, 434.5, 459.5, 484.5, 509.5, 534.5, 559.5, 584.5, 609.5, 634.5, 659.5, 684.5,
709.5, 747., 797., 847., 897., 947., 997., 1047., 1109.5, 1184.5, 1259.5, 1334.5, 1422.,
1522., 1622., 1734.5, 1859.5, 1984.5, 1859.5, 1984.5, 2109.5, 2234.5, 2359.5, 2484.5, 2609.5, 2734.5,
2859.5, 2984.5, 3109.5, 3234.5, 3359.5, 3484.5, 3609.5, 3797., 4047., 4297., 4547., 4797., 5047.,
5297., 5609.5, 5984.5, 6359.5, 6734.5, 7172., 7672., 8172., 8734.5, 9359.5, 9984.5};

// class CastorLEDMonitor: public CastorBaseMonitor {
// class CastorLEDMonitor: public DQMEDHarvester {
// class CastorLEDMonitor: public CastorMonitorModule {

class CastorLEDMonitor {

public:
CastorLEDMonitor(const edm::ParameterSet &ps);
~CastorLEDMonitor();

void bookHistograms(DQMStore::IBooker &, edm::Run const &,
edm::EventSetup const &);
void processEvent(const CastorDigiCollection &cast,
const CastorDbService &cond);
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
void processEvent(const CastorDigiCollection &cast, const CastorDbService &cond);

private:
int ievt_;
Expand Down
13 changes: 5 additions & 8 deletions DQM/CastorMonitor/interface/CastorMonitorModule.h
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
#include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
#include "DataFormats/HcalDigi/interface/HcalUnpackerReport.h" //no CastorUnpackerReport at the moment
#include "DataFormats/HcalDigi/interface/HcalUnpackerReport.h" //no CastorUnpackerReport at the moment

//#include "DQM/CastorMonitor/interface/CastorMonitorSelector.h"
#include "DQM/CastorMonitor/interface/CastorDigiMonitor.h"
Expand All @@ -59,8 +59,8 @@
#include "DQM/CastorMonitor/interface/CastorLEDMonitor.h"
//#include "DQM/CastorMonitor/interface/CastorTowerJetMonitor.h"

#include "CalibCalorimetry/CastorCalib/interface/CastorDbASCIIIO.h" //-- use to get/dump Calib to DB
#include "CondFormats/CastorObjects/interface/CastorChannelQuality.h" //-- use to get/hold channel status
#include "CalibCalorimetry/CastorCalib/interface/CastorDbASCIIIO.h" //-- use to get/dump Calib to DB
#include "CondFormats/CastorObjects/interface/CastorChannelQuality.h" //-- use to get/hold channel status
#include "CondFormats/DataRecord/interface/CastorChannelQualityRcd.h"

#include <fstream>
Expand All @@ -71,18 +71,15 @@
#include <vector>

class CastorMonitorModule : public DQMEDAnalyzer {

public:
CastorMonitorModule(const edm::ParameterSet &ps);
~CastorMonitorModule() override;

protected:
void analyze(const edm::Event &iEvent,
const edm::EventSetup &eventSetup) override;
void analyze(const edm::Event &iEvent, const edm::EventSetup &eventSetup) override;

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

void endRun(const edm::Run &run, const edm::EventSetup &eventSetup) override;

Expand Down
3 changes: 1 addition & 2 deletions DQM/CastorMonitor/interface/CastorRecHitMonitor.h
View file
Open in desktop
Expand Up @@ -23,8 +23,7 @@ class CastorRecHitMonitor {
CastorRecHitMonitor(const edm::ParameterSet &ps);
~CastorRecHitMonitor();

void bookHistograms(DQMStore::IBooker &, edm::Run const &,
edm::EventSetup const &);
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
void processEvent(const CastorRecHitCollection &castorHits);
void processEventTowers(const reco::CastorTowerCollection &castorTowers);
void processEventJets(const reco::BasicJetCollection &Jets);
Expand Down