Skip to content

Commit 518a453

Browse files
authored
Merge pull request #45923 from smuzaffar/dqm-reconstruction-llvm18-clang-format
[DQM-RECONSTRUCTION] Changes suggested by new llvm18 clang-format
2 parents 3334981 + 8ff4504 commit 518a453

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

CommonTools/TrackerMap/interface/TrackerMap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ class TrackerMap {
377377
int xoffset = XPSUOFFSET;
378378
int yoffset = YPSUOFFSET;
379379
xmin = 0;
380-
xmax = (NUMPSUCRATE_INCOLUMN)*1.5;
380+
xmax = (NUMPSUCRATE_INCOLUMN) * 1.5;
381381
ymin = 0;
382382
ymax = NUMPSUCH_INROW;
383383

CommonTools/TrackerMap/src/TrackerMap.cc

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -728,14 +728,13 @@ void TrackerMap::drawModule(TmModule *mod, int key, int mlay, bool print_total,
728728
nams.erase(found, 1);
729729
found = nams.find(" ", found);
730730
}
731-
std::replace_if(
732-
nams.begin(), nams.end(), [](char c) { return c == ' '; }, '_');
731+
std::replace_if(nams.begin(), nams.end(), [](char c) { return c == ' '; }, '_');
733732

734733
if (mod->red < 0) { //use count to compute color
735734
int color = getcolor(mod->value, palette);
736735
red = (color >> 16) & 0xFF;
737736
green = (color >> 8) & 0xFF;
738-
blue = (color)&0xFF;
737+
blue = (color) & 0xFF;
739738

740739
if (!print_total)
741740
mod->value = mod->value * mod->count; //restore mod->value
@@ -1289,7 +1288,7 @@ void TrackerMap::drawApvPair(
12891288
color = getcolor(apvPair->value, palette);
12901289
red = (color >> 16) & 0xFF;
12911290
green = (color >> 8) & 0xFF;
1292-
blue = (color)&0xFF;
1291+
blue = (color) & 0xFF;
12931292
if (!print_total)
12941293
apvPair->value = apvPair->value * apvPair->count; //restore mod->value
12951294
if (temporary_file)
@@ -1344,7 +1343,7 @@ void TrackerMap::drawApvPair(
13441343
color = getcolor(apvPair->mod->value, palette);
13451344
red = (color >> 16) & 0xFF;
13461345
green = (color >> 8) & 0xFF;
1347-
blue = (color)&0xFF;
1346+
blue = (color) & 0xFF;
13481347
if (temporary_file)
13491348
*svgfile << nams << " " << vals << " " << red << " " << green << " " << blue << " ";
13501349
else
@@ -1453,7 +1452,7 @@ void TrackerMap::drawCcu(
14531452
color = getcolor(ccu->value, palette);
14541453
red = (color >> 16) & 0xFF;
14551454
green = (color >> 8) & 0xFF;
1456-
blue = (color)&0xFF;
1455+
blue = (color) & 0xFF;
14571456
if (!print_total)
14581457
ccu->value = ccu->value * ccu->count; //restore mod->value
14591458
if (temporary_file)
@@ -1564,7 +1563,7 @@ void TrackerMap::drawPsu(
15641563
color = getcolor(psu->value, palette);
15651564
red = (color >> 16) & 0xFF;
15661565
green = (color >> 8) & 0xFF;
1567-
blue = (color)&0xFF;
1566+
blue = (color) & 0xFF;
15681567
if (!print_total)
15691568
psu->value = psu->value * psu->count; //restore mod->value
15701569
if (temporary_file)
@@ -1668,7 +1667,7 @@ void TrackerMap::drawHV2(
16681667
color = getcolor(psu->valueHV2, palette);
16691668
redHV2 = (color >> 16) & 0xFF;
16701669
greenHV2 = (color >> 8) & 0xFF;
1671-
blueHV2 = (color)&0xFF;
1670+
blueHV2 = (color) & 0xFF;
16721671
if (!print_total)
16731672
psu->valueHV2 = psu->valueHV2 * psu->countHV2; //restore mod->value
16741673
if (temporary_file)
@@ -1771,7 +1770,7 @@ void TrackerMap::drawHV3(
17711770
color = getcolor(psu->valueHV3, palette);
17721771
redHV3 = (color >> 16) & 0xFF;
17731772
greenHV3 = (color >> 8) & 0xFF;
1774-
blueHV3 = (color)&0xFF;
1773+
blueHV3 = (color) & 0xFF;
17751774
if (!print_total)
17761775
psu->valueHV3 = psu->valueHV3 * psu->countHV3; //restore mod->value
17771776
if (temporary_file)
@@ -2119,7 +2118,7 @@ void TrackerMap::save_as_fectrackermap(
21192118
}
21202119

21212120
} //if(temporary_file)
2122-
} //if(enabledFecProcessing)
2121+
} //if(enabledFecProcessing)
21232122
}
21242123
void TrackerMap::save_as_HVtrackermap(
21252124
bool print_total, float minval, float maxval, std::string s, int width, int height) {
@@ -2441,7 +2440,7 @@ void TrackerMap::save_as_HVtrackermap(
24412440
}
24422441

24432442
} //if(temporary_file)
2444-
} //if(enabledHVProcessing)
2443+
} //if(enabledHVProcessing)
24452444
}
24462445

24472446
void TrackerMap::save_as_psutrackermap(
@@ -2749,7 +2748,7 @@ void TrackerMap::save_as_psutrackermap(
27492748
}
27502749

27512750
} //if(temporary_file)
2752-
} //if(enabledFedProcessing)
2751+
} //if(enabledFedProcessing)
27532752
}
27542753

27552754
void TrackerMap::save_as_fedtrackermap(
@@ -3056,7 +3055,7 @@ void TrackerMap::save_as_fedtrackermap(
30563055
}
30573056

30583057
} //if(temporary_file)
3059-
} //if(enabledFedProcessing)
3058+
} //if(enabledFedProcessing)
30603059
}
30613060

30623061
void TrackerMap::load(std::string inputfilename) {
@@ -3180,7 +3179,7 @@ void TrackerMap::drawPalette(std::ofstream *svgfile, int xoffset, int yoffset) {
31803179
color = getcolor(val, palette);
31813180
red = (color >> 16) & 0xFF;
31823181
green = (color >> 8) & 0xFF;
3183-
blue = (color)&0xFF;
3182+
blue = (color) & 0xFF;
31843183
// if(!temporary_file)*svgfile <<"<svg:rect x=\"3010\" y=\""<<(1550-6*i)<<"\" width=\"50\" height=\"6\" fill=\"rgb("<<red<<","<<green<<","<<blue<<")\" />\n";
31853184
// else *svgfile << red << " " << green << " " << blue << " 4 " << (6*i)+40 << " 3010. " <<//
31863185
// (6*i)+40 << " 3060. " <<//
@@ -3775,8 +3774,8 @@ void TrackerMap::printonline() {
37753774

37763775
*txtfile << "</pre><h4>" << outs.str() << "</h4>" << std::endl;
37773776
} //ifccu->nmod==0
3778-
} //if ccu!=0
3779-
} //for i_ccu
3777+
} //if ccu!=0
3778+
} //for i_ccu
37803779
*txtfile << "</body></html>" << std::endl;
37813780
txtfile->close();
37823781
delete txtfile;
@@ -4158,8 +4157,8 @@ void TrackerMap::printall(bool print_total, float minval1, float maxval1, std::s
41584157

41594158
*txtfile << "</pre><h4>" << outs.str() << "</h4>" << std::endl;
41604159
} //ifccu->nmod==0
4161-
} //if ccu!=0
4162-
} //for i_ccu
4160+
} //if ccu!=0
4161+
} //for i_ccu
41634162
*txtfile << "</body></html>" << std::endl;
41644163
txtfile->close();
41654164
} //for int crate

0 commit comments

Comments
 (0)