Skip to content

Commit 3bee7b8

Browse files
committed
[DQM] Changes suggested by new llvm18 clang-format
1 parent 15ea9bb commit 3bee7b8

File tree

227 files changed

+769
-769
lines changed

Some content is hidden

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

227 files changed

+769
-769
lines changed

DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc

Lines changed: 116 additions & 116 deletions
Large diffs are not rendered by default.

DQM/CSCMonitorModule/plugins/CSCDQM_Configuration.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,18 @@
149149
#define CONFIG_PARAMETER_LOADPS_MACRO(r, data, i, elem) \
150150
BOOST_PP_CAT(set, BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)) \
151151
(ps.getUntrackedParameter<BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 0, elem)>( \
152-
BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)), \
152+
BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)), \
153153
BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 2, elem)));
154154

155155
#endif
156156

157157
#ifdef DQMLOCAL
158158

159159
/** Load parameter from XML node line (Local DQM) */
160-
#define CONFIG_PARAMETER_LOADXML_MACRO(r, data, i, elem) \
160+
#define CONFIG_PARAMETER_LOADXML_MACRO(r, data, i, elem) \
161161
if (nodeName.compare(BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem))) == 0) { \
162-
stm >> BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem); \
163-
continue; \
162+
stm >> BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem); \
163+
continue; \
164164
}
165165

166166
/** Include parameter into XML stream for printing */
@@ -169,7 +169,7 @@
169169
DOMComment* comment = \
170170
doc->createComment(XERCES_TRANSCODE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 3, elem))); \
171171
DOMElement* el = doc->createElement( \
172-
XERCES_TRANSCODE(BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)))); \
172+
XERCES_TRANSCODE(BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)))); \
173173
std::string value = toString(config.BOOST_PP_CAT(get, BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem))()); \
174174
DOMText* tdata = doc->createTextNode(XERCES_TRANSCODE(value.c_str())); \
175175
el->appendChild(tdata); \

DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processCSC.cc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ namespace cscdqm {
358358
mo->Fill(0.0);
359359
float alct_dav_number = mo->GetBinContent(1);
360360
if (getCSCHisto(h::CSC_DMB_FEB_DAV_EFFICIENCY, crateID, dmbID, mo)) {
361-
mo->SetBinContent(1, ((float)alct_dav_number / (float)(DMBEvents)*100.0));
361+
mo->SetBinContent(1, ((float)alct_dav_number / (float)(DMBEvents) * 100.0));
362362
mo->SetEntries((int)DMBEvents);
363363
}
364364
}
@@ -367,7 +367,7 @@ namespace cscdqm {
367367
mo->Fill(1.0);
368368
float tmb_dav_number = mo->GetBinContent(2);
369369
if (getCSCHisto(h::CSC_DMB_FEB_DAV_EFFICIENCY, crateID, dmbID, mo)) {
370-
mo->SetBinContent(2, ((float)tmb_dav_number / (float)(DMBEvents)*100.0));
370+
mo->SetBinContent(2, ((float)tmb_dav_number / (float)(DMBEvents) * 100.0));
371371
mo->SetEntries((int)DMBEvents);
372372
}
373373
}
@@ -376,7 +376,7 @@ namespace cscdqm {
376376
mo->Fill(2.0);
377377
float cfeb_dav2_number = mo->GetBinContent(3);
378378
if (getCSCHisto(h::CSC_DMB_FEB_DAV_EFFICIENCY, crateID, dmbID, mo)) {
379-
mo->SetBinContent(3, ((float)cfeb_dav2_number / (float)(DMBEvents)*100.0));
379+
mo->SetBinContent(3, ((float)cfeb_dav2_number / (float)(DMBEvents) * 100.0));
380380
mo->SetEntries((int)DMBEvents);
381381
}
382382
}
@@ -404,7 +404,7 @@ namespace cscdqm {
404404
float feb_combination_dav_number = mo->GetBinContent((int)(feb_combination_dav + 1.0));
405405
if (getCSCHisto(h::CSC_DMB_FEB_COMBINATIONS_DAV_EFFICIENCY, crateID, dmbID, mo)) {
406406
mo->SetBinContent((int)(feb_combination_dav + 1.0),
407-
((float)feb_combination_dav_number / (float)(DMBEvents)*100.0));
407+
((float)feb_combination_dav_number / (float)(DMBEvents) * 100.0));
408408
mo->SetEntries((int)DMBEvents);
409409
}
410410
}
@@ -444,7 +444,7 @@ namespace cscdqm {
444444
if (config->getNEvents() > 0) {
445445
/** KK */
446446
/** h[hname]->SetBinContent(3, ((float)ALCTEvent/(float)(config->getNEvents()) * 100.0)); */
447-
mo->SetBinContent(1, ((float)ALCTEvent / (float)(DMBEvents)*100.0));
447+
mo->SetBinContent(1, ((float)ALCTEvent / (float)(DMBEvents) * 100.0));
448448
/** KKend */
449449
mo->SetEntries((int)DMBEvents);
450450
}
@@ -503,7 +503,7 @@ namespace cscdqm {
503503
mo->Fill(alctsDatas.size());
504504
int nALCT = (int)mo->GetBinContent((int)(alctsDatas.size() + 1));
505505
if (getCSCHisto(h::CSC_ALCT_NUMBER_EFFICIENCY, crateID, dmbID, mo))
506-
mo->SetBinContent((int)(alctsDatas.size() + 1), (float)(nALCT) / (float)(DMBEvents)*100.0);
506+
mo->SetBinContent((int)(alctsDatas.size() + 1), (float)(nALCT) / (float)(DMBEvents) * 100.0);
507507
}
508508

509509
if (getCSCHisto(h::CSC_ALCT_WORD_COUNT, crateID, dmbID, mo))
@@ -790,7 +790,7 @@ namespace cscdqm {
790790
mo->Fill(0);
791791
int nALCT = (int)mo->GetBinContent(1);
792792
if (getCSCHisto(h::CSC_ALCT_NUMBER_EFFICIENCY, crateID, dmbID, mo))
793-
mo->SetBinContent(1, (float)(nALCT) / (float)(DMBEvents)*100.0);
793+
mo->SetBinContent(1, (float)(nALCT) / (float)(DMBEvents) * 100.0);
794794
}
795795

796796
if ((alct_dav > 0) && (getCSCHisto(h::CSC_DMB_FEB_UNPACKED_VS_DAV, crateID, dmbID, mo))) {
@@ -959,12 +959,12 @@ namespace cscdqm {
959959
/// Fill summary GEM VFATs occupancies plots for endcaps
960960
if ((cid.endcap() == 1) && getEMUHisto(h::EMU_GEM_PLUS_ENDCAP_VFAT_OCCUPANCY, mo)) {
961961
int vfat = (pads_hits[0] / 192) + ((pads_hits[0] % 192) / 64) * 8;
962-
mo->Fill((cscPosition)*2 + i - 1, vfat);
962+
mo->Fill((cscPosition) * 2 + i - 1, vfat);
963963
}
964964

965965
if ((cid.endcap() == 2) && getEMUHisto(h::EMU_GEM_MINUS_ENDCAP_VFAT_OCCUPANCY, mo)) {
966966
int vfat = (pads_hits[0] / 192) + ((pads_hits[0] % 192) / 64) * 8;
967-
mo->Fill((cscPosition)*2 + i - 1, vfat);
967+
mo->Fill((cscPosition) * 2 + i - 1, vfat);
968968
}
969969

970970
for (unsigned pad = 0; pad < pads_hits.size(); pad++) {
@@ -1042,7 +1042,7 @@ namespace cscdqm {
10421042
}
10431043
}
10441044
} // OTMB hasGEM
1045-
} // isGEM_df
1045+
} // isGEM_df
10461046

10471047
/// Summary occupancy plot for Anode HMT bits from OTMB
10481048
if (getEMUHisto(h::EMU_CSC_ANODE_HMT_REPORTING, mo)) {
@@ -1389,7 +1389,7 @@ namespace cscdqm {
13891389
config->setChamberCounterValue(CLCT_TRIGGERS, crateID, dmbID, CLCTEvent);
13901390
if (getCSCHisto(h::CSC_CSC_EFFICIENCY, crateID, dmbID, mo)) {
13911391
if (config->getNEvents() > 0) {
1392-
mo->SetBinContent(2, ((float)CLCTEvent / (float)(DMBEvents)*100.0));
1392+
mo->SetBinContent(2, ((float)CLCTEvent / (float)(DMBEvents) * 100.0));
13931393
mo->SetEntries(DMBEvents);
13941394
}
13951395
}
@@ -1440,7 +1440,7 @@ namespace cscdqm {
14401440
mo->Fill(clctsDatas.size());
14411441
int nCLCT = (int)mo->GetBinContent((int)(clctsDatas.size() + 1));
14421442
if (getCSCHisto(h::CSC_CLCT_NUMBER, crateID, dmbID, mo))
1443-
mo->SetBinContent((int)(clctsDatas.size() + 1), (float)(nCLCT) / (float)(DMBEvents)*100.0);
1443+
mo->SetBinContent((int)(clctsDatas.size() + 1), (float)(nCLCT) / (float)(DMBEvents) * 100.0);
14441444
}
14451445

14461446
if (clctsDatas.size() == 1) {
@@ -1804,7 +1804,7 @@ namespace cscdqm {
18041804
mo->Fill(0);
18051805
int nCLCT = (int)mo->GetBinContent(1);
18061806
if (getCSCHisto(h::CSC_CLCT_NUMBER, crateID, dmbID, mo))
1807-
mo->SetBinContent(1, (float)(nCLCT) / (float)(DMBEvents)*100.0);
1807+
mo->SetBinContent(1, (float)(nCLCT) / (float)(DMBEvents) * 100.0);
18081808
}
18091809
if ((tmb_dav > 0) && (getCSCHisto(h::CSC_DMB_FEB_UNPACKED_VS_DAV, crateID, dmbID, mo))) {
18101810
mo->Fill(1.0, 1.0);
@@ -1886,7 +1886,7 @@ namespace cscdqm {
18861886
config->setChamberCounterValue(CFEB_TRIGGERS, crateID, dmbID, CFEBEvent);
18871887
if (getCSCHisto(h::CSC_CSC_EFFICIENCY, crateID, dmbID, mo)) {
18881888
if (config->getNEvents() > 0) {
1889-
mo->SetBinContent(3, ((float)CFEBEvent / (float)(DMBEvents)*100.0));
1889+
mo->SetBinContent(3, ((float)CFEBEvent / (float)(DMBEvents) * 100.0));
18901890
mo->SetEntries((int)DMBEvents);
18911891
}
18921892
}

DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processExaminer.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ namespace cscdqm {
184184
mo->Fill(i);
185185
}
186186
float cfeb_entries = mo->GetBinContent(i + 1);
187-
mof->SetBinContent(i + 1, ((float)cfeb_entries / (float)(DMBEvents)*100.0));
187+
mof->SetBinContent(i + 1, ((float)cfeb_entries / (float)(DMBEvents) * 100.0));
188188
}
189189
mof->SetEntries((int)DMBEvents);
190190
}
@@ -193,7 +193,7 @@ namespace cscdqm {
193193
getCSCHisto(h::CSC_ACTUAL_DMB_CFEB_DAV_MULTIPLICITY_FREQUENCY, crateID, dmbSlot, mof)) {
194194
for (unsigned short i = 1; i < 7; i++) {
195195
float cfeb_entries = mo->GetBinContent(i);
196-
mof->SetBinContent(i, ((float)cfeb_entries / (float)(DMBEvents)*100.0));
196+
mof->SetBinContent(i, ((float)cfeb_entries / (float)(DMBEvents) * 100.0));
197197
}
198198
mof->SetEntries((int)DMBEvents);
199199

@@ -219,7 +219,7 @@ namespace cscdqm {
219219
if (getCSCHisto(h::CSC_ACTUAL_DMB_FEB_DAV_FREQUENCY, crateID, dmbSlot, mo1)) {
220220
for (int i = 1; i < 4; i++) {
221221
float dav_num = mo->GetBinContent(i);
222-
mo1->SetBinContent(i, ((float)dav_num / (float)(DMBEvents)*100.0));
222+
mo1->SetBinContent(i, ((float)dav_num / (float)(DMBEvents) * 100.0));
223223
}
224224
mo1->SetEntries((int)DMBEvents);
225225

@@ -272,7 +272,7 @@ namespace cscdqm {
272272
if (getCSCHisto(h::CSC_ACTUAL_DMB_FEB_COMBINATIONS_DAV_FREQUENCY, crateID, dmbSlot, mo1)) {
273273
for (int i = 1; i < 9; i++) {
274274
float feb_combination_dav_number = mo->GetBinContent(i);
275-
mo1->SetBinContent(i, ((float)feb_combination_dav_number / (float)(DMBEvents)*100.0));
275+
mo1->SetBinContent(i, ((float)feb_combination_dav_number / (float)(DMBEvents) * 100.0));
276276
}
277277
mo1->SetEntries(DMBEvents);
278278

DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class CTPPSDiamondDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<
114114
MonitorElement* trackCorrelation = nullptr;
115115
MonitorElement* trackCorrelationLowMultiplicity = nullptr;
116116
MonitorElement* digiSentPercentage = nullptr;
117-
SectorPlots(){};
117+
SectorPlots() {}
118118
SectorPlots(DQMStore::IBooker& ibooker, unsigned int id, bool plotOnline);
119119
};
120120
/// plots related to one Diamond detector package

DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,8 @@ void CTPPSPixelDQMSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run co
650650
} // end of for(int p=0; p<NplaneMAX;..
651651

652652
} // end for(int rp=0; rp<NRPotsMAX;...
653-
} // end of for(int stn=0; stn<
654-
} // end of for(int arm=0; arm<2;...
653+
} // end of for(int stn=0; stn<
654+
} // end of for(int arm=0; arm<2;...
655655

656656
return;
657657
}
@@ -854,8 +854,8 @@ void CTPPSPixelDQMSource::analyze(edm::Event const &event, edm::EventSetup const
854854
} // end if(RPindexValid[index]) {
855855
}
856856
} // end if(StationStatus[station]) {
857-
} // end for(const auto &ds_digi : *pixDigi)
858-
} // if(pixDigi.isValid()) {
857+
} // end for(const auto &ds_digi : *pixDigi)
858+
} // if(pixDigi.isValid()) {
859859

860860
if (pixError.isValid()) {
861861
std::map<CTPPSPixelFramePosition, CTPPSPixelROCInfo> rocMapping = mapping->ROCMapping;
@@ -1240,8 +1240,8 @@ void CTPPSPixelDQMSource::analyze(edm::Event const &event, edm::EventSetup const
12401240
} // end if(RPindexValid[index]) {
12411241
}
12421242
} // end if(StationStatus[station]) {
1243-
} // end for(const auto &ds_error : *pixDigi)
1244-
} // if(pixError.isValid())
1243+
} // end for(const auto &ds_error : *pixDigi)
1244+
} // if(pixError.isValid())
12451245

12461246
if (pixClus.isValid() && onlinePlots)
12471247
for (const auto &ds : *pixClus) {

DQM/CTPPS/plugins/CTPPSRandomDQMSource.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ void CTPPSRandomDQMSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run c
147147
h2HitsVsBXRandoms_[indexP]->getTH2F()->SetOption("colz");
148148

149149
} // end for(int rp=0; rp<kNRPotsMAX_;...
150-
} // end of for(int stn=0; stn<
151-
} // end of for(int arm=0; arm<2;...
150+
} // end of for(int stn=0; stn<
151+
} // end of for(int arm=0; arm<2;...
152152

153153
return;
154154
}
@@ -183,8 +183,8 @@ void CTPPSRandomDQMSource::analyze(edm::Event const &event, edm::EventSetup cons
183183
}
184184
}
185185
} // end for (int rp=0; rp<kNRPotsMAX_; rp++) {
186-
} // end for (int stn = 0; stn < kNStationMAX_; stn++) {
187-
} // end for (int arm=0; arm<2; arm++) {
186+
} // end for (int stn = 0; stn < kNStationMAX_; stn++) {
187+
} // end for (int arm=0; arm<2; arm++) {
188188
}
189189

190190
//---------------------------------------------------------------------------

DQM/CTPPS/plugins/DiamondSampicCalibrationDQMSource.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class DiamondSampicCalibrationDQMSource : public DQMOneEDAnalyzer<> {
9090
MonitorElement *hitDistribution2d = nullptr;
9191
MonitorElement *recHitTime = nullptr;
9292

93-
PotPlots(){};
93+
PotPlots() {}
9494
PotPlots(DQMStore::IBooker &ibooker, unsigned int id);
9595
};
9696

DQM/CTPPS/plugins/DiamondSampicDQMSource.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class DiamondSampicDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache
106106
MonitorElement *trackCorrelation = nullptr;
107107
MonitorElement *trackCorrelationLowMultiplicity = nullptr;
108108
MonitorElement *digiSentPercentage = nullptr;
109-
SectorPlots(){};
109+
SectorPlots() {}
110110
SectorPlots(DQMStore::IBooker &ibooker, unsigned int id, bool plotOnline);
111111
};
112112
std::unordered_map<unsigned int, SectorPlots> sectorPlots_;
@@ -146,7 +146,7 @@ class DiamondSampicDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache
146146
std::set<unsigned int> planesWithDigisSet;
147147
std::set<unsigned int> planesWithTimeSet;
148148

149-
PotPlots(){};
149+
PotPlots() {}
150150
PotPlots(DQMStore::IBooker &ibooker, unsigned int id, bool plotOnline);
151151
};
152152

DQM/CTPPS/plugins/TotemTimingDQMSource.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class TotemTimingDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<t
158158
std::set<unsigned int> planesWithDigisSet;
159159
std::set<unsigned int> planesWithTimeSet;
160160

161-
PotPlots(){};
161+
PotPlots() {}
162162
PotPlots(DQMStore::IBooker &ibooker, unsigned int id);
163163
};
164164

0 commit comments

Comments
 (0)