Skip to content

Commit 75b3627

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#33854 from jhgoh/CleanupRPCDQM_1200
Code-cleanup of RPC-DQM
2 parents 2d536c5 + 5c436a7 commit 75b3627

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+926
-1337
lines changed

‎DQM/RPCMonitorClient/BuildFile.xml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
1-
<flags EDM_PLUGIN="1"/>
2-
<use name="boost"/>
3-
<use name="rootcore"/>
4-
<use name="rootgraphics"/>
51
<use name="DQMServices/Core"/>
6-
<use name="FWCore/Framework"/>
7-
<use name="FWCore/ParameterSet"/>
8-
<use name="FWCore/ServiceRegistry"/>
9-
<use name="FWCore/Utilities"/>
102
<use name="Geometry/RPCGeometry"/>
11-
<use name="Geometry/CommonDetUnit"/>
12-
<use name="Geometry/Records"/>
13-
<use name="EventFilter/RPCRawToDigi"/>
14-
<use name="DataFormats/RPCDigi"/>
15-
<use name="DataFormats/FEDRawData"/>
16-
<use name="DataFormats/MuonDetId"/>
173
<use name="CondFormats/RPCObjects"/>
184
<use name="CondFormats/DataRecord"/>
195
<use name="CondFormats/RunInfo"/>
206
<use name="CondCore/PopCon"/>
7+
<use name="EventFilter/RPCRawToDigi"/>
8+
<export>
9+
<lib name="1"/>
10+
</export>
11+

‎DQM/RPCMonitorClient/interface/RPCBookFolderStructure.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/** \class RPCBookFolderStructure
2+
*
3+
* \author Anna Cimmino (INFN Napoli)
4+
*
5+
* Create folder structure for DQM histo saving
6+
*/
7+
#ifndef RPCBookFolderStructure_H
8+
#define RPCBookFolderStructure_H
9+
10+
#include <DataFormats/MuonDetId/interface/RPCDetId.h>
11+
#include <string>
12+
#include <fmt/format.h>
13+
14+
struct RPCBookFolderStructure {
15+
static std::string folderStructure(const RPCDetId& detId) {
16+
if (detId.region() == 0)
17+
return fmt::format("Barrel/Wheel_{}/sector_{}/station_{}", detId.ring(), detId.sector(), detId.station());
18+
else if (detId.region() == -1)
19+
return fmt::format("Endcap-/Disk_-{}/ring_{}/sector_{}", detId.station(), detId.ring(), detId.sector());
20+
else if (detId.region() == 1)
21+
return fmt::format("Endcap+/Disk_{}/ring_{}/sector_{}", detId.station(), detId.ring(), detId.sector());
22+
return "Error/Folder/Creation";
23+
}
24+
};
25+
26+
#endif

‎DQM/RPCMonitorClient/interface/RPCChamberQuality.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
#ifndef RPCChamberQuality_H
22
#define RPCChamberQuality_H
33

4-
#include "FWCore/ServiceRegistry/interface/Service.h"
5-
#include "DQMServices/Core/interface/DQMStore.h"
64
#include "DQMServices/Core/interface/DQMEDHarvester.h"
7-
85
#include <string>
96

107
class RPCChamberQuality : public DQMEDHarvester {

‎DQM/RPCMonitorClient/interface/RPCClient.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@
88
#include "DQMServices/Core/interface/DQMStore.h"
99

1010
#include <DataFormats/MuonDetId/interface/RPCDetId.h>
11-
#include <FWCore/Framework/interface/Event.h>
12-
//#include <FWCore/Framework/interface/Run.h>
1311
#include "FWCore/ParameterSet/interface/ParameterSet.h"
14-
//#include <FWCore/Framework/interface/LuminosityBlock.h>
15-
//#include "FWCore/ServiceRegistry/interface/Service.h"
1612

17-
//#include <map>
1813
#include <vector>
1914
#include <string>
2015

‎DQM/RPCMonitorClient/interface/RPCClusterSizeTest.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44
#include "DQM/RPCMonitorClient/interface/RPCClient.h"
55
#include "DQMServices/Core/interface/DQMStore.h"
66

7+
#include <vector>
8+
#include <string>
9+
710
class RPCClusterSizeTest : public RPCClient {
811
public:
912
/// Constructor
1013
RPCClusterSizeTest(const edm::ParameterSet &ps);
1114

1215
/// Destructor
13-
~RPCClusterSizeTest() override;
16+
~RPCClusterSizeTest() override = default;
1417
void clientOperation() override;
1518
void getMonitorElements(std::vector<MonitorElement *> &, std::vector<RPCDetId> &, std::string &) override;
1619
void beginJob(std::string &) override;

‎DQM/RPCMonitorClient/interface/RPCDBHandler.h‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,17 @@
11
#ifndef RPCDBHandler_h
22
#define RPCDBHandler_h
33

4-
#include <vector>
5-
#include <string>
6-
#include <iostream>
7-
#include <typeinfo>
8-
#include <iostream>
9-
#include <sstream>
10-
114
#include "CondCore/PopCon/interface/PopConSourceHandler.h"
125
#include "CondFormats/RPCObjects/interface/RPCDQMObject.h"
13-
#include "CondFormats/DataRecord/interface/RPCDQMObjectRcd.h"
146
#include "FWCore/ParameterSet/interface/ParameterSet.h"
15-
#include "FWCore/Framework/interface/ESHandle.h"
16-
#include "FWCore/Framework/interface/Event.h"
17-
#include "FWCore/Framework/interface/EventSetup.h"
18-
#include "FWCore/ServiceRegistry/interface/Service.h"
19-
#include <DataFormats/MuonDetId/interface/RPCDetId.h>
20-
#include <Geometry/RPCGeometry/interface/RPCGeometry.h>
21-
#include <Geometry/CommonDetUnit/interface/GeomDet.h>
22-
#include <Geometry/Records/interface/MuonGeometryRecord.h>
23-
#include "DQM/RPCMonitorDigi/interface/utils.h"
7+
8+
#include <string>
249

2510
class RPCDBHandler : public popcon::PopConSourceHandler<RPCDQMObject> {
2611
public:
2712
void getNewObjects() override;
2813
std::string id() const override { return m_name; }
29-
~RPCDBHandler() override;
14+
~RPCDBHandler() override = default;
3015
RPCDBHandler(const edm::ParameterSet& pset);
3116

3217
void initObject(RPCDQMObject*);

‎DQM/RPCMonitorClient/interface/RPCDCSSummary.h‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@
1010

1111
class RPCDCSSummary : public DQMEDHarvester {
1212
public:
13-
/// Constructor
1413
RPCDCSSummary(const edm::ParameterSet &);
15-
16-
/// Destructor
17-
~RPCDCSSummary() override;
18-
19-
// Operations
14+
~RPCDCSSummary() override = default;
2015

2116
protected:
2217
void beginJob() override;
@@ -39,10 +34,10 @@ class RPCDCSSummary : public DQMEDHarvester {
3934

4035
MonitorElement *DCSMap_;
4136
MonitorElement *totalDCSFraction;
42-
constexpr static int kNWheels = 5;
43-
MonitorElement *dcsWheelFractions[kNWheels];
44-
constexpr static int kNDisks = 10;
45-
MonitorElement *dcsDiskFractions[kNDisks];
37+
constexpr static int nWheels_ = 5;
38+
MonitorElement *dcsWheelFractions[nWheels_];
39+
constexpr static int nDisks_ = 10;
40+
MonitorElement *dcsDiskFractions[nDisks_];
4641
std::pair<int, int> FEDRange_;
4742
int numberOfDisks_;
4843
int NumberOfFeds_;

‎DQM/RPCMonitorClient/interface/RPCDaqInfo.h‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
#ifndef DQM_RPCMonitorClient_DQMDaqInfo_H
22
#define DQM_RPCMonitorClient_DQMDaqInfo_H
33

4-
// system include files
5-
#include <iostream>
6-
#include <fstream>
7-
8-
#include "FWCore/ServiceRegistry/interface/Service.h"
9-
#include "DQMServices/Core/interface/DQMStore.h"
104
#include "DQMServices/Core/interface/DQMEDHarvester.h"
5+
#include "DQMServices/Core/interface/DQMStore.h"
116
#include "CondFormats/RunInfo/interface/RunInfo.h"
12-
#include "CondFormats/RunInfo/interface/RunSummary.h"
137
#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
148

9+
#include <utility>
10+
1511
class RPCDaqInfo : public DQMEDHarvester {
1612
public:
1713
explicit RPCDaqInfo(const edm::ParameterSet &);
18-
~RPCDaqInfo() override;
14+
~RPCDaqInfo() override = default;
1915

2016
protected:
2117
void beginJob() override;
@@ -34,10 +30,10 @@ class RPCDaqInfo : public DQMEDHarvester {
3430

3531
MonitorElement *DaqFraction_;
3632
MonitorElement *DaqMap_;
37-
constexpr static int kNWheels = 5;
38-
MonitorElement *daqWheelFractions[kNWheels];
39-
constexpr static int kNDisks = 10;
40-
MonitorElement *daqDiskFractions[kNDisks];
33+
constexpr static int nWheels_ = 5;
34+
MonitorElement *daqWheelFractions[nWheels_];
35+
constexpr static int nDisks_ = 10;
36+
MonitorElement *daqDiskFractions[nDisks_];
4137

4238
std::pair<int, int> FEDRange_;
4339

‎DQM/RPCMonitorClient/interface/RPCDataCertification.h‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010

1111
class RPCDataCertification : public DQMEDHarvester {
1212
public:
13-
/// Constructor
1413
RPCDataCertification(const edm::ParameterSet& pset);
15-
16-
/// Destructor
17-
~RPCDataCertification() override;
14+
~RPCDataCertification() override = default;
1815

1916
protected:
2017
void beginJob() override;
@@ -32,10 +29,10 @@ class RPCDataCertification : public DQMEDHarvester {
3229

3330
MonitorElement* CertMap_;
3431
MonitorElement* totalCertFraction;
35-
constexpr static int kNWheels = 5;
36-
MonitorElement* certWheelFractions[kNWheels];
37-
constexpr static int kNDisks = 10;
38-
MonitorElement* certDiskFractions[kNDisks];
32+
constexpr static int nWheels_ = 5;
33+
MonitorElement* certWheelFractions[nWheels_];
34+
constexpr static int nDisks_ = 10;
35+
MonitorElement* certDiskFractions[nDisks_];
3936
std::pair<int, int> FEDRange_;
4037
int numberOfDisks_;
4138
int NumberOfFeds_;

‎DQM/RPCMonitorClient/interface/RPCDeadChannelTest.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77

88
class RPCDeadChannelTest : public RPCClient {
99
public:
10-
/// Constructor
1110
RPCDeadChannelTest(const edm::ParameterSet &ps);
12-
13-
/// Destructor
14-
~RPCDeadChannelTest() override;
11+
~RPCDeadChannelTest() override = default;
1512

1613
void clientOperation() override;
1714
void getMonitorElements(std::vector<MonitorElement *> &, std::vector<RPCDetId> &, std::string &) override;

0 commit comments

Comments
 (0)