Skip to content

Commit fdc316d

Browse files
cmsbuildcmsbuild
authored
Merge pull request #45900 from smuzaffar/geometry-upgrade-llvm18-clang-format
[GEOMETRY-UPGRADE] Changes suggested by new llvm18 clang-format
2 parents ad09748 + 65d05a6 commit fdc316d

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎Geometry/HGCalCommonData/interface/HGCalParameters.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class HGCalParameters {
1616
public:
1717
struct waferInfo {
1818
int32_t type, part, orient, cassette;
19-
waferInfo(int32_t t = 0, int32_t p = 0, int32_t o = 0, int32_t c = 0) : type(t), part(p), orient(o), cassette(c){};
19+
waferInfo(int32_t t = 0, int32_t p = 0, int32_t o = 0, int32_t c = 0) : type(t), part(p), orient(o), cassette(c) {}
2020
};
2121
struct tileInfo {
2222
int32_t type, sipm, cassette, hex[6];

‎Geometry/HGCalCommonData/test/HGCalConvert.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@
8383

8484
struct wafer {
8585
int thick, partial, orient, cassette;
86-
wafer(int t = 0, int p = 0, int o = 0, int c = 0) : thick(t), partial(p), orient(o), cassette(c){};
86+
wafer(int t = 0, int p = 0, int o = 0, int c = 0) : thick(t), partial(p), orient(o), cassette(c) {}
8787
};
8888

8989
struct layerInfo {
9090
int layer, type;
9191
std::vector<double> deltaR;
92-
layerInfo(int ly, int ty, std::vector<double> dR) : layer(ly), type(ty), deltaR(dR){};
92+
layerInfo(int ly, int ty, std::vector<double> dR) : layer(ly), type(ty), deltaR(dR) {}
9393
};
9494

9595
struct tile {
@@ -108,7 +108,7 @@ struct tile {
108108

109109
struct tileZone {
110110
tileZone(int l0 = 0, int r0 = 0, int r1 = 0, int f0 = 0, int f1 = 0, int c0 = 0)
111-
: layer(l0), rmin(r0), rmax(r1), phimin(f0), phimax(f1), cassette(c0){};
111+
: layer(l0), rmin(r0), rmax(r1), phimin(f0), phimax(f1), cassette(c0) {}
112112
int layer, rmin, rmax, phimin, phimax, cassette;
113113
};
114114

‎Geometry/HGCalGeometry/test/HGCalValidScintTest.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class HGCalValidScintTest : public edm::one::EDAnalyzer<> {
3434
int ringMin, ringMax;
3535
double rMin, rMax;
3636
layerInfo(int minR = 100, double rMn = 0, int maxR = 0, double rMx = 0)
37-
: ringMin(minR), ringMax(maxR), rMin(rMn), rMax(rMx){};
37+
: ringMin(minR), ringMax(maxR), rMin(rMn), rMax(rMx) {}
3838
};
3939
};
4040

‎SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ void Phase2PixelNtuple::analyze(const edm::Event& e, const edm::EventSetup& es)
403403
closest_simhit = &m;
404404
}
405405
} // end of simhit loop
406-
} // end matched emtpy
406+
} // end matched emtpy
407407
unsigned int subid = detId.subdetId();
408408
int detid_db = detId.rawId();
409409
int layer_num = -99, ladder_num = -99, module_num = -99, disk_num = -99, blade_num = -99, panel_num = -99,
@@ -444,8 +444,8 @@ void Phase2PixelNtuple::analyze(const edm::Event& e, const edm::EventSetup& es)
444444
pixeltree_->Fill();
445445
}
446446
} // end of rechit loop
447-
} // end of detid loop
448-
} // end of loop test on recHitColl size
447+
} // end of detid loop
448+
} // end of loop test on recHitColl size
449449

450450
// Now loop over recotracks
451451
edm::Handle<View<reco::Track>> trackCollection;
@@ -538,7 +538,7 @@ void Phase2PixelNtuple::analyze(const edm::Event& e, const edm::EventSetup& es)
538538
closest_simhit = &m;
539539
}
540540
} // end of simhit loop
541-
} // end matched emtpy
541+
} // end matched emtpy
542542

543543
int num_simhit = matched.size();
544544

@@ -584,10 +584,10 @@ void Phase2PixelNtuple::analyze(const edm::Event& e, const edm::EventSetup& es)
584584
tsos);
585585
pixeltreeOnTrack_->Fill();
586586
} // if ( (subid==1)||(subid==2) )
587-
} // if cast is possible to SiPixelHit
588-
} //end of loop on tracking rechits
589-
} // end of loop on recotracks
590-
} // else track collection is valid
587+
} // if cast is possible to SiPixelHit
588+
} //end of loop on tracking rechits
589+
} // end of loop on recotracks
590+
} // else track collection is valid
591591
} // end analyze function
592592

593593
// Function for filling in all the rechits

‎SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
259259
} // end of simhit loop
260260
closest_simhit = closestit;
261261
} // end matched emtpy
262-
/////comment out begin
263-
/*
262+
/////comment out begin
263+
/*
264264
unsigned int subdetId = detId.subdetId();
265265
int layerNumber=0;
266266
int ringNumber = 0;
@@ -310,7 +310,7 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
310310
<< geomDet->surface().toGlobal(iterRecHit->localPosition()).z() << " "
311311
<< geomDet->surface().toGlobal(iterRecHit->localPosition()).perp() << std::endl;
312312
*/
313-
//comment out end
313+
//comment out end
314314
unsigned int subid = detId.subdetId();
315315
int layer_num = 0;
316316
if ((subid == 1) || (subid == 2)) {
@@ -342,8 +342,8 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
342342
*/
343343
}
344344
} // end of rechit loop
345-
} // end of detid loop
346-
} // end of loop test on recHitColl size
345+
} // end of detid loop
346+
} // end of loop test on recHitColl size
347347

348348
// Now loop over recotracks
349349

@@ -440,7 +440,7 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
440440
}
441441
delete hit;
442442
} //end of loop on tracking rechits
443-
} // end of loop on recotracks
443+
} // end of loop on recotracks
444444

445445
// now for strip rechits
446446
edm::Handle<SiStripRecHit2DCollection> rechitsrphi;
@@ -538,8 +538,8 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
538538
striptree_->Fill();
539539
init();
540540
} // end of rechit loop
541-
} // end of detid loop
542-
} // end of loop test on rechit size
541+
} // end of detid loop
542+
} // end of loop test on rechit size
543543

544544
// now stereo hits
545545
if (rechitsstereo.product()->dataSize() > 0) {
@@ -627,8 +627,8 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
627627
striptree_->Fill();
628628
init();
629629
} // end of rechit loop
630-
} // end of detid loop
631-
} // end of loop test on rechit size
630+
} // end of detid loop
631+
} // end of loop test on rechit size
632632

633633
// now matched hits
634634
if (rechitsmatched.product()->dataSize() > 0) {
@@ -715,8 +715,8 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
715715
striptree_->Fill();
716716
init();
717717
} // end of rechit loop
718-
} // end of detidt loop
719-
} // end of loop test on rechit size
718+
} // end of detidt loop
719+
} // end of loop test on rechit size
720720

721721
} // end analyze function
722722

0 commit comments

Comments
 (0)