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

castor dqm update #24142

Merged
merged 7 commits into from Aug 28, 2018
Merged

castor dqm update #24142

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ab3045e
castor dqm update
popovvp Jul 31, 2018
9fb8dfc
castor dqm update
popovvp Jul 31, 2018
6bca683
castor dqm update
popovvp Jul 31, 2018
9336bb9
Castor dqm update
popovvp Aug 8, 2018
f3289e4
Add files via upload
popovvp Aug 20, 2018
55f2a4c
Add files via upload
popovvp Aug 20, 2018
507d5dc
clang-format done
popovvp Aug 27, 2018
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
46 changes: 0 additions & 46 deletions DQM/CastorMonitor/interface/CastorBaseMonitor.h
View file
Open in desktop

This file was deleted.

21 changes: 18 additions & 3 deletions DQM/CastorMonitor/interface/CastorDigiMonitor.h
View file
Open in desktop
Expand Up @@ -12,6 +12,11 @@
#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/MonitorElement.h"

#include "DataFormats/Common/interface/TriggerResults.h"
#include "FWCore/Common/interface/TriggerNames.h"

//#include "FWCore/Framework/interface/Run.h"


class CastorDigiMonitor {

Expand All @@ -20,14 +25,24 @@ class CastorDigiMonitor {
~CastorDigiMonitor();

void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
void processEvent(const CastorDigiCollection& cast,const CastorDbService& cond);
void processEvent(edm::Event const& event, const CastorDigiCollection& cast,
const edm::TriggerResults& trig, const CastorDbService& cond);
// void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context);
void beginLuminosityBlock(int lumiSec);
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);

private:
std::string subsystemname_;
int fVerbosity;
int ievt_;
float Qrms_DEAD;

MonitorElement *hBX, *hpBXtrig;
MonitorElement* hpTrigRes;
MonitorElement* h2QrmsTSvsCh;
MonitorElement* hQIErms[10];
MonitorElement* hTSratio;
Expand All @@ -37,13 +52,13 @@ class CastorDigiMonitor {
MonitorElement* h2repsum;
MonitorElement* h2qualityMap;
MonitorElement* hReport;
MonitorElement* h2QtsvsCh;
MonitorElement *h2QmeantsvsCh;
MonitorElement *h2QmeanMap;
MonitorElement *hModule;
MonitorElement *hSector;
MonitorElement* hdigisize;
// MonitorElement* hBunchOcc;
MonitorElement *h2towEMvsHAD;
MonitorElement *htowE;

int TS_MAX = 10;
float RatioThresh1 = 0.;
Expand Down
22 changes: 17 additions & 5 deletions DQM/CastorMonitor/interface/CastorMonitorModule.h
View file
Open in desktop
Expand Up @@ -10,6 +10,11 @@
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DataFormats/L1TGlobal/interface/GlobalAlgBlk.h"
#include "DataFormats/L1TGlobal/interface/GlobalExtBlk.h"
#include "DataFormats/L1Trigger/interface/BXVector.h"
#include "L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h"

#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
#include "DQMServices/Core/interface/MonitorElement.h"
Expand All @@ -29,10 +34,6 @@
#include "FWCore/Utilities/interface/EDGetToken.h"
#include "DataFormats/Provenance/interface/EventID.h"

#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"

#include "DataFormats/Common/interface/TriggerResults.h"
#include "FWCore/Common/interface/TriggerNames.h"

Expand Down Expand Up @@ -83,7 +84,11 @@ class CastorMonitorModule : public DQMEDAnalyzer{
void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;
void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& eventSetup) override;

void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
const edm::EventSetup& eventSetup) override;

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

Expand All @@ -93,9 +98,12 @@ class CastorMonitorModule : public DQMEDAnalyzer{
bool rawOK_,reportOK_,digiOK_,rechitOK_ ;
int irun_,ilumisec_,ievent_,ibunch_;
std::string subsystemname_;
int NBunchesOrbit;
// int NBunchesOrbit;
int ievt_;
// edm::EDGetTokenT<GlobalAlgBlkBxCollection> l1tStage2uGtSource_;//for L1 uGT DAQ readout record
// edm::EDGetTokenT<GlobalAlgBlkBxCollection> TokenL1TStage2uGtSource;

edm::EDGetTokenT<edm::TriggerResults> tokenTriggerResults;
edm::EDGetTokenT<FEDRawDataCollection> inputTokenRaw_;
edm::EDGetTokenT<HcalUnpackerReport> inputTokenReport_;
edm::EDGetTokenT<CastorDigiCollection> inputTokenDigi_;
Expand All @@ -105,10 +113,14 @@ class CastorMonitorModule : public DQMEDAnalyzer{
typedef std::vector<reco::BasicJet> BasicJetCollection;
edm::EDGetTokenT<BasicJetCollection> JetAlgorithm;

// std::shared_ptr<l1t::L1TGlobalUtil> gtUtil_;

CastorRecHitMonitor* RecHitMon_;
CastorDigiMonitor* DigiMon_;
CastorLEDMonitor* LedMon_;

// MonitorElement* algoBits_before_bxmask_bx_inEvt;
// MonitorElement* algoBits_before_bxmask_bx_global;
MonitorElement* CastorEventProduct;
MonitorElement* hunpkrep;

Expand Down