Skip to content

Commit

Permalink
Merge pull request #33854 from jhgoh/CleanupRPCDQM_1200
Browse files Browse the repository at this point in the history
Code-cleanup of RPC-DQM
  • Loading branch information
cmsbuild committed May 31, 2021
2 parents 2d536c5 + 5c436a7 commit 75b3627
Show file tree
Hide file tree
Showing 60 changed files with 926 additions and 1,337 deletions.
19 changes: 5 additions & 14 deletions DQM/RPCMonitorClient/BuildFile.xml
@@ -1,20 +1,11 @@
<flags EDM_PLUGIN="1"/>
<use name="boost"/>
<use name="rootcore"/>
<use name="rootgraphics"/>
<use name="DQMServices/Core"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/RPCGeometry"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/Records"/>
<use name="EventFilter/RPCRawToDigi"/>
<use name="DataFormats/RPCDigi"/>
<use name="DataFormats/FEDRawData"/>
<use name="DataFormats/MuonDetId"/>
<use name="CondFormats/RPCObjects"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/RunInfo"/>
<use name="CondCore/PopCon"/>
<use name="EventFilter/RPCRawToDigi"/>
<export>
<lib name="1"/>
</export>

26 changes: 26 additions & 0 deletions DQM/RPCMonitorClient/interface/RPCBookFolderStructure.h
@@ -0,0 +1,26 @@
/** \class RPCBookFolderStructure
*
* \author Anna Cimmino (INFN Napoli)
*
* Create folder structure for DQM histo saving
*/
#ifndef RPCBookFolderStructure_H
#define RPCBookFolderStructure_H

#include <DataFormats/MuonDetId/interface/RPCDetId.h>
#include <string>
#include <fmt/format.h>

struct RPCBookFolderStructure {
static std::string folderStructure(const RPCDetId& detId) {
if (detId.region() == 0)
return fmt::format("Barrel/Wheel_{}/sector_{}/station_{}", detId.ring(), detId.sector(), detId.station());
else if (detId.region() == -1)
return fmt::format("Endcap-/Disk_-{}/ring_{}/sector_{}", detId.station(), detId.ring(), detId.sector());
else if (detId.region() == 1)
return fmt::format("Endcap+/Disk_{}/ring_{}/sector_{}", detId.station(), detId.ring(), detId.sector());
return "Error/Folder/Creation";
}
};

#endif
3 changes: 0 additions & 3 deletions DQM/RPCMonitorClient/interface/RPCChamberQuality.h
@@ -1,10 +1,7 @@
#ifndef RPCChamberQuality_H
#define RPCChamberQuality_H

#include "FWCore/ServiceRegistry/interface/Service.h"
#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/DQMEDHarvester.h"

#include <string>

class RPCChamberQuality : public DQMEDHarvester {
Expand Down
5 changes: 0 additions & 5 deletions DQM/RPCMonitorClient/interface/RPCClient.h
Expand Up @@ -8,13 +8,8 @@
#include "DQMServices/Core/interface/DQMStore.h"

#include <DataFormats/MuonDetId/interface/RPCDetId.h>
#include <FWCore/Framework/interface/Event.h>
//#include <FWCore/Framework/interface/Run.h>
#include "FWCore/ParameterSet/interface/ParameterSet.h"
//#include <FWCore/Framework/interface/LuminosityBlock.h>
//#include "FWCore/ServiceRegistry/interface/Service.h"

//#include <map>
#include <vector>
#include <string>

Expand Down
5 changes: 4 additions & 1 deletion DQM/RPCMonitorClient/interface/RPCClusterSizeTest.h
Expand Up @@ -4,13 +4,16 @@
#include "DQM/RPCMonitorClient/interface/RPCClient.h"
#include "DQMServices/Core/interface/DQMStore.h"

#include <vector>
#include <string>

class RPCClusterSizeTest : public RPCClient {
public:
/// Constructor
RPCClusterSizeTest(const edm::ParameterSet &ps);

/// Destructor
~RPCClusterSizeTest() override;
~RPCClusterSizeTest() override = default;
void clientOperation() override;
void getMonitorElements(std::vector<MonitorElement *> &, std::vector<RPCDetId> &, std::string &) override;
void beginJob(std::string &) override;
Expand Down
21 changes: 3 additions & 18 deletions DQM/RPCMonitorClient/interface/RPCDBHandler.h
@@ -1,32 +1,17 @@
#ifndef RPCDBHandler_h
#define RPCDBHandler_h

#include <vector>
#include <string>
#include <iostream>
#include <typeinfo>
#include <iostream>
#include <sstream>

#include "CondCore/PopCon/interface/PopConSourceHandler.h"
#include "CondFormats/RPCObjects/interface/RPCDQMObject.h"
#include "CondFormats/DataRecord/interface/RPCDQMObjectRcd.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include <DataFormats/MuonDetId/interface/RPCDetId.h>
#include <Geometry/RPCGeometry/interface/RPCGeometry.h>
#include <Geometry/CommonDetUnit/interface/GeomDet.h>
#include <Geometry/Records/interface/MuonGeometryRecord.h>
#include "DQM/RPCMonitorDigi/interface/utils.h"

#include <string>

class RPCDBHandler : public popcon::PopConSourceHandler<RPCDQMObject> {
public:
void getNewObjects() override;
std::string id() const override { return m_name; }
~RPCDBHandler() override;
~RPCDBHandler() override = default;
RPCDBHandler(const edm::ParameterSet& pset);

void initObject(RPCDQMObject*);
Expand Down
15 changes: 5 additions & 10 deletions DQM/RPCMonitorClient/interface/RPCDCSSummary.h
Expand Up @@ -10,13 +10,8 @@

class RPCDCSSummary : public DQMEDHarvester {
public:
/// Constructor
RPCDCSSummary(const edm::ParameterSet &);

/// Destructor
~RPCDCSSummary() override;

// Operations
~RPCDCSSummary() override = default;

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

MonitorElement *DCSMap_;
MonitorElement *totalDCSFraction;
constexpr static int kNWheels = 5;
MonitorElement *dcsWheelFractions[kNWheels];
constexpr static int kNDisks = 10;
MonitorElement *dcsDiskFractions[kNDisks];
constexpr static int nWheels_ = 5;
MonitorElement *dcsWheelFractions[nWheels_];
constexpr static int nDisks_ = 10;
MonitorElement *dcsDiskFractions[nDisks_];
std::pair<int, int> FEDRange_;
int numberOfDisks_;
int NumberOfFeds_;
Expand Down
20 changes: 8 additions & 12 deletions DQM/RPCMonitorClient/interface/RPCDaqInfo.h
@@ -1,21 +1,17 @@
#ifndef DQM_RPCMonitorClient_DQMDaqInfo_H
#define DQM_RPCMonitorClient_DQMDaqInfo_H

// system include files
#include <iostream>
#include <fstream>

#include "FWCore/ServiceRegistry/interface/Service.h"
#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/DQMEDHarvester.h"
#include "DQMServices/Core/interface/DQMStore.h"
#include "CondFormats/RunInfo/interface/RunInfo.h"
#include "CondFormats/RunInfo/interface/RunSummary.h"
#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"

#include <utility>

class RPCDaqInfo : public DQMEDHarvester {
public:
explicit RPCDaqInfo(const edm::ParameterSet &);
~RPCDaqInfo() override;
~RPCDaqInfo() override = default;

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

MonitorElement *DaqFraction_;
MonitorElement *DaqMap_;
constexpr static int kNWheels = 5;
MonitorElement *daqWheelFractions[kNWheels];
constexpr static int kNDisks = 10;
MonitorElement *daqDiskFractions[kNDisks];
constexpr static int nWheels_ = 5;
MonitorElement *daqWheelFractions[nWheels_];
constexpr static int nDisks_ = 10;
MonitorElement *daqDiskFractions[nDisks_];

std::pair<int, int> FEDRange_;

Expand Down
13 changes: 5 additions & 8 deletions DQM/RPCMonitorClient/interface/RPCDataCertification.h
Expand Up @@ -10,11 +10,8 @@

class RPCDataCertification : public DQMEDHarvester {
public:
/// Constructor
RPCDataCertification(const edm::ParameterSet& pset);

/// Destructor
~RPCDataCertification() override;
~RPCDataCertification() override = default;

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

MonitorElement* CertMap_;
MonitorElement* totalCertFraction;
constexpr static int kNWheels = 5;
MonitorElement* certWheelFractions[kNWheels];
constexpr static int kNDisks = 10;
MonitorElement* certDiskFractions[kNDisks];
constexpr static int nWheels_ = 5;
MonitorElement* certWheelFractions[nWheels_];
constexpr static int nDisks_ = 10;
MonitorElement* certDiskFractions[nDisks_];
std::pair<int, int> FEDRange_;
int numberOfDisks_;
int NumberOfFeds_;
Expand Down
5 changes: 1 addition & 4 deletions DQM/RPCMonitorClient/interface/RPCDeadChannelTest.h
Expand Up @@ -7,11 +7,8 @@

class RPCDeadChannelTest : public RPCClient {
public:
/// Constructor
RPCDeadChannelTest(const edm::ParameterSet &ps);

/// Destructor
~RPCDeadChannelTest() override;
~RPCDeadChannelTest() override = default;

void clientOperation() override;
void getMonitorElements(std::vector<MonitorElement *> &, std::vector<RPCDetId> &, std::string &) override;
Expand Down
5 changes: 3 additions & 2 deletions DQM/RPCMonitorClient/interface/RPCDqmClient.h
Expand Up @@ -11,14 +11,15 @@

#include <string>
#include <vector>
#include <memory>

class RPCDqmClient : public DQMEDHarvester {
public:
/// Constructor
RPCDqmClient(const edm::ParameterSet &ps);

/// Destructor
~RPCDqmClient() override;
~RPCDqmClient() override = default;

protected:
void beginJob() override;
Expand All @@ -44,7 +45,7 @@ class RPCDqmClient : public DQMEDHarvester {
MonitorElement *RPCEvents_;
std::vector<RPCDetId> myDetIds_;
std::vector<std::string> clientNames_, clientHisto_;
std::vector<RPCClient *> clientModules_;
std::vector<std::unique_ptr<RPCClient> > clientModules_;

std::vector<int> clientTag_;

Expand Down
2 changes: 1 addition & 1 deletion DQM/RPCMonitorClient/interface/RPCMultiplicityTest.h
Expand Up @@ -10,7 +10,7 @@ class RPCMultiplicityTest : public RPCClient {
RPCMultiplicityTest(const edm::ParameterSet &ps);

/// Destructor
~RPCMultiplicityTest() override;
~RPCMultiplicityTest() override = default;

void clientOperation() override;
void getMonitorElements(std::vector<MonitorElement *> &, std::vector<RPCDetId> &, std::string &) override;
Expand Down
17 changes: 17 additions & 0 deletions DQM/RPCMonitorClient/interface/RPCNameHelper.h
@@ -0,0 +1,17 @@
#ifndef RPCNameHelper_H
#define RPCNameHelper_H

#include "DataFormats/MuonDetId/interface/RPCDetId.h"
#include <string>
#include <array>

struct RPCNameHelper {
static std::string name(const RPCDetId& detId, const bool useRoll);
static std::string chamberName(const RPCDetId& detId);
static std::string rollName(const RPCDetId& detId);
static std::string regionName(const int region);

static const std::array<std::string, 3> regionNames;
};

#endif
2 changes: 1 addition & 1 deletion DQM/RPCMonitorClient/interface/RPCNoisyStripTest.h
Expand Up @@ -8,7 +8,7 @@
class RPCNoisyStripTest : public RPCClient {
public:
RPCNoisyStripTest(const edm::ParameterSet &ps);
~RPCNoisyStripTest() override;
~RPCNoisyStripTest() override = default;
void clientOperation() override;
void getMonitorElements(std::vector<MonitorElement *> &, std::vector<RPCDetId> &, std::string &) override;
void beginJob(std::string &) override;
Expand Down
2 changes: 1 addition & 1 deletion DQM/RPCMonitorClient/interface/RPCOccupancyTest.h
Expand Up @@ -12,7 +12,7 @@
class RPCOccupancyTest : public RPCClient {
public:
RPCOccupancyTest(const edm::ParameterSet &ps);
~RPCOccupancyTest() override;
~RPCOccupancyTest() override = default;

void clientOperation() override;
void getMonitorElements(std::vector<MonitorElement *> &, std::vector<RPCDetId> &, std::string &) override;
Expand Down
11 changes: 4 additions & 7 deletions DQM/RPCMonitorClient/interface/RPCRecHitProbabilityClient.h
@@ -1,18 +1,15 @@
#ifndef RPCRecHitProbabilityClient_H
#define RPCRecHitProbabilityClient_H

#include "DQMServices/Core/interface/DQMStore.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "DQMServices/Core/interface/DQMEDHarvester.h"
#include <FWCore/Framework/interface/ESHandle.h>
#include "DQMServices/Core/interface/DQMStore.h"

#include <string>

class RPCRecHitProbabilityClient : public DQMEDHarvester {
public:
/// Constructor
RPCRecHitProbabilityClient(const edm::ParameterSet &ps);

/// Destructor
~RPCRecHitProbabilityClient() override;
~RPCRecHitProbabilityClient() override = default;

protected:
void beginJob() override;
Expand Down
22 changes: 22 additions & 0 deletions DQM/RPCMonitorClient/interface/RPCRollMapHisto.h
@@ -0,0 +1,22 @@
#ifndef RPCRollMapHisto_H
#define RPCRollMapHisto_H

#include "DQMServices/Core/interface/DQMStore.h"
#include <string>

struct RPCRollMapHisto {
typedef dqm::reco::MonitorElement MonitorElement;
//typedef dqm::impl::MonitorElement MonitorElement;
//typedef DQMEDHarvester::MonitorElement MonitorElement;
typedef dqm::reco::DQMStore::IBooker IBooker;

static MonitorElement* bookBarrel(
IBooker& booker, const int wheel, const std::string& prefix, const std::string& title, const bool useRollInfo);
static MonitorElement* bookEndcap(
IBooker& booker, const int disk, const std::string& prefix, const std::string& title, const bool useRollInfo);

static void setBarrelRollAxis(MonitorElement* me, const int wheel, const int axis, const bool useRollInfo);
static void setEndcapRollAxis(MonitorElement* me, const int disk, const int axis, const bool useRollInfo);
};

#endif
18 changes: 18 additions & 0 deletions DQM/RPCMonitorClient/interface/RPCSummaryMapHisto.h
@@ -0,0 +1,18 @@
#ifndef RPCHistoHelper_H
#define RPCHistoHelper_H

#include "DQMServices/Core/interface/DQMStore.h"
#include <string>

struct RPCSummaryMapHisto {
typedef dqm::implementation::MonitorElement MonitorElement;
typedef dqm::implementation::IBooker IBooker;

static MonitorElement* book(IBooker& booker, const std::string& name, const std::string& title);
static void setBinBarrel(MonitorElement* me, const int wheel, const int sector, const double value);
static void setBinEndcap(MonitorElement* me, const int disk, const int sector, const double value);
static void setBinsBarrel(MonitorElement* me, const double value);
static void setBinsEndcap(MonitorElement* me, const double value);
};

#endif
File renamed without changes.
6 changes: 6 additions & 0 deletions DQM/RPCMonitorClient/plugins/BuildFile.xml
@@ -0,0 +1,6 @@
<use name="DQM/RPCMonitorClient"/>
<use name="DQMServices/Core"/>
<use name="Geometry/RPCGeometry"/>
<library name="DQMRPCMonitorClient_plugins" file="*.cc">
<flags EDM_PLUGIN="1"/>
</library>

0 comments on commit 75b3627

Please sign in to comment.