Skip to content

Commit

Permalink
updates for code style
Browse files Browse the repository at this point in the history
  • Loading branch information
@sroychow
sroychow committed May 11, 2020
1 parent 083982f commit 81b4eff
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 31 deletions.
7 changes: 5 additions & 2 deletions DQM/SiStripMonitorHardware/interface/FEDErrors.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public:
unsigned int& aNBadChannels,
unsigned int& aNBadActiveChannels,
unsigned int& aNBadChannels_perFEDID,
std::vector<unsigned int>& nTotal,
std::vector<unsigned int>& nTotal,
std::vector<unsigned int>& nErrors);

void fillEventProperties(long long dbx);
Expand Down Expand Up @@ -239,7 +239,10 @@ public:

protected:
private:
void incrementLumiErrors(const bool hasError, const unsigned int aSubDet, std::vector<unsigned int>& nTotal, std::vector<unsigned int>& nErrors);
void incrementLumiErrors(const bool hasError,
const unsigned int aSubDet,
std::vector<unsigned int>& nTotal,
std::vector<unsigned int>& nErrors);

void processDet(const uint32_t aPrevId,
const uint16_t aPrevTot,
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorHardware/interface/FEDHistograms.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public:

bool feMajHistosEnabled();

void fillLumiHistograms(const std::vector<unsigned int>& nTotal, const std::vector<unsigned int>& nErrors);
void fillLumiHistograms(const std::vector<unsigned int> &nTotal, const std::vector<unsigned int> &nErrors);

bool cmHistosEnabled();

Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorHardware/interface/HistogramBase.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class HistogramBase {
public:
typedef dqm::legacy::DQMStore DQMStore;
typedef dqm::legacy::MonitorElement MonitorElement;

struct HistogramConfig {
HistogramConfig() : globalswitchon(true) {}
MonitorElement* monitorEle;
Expand Down
7 changes: 5 additions & 2 deletions DQM/SiStripMonitorHardware/src/FEDErrors.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ void FEDErrors::fillBadChannelList(const bool doTkHistoMap,
unsigned int& aNBadChannels,
unsigned int& aNBadActiveChannels,
unsigned int& aNBadChannels_perFEDID,
std::vector<unsigned int>& nTotal,
std::vector<unsigned int>& nTotal,
std::vector<unsigned int>& nErrors) {
uint32_t lPrevId = 0;
uint16_t nBad = 0;
Expand Down Expand Up @@ -779,7 +779,10 @@ void FEDErrors::fillBadChannelList(const bool doTkHistoMap,

void FEDErrors::fillEventProperties(long long dbx) { eventProp_.deltaBX = dbx; }

void FEDErrors::incrementLumiErrors(const bool hasError, const unsigned int aSubDet, std::vector<unsigned int>& nTotal, std::vector<unsigned int>& nErrors) {
void FEDErrors::incrementLumiErrors(const bool hasError,
const unsigned int aSubDet,
std::vector<unsigned int>& nTotal,
std::vector<unsigned int>& nErrors) {
if (nTotal.empty())
return;
if (aSubDet >= nTotal.size()) {
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorHardware/src/FEDHistograms.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ void FEDHistograms::bookTopLevelHistograms(DQMStore::IBooker& ibooker,
42241, //total number of channels
"Time",
"# APVs with APVAddressError");

//book map after, as it creates a new folder...
if (tkMapConfig_.enabled) {
tkmapFED_ = std::make_unique<TkHistoMap>(tkDetMap, topFolderName, "TkHMap_FractionOfBadChannels", 0., true);
Expand Down
55 changes: 31 additions & 24 deletions DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,20 @@ namespace sifedmon {
std::vector<unsigned int> nTotal;
std::vector<unsigned int> nErrors;
};
}
class SiStripFEDMonitorPlugin : public DQMOneEDAnalyzer< edm::LuminosityBlockCache<sifedmon::LumiErrors> > {
} // namespace sifedmon
class SiStripFEDMonitorPlugin : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<sifedmon::LumiErrors> > {
public:
explicit SiStripFEDMonitorPlugin(const edm::ParameterSet&);
~SiStripFEDMonitorPlugin() override;

private:
void analyze(const edm::Event&, const edm::EventSetup&) override;

std::shared_ptr<sifedmon::LumiErrors> globalBeginLuminosityBlock(const edm::LuminosityBlock &lumi,const edm::EventSetup &iSetup) const override;

void globalEndLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &iSetup) override;

std::shared_ptr<sifedmon::LumiErrors> globalBeginLuminosityBlock(const edm::LuminosityBlock& lumi,
const edm::EventSetup& iSetup) const override;

void globalEndLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& iSetup) override;

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

//update the cabling if necessary
Expand Down Expand Up @@ -122,9 +123,9 @@ class SiStripFEDMonitorPlugin : public DQMOneEDAnalyzer< edm::LuminosityBlockCac
FEDErrors fedErrors_;
unsigned int maxFedBufferSize_;
bool fullDebugMode_;

bool enableFEDerrLumi_;
MonitorElement *lumiErrfac_;
MonitorElement* lumiErrfac_;
};

//
Expand All @@ -146,8 +147,9 @@ SiStripFEDMonitorPlugin::SiStripFEDMonitorPlugin(const edm::ParameterSet& iConfi
rawDataToken_ = consumes<FEDRawDataCollection>(rawDataTag_);
heToken_ = consumes<EventWithHistory>(edm::InputTag("consecutiveHEs"));

if(iConfig.exists("ErrorFractionByLumiBlockHistogramConfig")) {
const edm::ParameterSet& ps = iConfig.getUntrackedParameter<edm::ParameterSet>("ErrorFractionByLumiBlockHistogramConfig");
if (iConfig.exists("ErrorFractionByLumiBlockHistogramConfig")) {
const edm::ParameterSet& ps =
iConfig.getUntrackedParameter<edm::ParameterSet>("ErrorFractionByLumiBlockHistogramConfig");
enableFEDerrLumi_ = (ps.exists("Enabled") ? ps.getUntrackedParameter<bool>("Enabled") : true);
}
//print config to debug log
Expand Down Expand Up @@ -200,17 +202,17 @@ void SiStripFEDMonitorPlugin::analyze(const edm::Event& iEvent, const edm::Event
edm::Handle<FEDRawDataCollection> rawDataCollectionHandle;
iEvent.getByToken(rawDataToken_, rawDataCollectionHandle);
const FEDRawDataCollection& rawDataCollection = *rawDataCollectionHandle;

fedErrors_.initialiseEvent();

//add the deltaBX value if the product exist

edm::Handle<EventWithHistory> he;
iEvent.getByToken(heToken_, he);

//get the fedErrors object for each LS
//get the fedErrors object for each LS
auto lumiErrors = luminosityBlockCache(iEvent.getLuminosityBlock().index());
auto& nToterr = lumiErrors->nTotal;
auto& nToterr = lumiErrors->nTotal;
auto& nErr = lumiErrors->nErrors;

if (he.isValid() && !he.failedToGet()) {
Expand Down Expand Up @@ -327,7 +329,9 @@ void SiStripFEDMonitorPlugin::analyze(const edm::Event& iEvent, const edm::Event
fedHists_.getFedvsAPVpointer(),
lNTotBadChannels,
lNTotBadActiveChannels,
lNBadChannels_perFEDID, nToterr, nErr);
lNBadChannels_perFEDID,
nToterr,
nErr);
fedHists_.fillFEDHistograms(fedErrors_, lSize, fullDebugMode_, aLumiSection, lNBadChannels_perFEDID);
} //loop over FED IDs

Expand Down Expand Up @@ -485,13 +489,14 @@ void SiStripFEDMonitorPlugin::bookHistograms(DQMStore::IBooker& ibooker,

if (fillAllDetailedHistograms_)
fedHists_.bookAllFEDHistograms(ibooker, fullDebugMode_);
if(enableFEDerrLumi_) {

if (enableFEDerrLumi_) {
ibooker.cd();
ibooker.setCurrentFolder("SiStrip/ReadoutView/PerLumiSection");
ibooker.setCurrentFolder("SiStrip/ReadoutView/PerLumiSection");
{
auto scope = DQMStore::IBooker::UseRunScope(ibooker);
lumiErrfac_ = ibooker.book1D("lumiErrorFraction", "Fraction of error per lumi section vs subdetector", 6, 0.5, 6.5);
lumiErrfac_ =
ibooker.book1D("lumiErrorFraction", "Fraction of error per lumi section vs subdetector", 6, 0.5, 6.5);
lumiErrfac_->setAxisTitle("SubDetId", 1);
lumiErrfac_->setBinLabel(1, "TECB");
lumiErrfac_->setBinLabel(2, "TECF");
Expand All @@ -505,20 +510,22 @@ void SiStripFEDMonitorPlugin::bookHistograms(DQMStore::IBooker& ibooker,
}
}

std::shared_ptr<sifedmon::LumiErrors> SiStripFEDMonitorPlugin::globalBeginLuminosityBlock(const edm::LuminosityBlock &lumi,const edm::EventSetup &iSetup) const{
std::shared_ptr<sifedmon::LumiErrors> SiStripFEDMonitorPlugin::globalBeginLuminosityBlock(
const edm::LuminosityBlock& lumi, const edm::EventSetup& iSetup) const {
auto lumiErrors = std::make_shared<sifedmon::LumiErrors>();
lumiErrors->nTotal.resize(6, 0);
lumiErrors->nErrors.resize(6, 0);
return lumiErrors;
}

void SiStripFEDMonitorPlugin::globalEndLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &iSetup) {
void SiStripFEDMonitorPlugin::globalEndLuminosityBlock(const edm::LuminosityBlock& lumi,
const edm::EventSetup& iSetup) {
auto lumiErrors = luminosityBlockCache(lumi.index());
if(enableFEDerrLumi_ && lumiErrfac_) {
if (enableFEDerrLumi_ && lumiErrfac_) {
for (unsigned int iD(0); iD < lumiErrors->nTotal.size(); iD++) {
if (lumiErrors->nTotal[iD] > 0)
lumiErrfac_->Fill(iD+1, static_cast<float>(lumiErrors->nErrors[iD]) / lumiErrors->nTotal[iD]);
}
if (lumiErrors->nTotal[iD] > 0)
lumiErrfac_->Fill(iD + 1, static_cast<float>(lumiErrors->nErrors[iD]) / lumiErrors->nTotal[iD]);
}
}
}

Expand Down

0 comments on commit 81b4eff

Please sign in to comment.