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

Castor DQM #58

Closed
wants to merge 1 commit into from
Closed

Castor DQM #58

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions DQM/CastorMonitor/interface/CastorChannelQualityMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
#include <map>


class CastorChannelQualityMonitor: public CastorBaseMonitor{
class CastorChannelQualityMonitor: public CastorBaseMonitor
{

typedef std::map<uint32_t,float,std::less<uint32_t> > MapType;

Expand All @@ -34,15 +35,19 @@ class CastorChannelQualityMonitor: public CastorBaseMonitor{
~CastorChannelQualityMonitor();

void setup(const edm::ParameterSet& ps, DQMStore* dbe);
void beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup);
void processEvent(const CastorRecHitCollection& castorHits);
void reset();


struct{
int module;
int sector;
std::vector<float> energy;
} ChannelStatus;
struct
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the indentation here, possibly reverting the nice, old one...

{
int module;
int sector;
std::vector<float> energy;
}

ChannelStatus;


private:
Expand Down Expand Up @@ -73,8 +78,6 @@ class CastorChannelQualityMonitor: public CastorBaseMonitor{
MonitorElement* overallStatus;
double fraction;



};

#endif
1 change: 1 addition & 0 deletions DQM/CastorMonitor/interface/CastorDataIntegrityMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class CastorDataIntegrityMonitor: public CastorBaseMonitor
void setup(const edm::ParameterSet& ps, DQMStore* dbe);

void processEvent(const FEDRawDataCollection& RawData, const HcalUnpackerReport& report, const CastorElectronicsMap& emap);
void beginRun(const edm::EventSetup& iSetup);

void unpack(const FEDRawData& raw, const CastorElectronicsMap& emap);

Expand Down
2 changes: 1 addition & 1 deletion DQM/CastorMonitor/interface/CastorDigiMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class CastorDigiMonitor: public CastorBaseMonitor {
~CastorDigiMonitor();

void setup(const edm::ParameterSet& ps, DQMStore* dbe);

void beginRun(const edm::EventSetup& iSetup);
void processEvent(const CastorDigiCollection& cast,const CastorDbService& cond);


Expand Down
1 change: 1 addition & 0 deletions DQM/CastorMonitor/interface/CastorEventDisplay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class CastorEventDisplay: public CastorBaseMonitor {
~CastorEventDisplay();

void setup(const edm::ParameterSet& ps, DQMStore* dbe);
void beginRun(const edm::EventSetup& iSetup);
void processEvent(const CastorRecHitCollection& castorHits, const CaloGeometry& caloGeometry );
void reset();

Expand Down
1 change: 1 addition & 0 deletions DQM/CastorMonitor/interface/CastorHIMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class CastorHIMonitor: public CastorBaseMonitor {
~CastorHIMonitor();

void setup(const edm::ParameterSet& ps, DQMStore* dbe);
void beginRun(const edm::EventSetup& iSetup);
void processEvent(const CastorRecHitCollection& castorHits, const CastorDigiCollection& cast, const CastorDbService& cond);
void reset();

Expand Down
2 changes: 1 addition & 1 deletion DQM/CastorMonitor/interface/CastorLEDMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class CastorLEDMonitor: public CastorBaseMonitor {
~CastorLEDMonitor();

void setup(const edm::ParameterSet& ps, DQMStore* dbe);

void beginRun(const edm::EventSetup& iSetup);
void processEvent(const CastorDigiCollection& cast, const CastorDbService& cond);

void reset();
Expand Down
1 change: 1 addition & 0 deletions DQM/CastorMonitor/interface/CastorMonitorModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ class CastorMonitorModule : public edm::EDAnalyzer{
MonitorElement* meLatency_;
MonitorElement* meQuality_;
MonitorElement* CastorEventProduct;
//MonitorElement* CastorMonitorStatus;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not need commented code. This comment applies for all the files in this patch that have lots of commented code inside.



////---- define monitors
Expand Down
1 change: 1 addition & 0 deletions DQM/CastorMonitor/interface/CastorPSMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class CastorPSMonitor: public CastorBaseMonitor {
~CastorPSMonitor();

void setup(const edm::ParameterSet& ps, DQMStore* dbe);
void beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup);
void processEvent(const CastorDigiCollection& castorDigis, const CastorDbService& conditions, std::vector<HcalGenericDetId> listEMap, int iBunch, float PedSigmaInChannel[14][16]);
void reset();

Expand Down
1 change: 1 addition & 0 deletions DQM/CastorMonitor/interface/CastorRecHitMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class CastorRecHitMonitor: public CastorBaseMonitor {
~CastorRecHitMonitor();

void setup(const edm::ParameterSet& ps, DQMStore* dbe);
void beginRun(const edm::EventSetup& iSetup);
void processEvent(const CastorRecHitCollection& castorHits);
void reset();

Expand Down
1 change: 1 addition & 0 deletions DQM/CastorMonitor/interface/CastorTowerJetMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class CastorTowerJetMonitor: public CastorBaseMonitor {
~CastorTowerJetMonitor();

void setup(const edm::ParameterSet& ps, DQMStore* dbe);
void beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup);

void processEventTowers(const reco::CastorTowerCollection& castorTowers);
void processEventJets(const reco::BasicJet& castorBasicJets);
Expand Down
67 changes: 41 additions & 26 deletions DQM/CastorMonitor/python/castor-layouts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,46 @@
def castorlayout(i, p, *rows): i["Castor/Layouts/" + p] = DQMItem(layout=rows)


castorlayout(dqmitems, "CASTOR Report Summary Map",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A general comment: why are you maintaining layout code that is bundled to the DQM GUI inside CMSSW? this will never ever make it into production, unless you submit it using the official procedures. There is no need to keep a copy here too.

[{ 'path': "Castor/CastorPSMonitor/reportSummaryMap",
'description':"Report Summary Map"}]
)

castorlayout(dqmitems, "CASTOR Digi ChannelSummaryMap",
[{ 'path': "Castor/CastorPSMonitor/CASTOR Digi ChannelSummaryMap",
'description':""}]
'description':"Digi Channel Summary Map"}]
)

castorlayout(dqmitems, "CASTOR Digi Occupancy Map",
[{ 'path': "Castor/CastorPSMonitor/CASTOR Digi Occupancy Map",
'description':"dynamic scale"}]
'description':"Digi Occcupancy Map"}]
)

castorlayout(dqmitems, "CASTOR Digi Saturation Summary Map",
[{ 'path': "Castor/CastorPSMonitor/CASTOR Digi SaturationSummaryMap",
'description':"Digi Saturation Summary Map"}]
)

castorlayout(dqmitems, "CASTOR FEDFatal errors",
[{ 'path': "Castor/CastorDataIntegrityMonitor/CASTOR FEDFatal errors",
'description':"FED Fatal errors"}]
)

castorlayout(dqmitems, "CASTOR spigot status",
[{ 'path': "Castor/CastorDataIntegrityMonitor/CASTOR spigot status",
'description':"Data Integrity Summary - Spigot Status"}]
)

castorlayout(dqmitems, "CASTOR RecHit Energies",
[{ 'path': "Castor/CastorRecHitMonitor/CastorRecHit Energies- above threshold on RecHitEnergy",
'description':"Energy of all Castor RecHits"}]
)

#castorlayout(dqmitems, "CASTOR RecHit Energy 2D Map",
# [{ 'path': "Castor/CastorRecHitMonitor/CastorRecHit 2D Energy Map- above threshold",
# 'description':"2D Energy Map"}]
# )

castorlayout(dqmitems, "CASTOR RecHit Energy based Channel Status",
[{ 'path': "Castor/CastorChannelQuality/RecHitEnergyBasedSummaryMap",
'description':"Green - OK, Red - dead, Yellow - noisy"}]
Expand All @@ -19,12 +49,7 @@ def castorlayout(i, p, *rows): i["Castor/Layouts/" + p] = DQMItem(layout=rows)
castorlayout(dqmitems, "CASTOR event products",
[{ 'path': "Castor/CastorEventProducts/CastorEventProduct",
'description':"check whether CASTOR objects are present in the events"}]
)

castorlayout(dqmitems, "CASTOR RecHit Energies",
[{ 'path': "Castor/CastorRecHitMonitor/CastorRecHit Energies- above threshold on RecHitEnergy",
'description':"Energy of all Castor RecHits"}]
)
)

castorlayout(dqmitems, "CASTOR RecHit Energy in modules",
[{ 'path': "Castor/CastorRecHitMonitor/CastorRecHit Energy in modules- above threshold",
Expand All @@ -34,27 +59,17 @@ def castorlayout(i, p, *rows): i["Castor/Layouts/" + p] = DQMItem(layout=rows)
castorlayout(dqmitems, "CASTOR RecHit Energy in sectors",
[{ 'path': "Castor/CastorRecHitMonitor/CastorRecHit Energy in sectors- above threshold",
'description':"RecHitEnergy in each of 16 CASTOR sectors"}]
)

castorlayout(dqmitems, "CASTOR RecHit Energy 2D Map",
[{ 'path': "Castor/CastorRecHitMonitor/CastorRecHit 2D Energy Map- above threshold",
'description':"2D Energy Map"}]
)

castorlayout(dqmitems, "CASTOR All Digi Values",
[{ 'path': "Castor/CastorDigiMonitor/Castor All Digi Values",
'description':"all CASTOR ADC values"}]
)

castorlayout(dqmitems, "CASTOR hits 3D- cumulative",
[{ 'path': "Castor/CastorEventDisplay/CASTOR 3D hits- cumulative",
'description':"cumulative event display"}]
)
#castorlayout(dqmitems, "CASTOR hits 3D- cumulative",
# [{ 'path': "Castor/CastorEventDisplay/CASTOR 3D hits- cumulative",
# 'description':"cumulative event display"}]
# )

castorlayout(dqmitems, "CASTOR hits 3D- event with the largest deposited E",
[{ 'path': "Castor/CastorEventDisplay/CASTOR 3D hits- event with the largest deposited E",
'description':"display of the event with largest deposited energy"}]
)
#castorlayout(dqmitems, "CASTOR hits 3D- event with the largest deposited E",
# [{ 'path': "Castor/CastorEventDisplay/CASTOR 3D hits- event with the largest deposited E",
# 'description':"display of the event with largest deposited energy"}]
# )

castorlayout(dqmitems, "CASTOR average pulse in bunch crossings",
[{ 'path': "Castor/CastorPSMonitor/CASTOR average pulse in bunch crossings",
Expand Down
Loading