Skip to content

Commit 61cda8d

Browse files
author
Kyungmin Park
committed
code check
1 parent 511d742 commit 61cda8d

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

DQM/EcalMonitorTasks/interface/TrigPrimTask.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ namespace ecaldqm {
3737
void runOnEmulTPs(EcalTrigPrimDigiCollection const&);
3838
template <typename DigiCollection>
3939
void runOnDigis(DigiCollection const&);
40-
void runOnRecHits(EcalRecHitCollection const&, Collections);
41-
40+
void runOnRecHits(EcalRecHitCollection const&, Collections);
41+
4242
void setTokens(edm::ConsumesCollector&) override;
4343

4444
enum Constants { nBXBins = 15 };
@@ -74,7 +74,7 @@ namespace ecaldqm {
7474

7575
edm::InputTag lhcStatusInfoCollectionTag_;
7676
edm::EDGetTokenT<TCDSRecord> lhcStatusInfoRecordToken_;
77-
77+
7878
std::map<EcalTrigTowerDetId, float> mapTowerMaxRecHitEnergy_;
7979
std::map<EcalTrigTowerDetId, int> mapTowerOfflineSpikes_;
8080
edm::ESGetToken<EcalSeverityLevelAlgo, EcalSeverityLevelAlgoRcd> severityToken_;
@@ -109,7 +109,7 @@ namespace ecaldqm {
109109
runOnDigis(*static_cast<EEDigiCollection const*>(_p));
110110
return true;
111111
break;
112-
default:
112+
default:
113113
break;
114114
}
115115
return false;

DQM/EcalMonitorTasks/src/TrigPrimTask.cc

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ namespace ecaldqm {
6868
if (ByLumiResetSwitch) {
6969
MEs_.at("EtSummaryByLumi").reset(GetElectronicsMap());
7070
MEs_.at("TTFlags4ByLumi").reset(GetElectronicsMap());
71-
MEs_.at("LHCStatusByLumi").reset(GetElectronicsMap(), -1);
72-
}
71+
MEs_.at("LHCStatusByLumi").reset(GetElectronicsMap(), -1);
72+
}
7373

7474
if (!lhcStatusSet) {
7575
// Update LHC status once each LS
@@ -231,12 +231,14 @@ namespace ecaldqm {
231231
meEtSummary.fill(getEcalDQMSetupObjects(), ttid, et);
232232
meEtSummaryByLumi.fill(getEcalDQMSetupObjects(), ttid, et);
233233

234-
if (et > 30) etSum_ += et;
235-
234+
if (et > 30)
235+
etSum_ += et;
236+
236237
if (ttid.subDet() == EcalBarrel) {
237-
if (mapTowerOfflineSpikes_[ttid] == 1) {
238+
if (mapTowerOfflineSpikes_[ttid] == 1) {
238239
meEtRealSpikeMatched.fill(getEcalDQMSetupObjects(), ttid, et);
239-
if (et > 30) etSpikeMatchSum_ += et;
240+
if (et > 30)
241+
etSpikeMatchSum_ += et;
240242
}
241243
}
242244

@@ -300,18 +302,19 @@ namespace ecaldqm {
300302

301303
// Integrate Et with Et > thres with threshold scan : FIXME -> more efficienct way?
302304
int nThresEtBin = 128;
303-
304-
for (int thres=1; thres<=nThresEtBin; thres++) {
305+
306+
for (int thres = 1; thres <= nThresEtBin; thres++) {
305307
int nFiltered = 0;
306308
int nFilteredSpikeMatched = 0;
307-
for (int iBin=thres; iBin<=nThresEtBin; iBin++) {
308-
nFiltered += meEtReal.getBinContent(getEcalDQMSetupObjects(), EcalBarrel, iBin);
309+
for (int iBin = thres; iBin <= nThresEtBin; iBin++) {
310+
nFiltered += meEtReal.getBinContent(getEcalDQMSetupObjects(), EcalBarrel, iBin);
309311
nFilteredSpikeMatched += meEtRealSpikeMatched.getBinContent(getEcalDQMSetupObjects(), EcalBarrel, iBin);
310312
}
311313
meEtRealIntVsThres.setBinContent(getEcalDQMSetupObjects(), EcalBarrel, thres, nFiltered);
312314
meEtRealSpikeMatchedIntVsThres.setBinContent(getEcalDQMSetupObjects(), EcalBarrel, thres, nFilteredSpikeMatched);
313315
if (nFiltered != 0)
314-
meEffSpikeMatch.setBinContent(getEcalDQMSetupObjects(), EcalBarrel, thres, double(nFilteredSpikeMatched)/nFiltered);
316+
meEffSpikeMatch.setBinContent(
317+
getEcalDQMSetupObjects(), EcalBarrel, thres, double(nFilteredSpikeMatched) / nFiltered);
315318
}
316319
} // TrigPrimTask::runOnRealTPs()
317320

@@ -422,10 +425,10 @@ namespace ecaldqm {
422425
EcalTrigTowerDetId ttid = EBDetId(id).tower();
423426
if (hit.energy() >= mapTowerMaxRecHitEnergy_[ttid]) {
424427
mapTowerMaxRecHitEnergy_[ttid] = hit.energy();
425-
int bitSeverity = sevLevel->severityLevel(EBDetId(id), _hits);
428+
int bitSeverity = sevLevel->severityLevel(EBDetId(id), _hits);
426429
mapTowerOfflineSpikes_[ttid] = ((bitSeverity == 3) || (bitSeverity == 4));
427430
}
428-
} // For spike-killer related plots
431+
} // For spike-killer related plots
429432
});
430433
}
431434

@@ -435,7 +438,7 @@ namespace ecaldqm {
435438

436439
meTrendEtSum.fill(getEcalDQMSetupObjects(), EcalBarrel, double(timestamp_.iLumi), etSum_);
437440
meTrendEtSpikeMatchSum.fill(getEcalDQMSetupObjects(), EcalBarrel, double(timestamp_.iLumi), etSpikeMatchSum_);
438-
441+
439442
etSum_ = 0.;
440443
etSpikeMatchSum_ = 0.;
441444
}

0 commit comments

Comments
 (0)