Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GEOMETRY-UPGRADE] Changes suggested by new llvm18 clang-format #45900

Merged
merged 1 commit into from
Sep 6, 2024
Merged

[GEOMETRY-UPGRADE] Changes suggested by new llvm18 clang-format #45900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/interface/HGCalParameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class HGCalParameters {
public:
struct waferInfo {
int32_t type, part, orient, cassette;
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){};
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) {}
};
struct tileInfo {
int32_t type, sipm, cassette, hex[6];
Expand Down
6 changes: 3 additions & 3 deletions Geometry/HGCalCommonData/test/HGCalConvert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@

struct wafer {
int thick, partial, orient, cassette;
wafer(int t = 0, int p = 0, int o = 0, int c = 0) : thick(t), partial(p), orient(o), cassette(c){};
wafer(int t = 0, int p = 0, int o = 0, int c = 0) : thick(t), partial(p), orient(o), cassette(c) {}
};

struct layerInfo {
int layer, type;
std::vector<double> deltaR;
layerInfo(int ly, int ty, std::vector<double> dR) : layer(ly), type(ty), deltaR(dR){};
layerInfo(int ly, int ty, std::vector<double> dR) : layer(ly), type(ty), deltaR(dR) {}
};

struct tile {
Expand All @@ -108,7 +108,7 @@ struct tile {

struct tileZone {
tileZone(int l0 = 0, int r0 = 0, int r1 = 0, int f0 = 0, int f1 = 0, int c0 = 0)
: layer(l0), rmin(r0), rmax(r1), phimin(f0), phimax(f1), cassette(c0){};
: layer(l0), rmin(r0), rmax(r1), phimin(f0), phimax(f1), cassette(c0) {}
int layer, rmin, rmax, phimin, phimax, cassette;
};

Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalGeometry/test/HGCalValidScintTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class HGCalValidScintTest : public edm::one::EDAnalyzer<> {
int ringMin, ringMax;
double rMin, rMax;
layerInfo(int minR = 100, double rMn = 0, int maxR = 0, double rMx = 0)
: ringMin(minR), ringMax(maxR), rMin(rMn), rMax(rMx){};
: ringMin(minR), ringMax(maxR), rMin(rMn), rMax(rMx) {}
};
};

Expand Down
16 changes: 8 additions & 8 deletions SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ void Phase2PixelNtuple::analyze(const edm::Event& e, const edm::EventSetup& es)
closest_simhit = &m;
}
} // end of simhit loop
} // end matched emtpy
} // end matched emtpy
unsigned int subid = detId.subdetId();
int detid_db = detId.rawId();
int layer_num = -99, ladder_num = -99, module_num = -99, disk_num = -99, blade_num = -99, panel_num = -99,
Expand Down Expand Up @@ -444,8 +444,8 @@ void Phase2PixelNtuple::analyze(const edm::Event& e, const edm::EventSetup& es)
pixeltree_->Fill();
}
} // end of rechit loop
} // end of detid loop
} // end of loop test on recHitColl size
} // end of detid loop
} // end of loop test on recHitColl size

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

int num_simhit = matched.size();

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

// Function for filling in all the rechits
Expand Down
24 changes: 12 additions & 12 deletions SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
} // end of simhit loop
closest_simhit = closestit;
} // end matched emtpy
/////comment out begin
/*
/////comment out begin
/*
unsigned int subdetId = detId.subdetId();
int layerNumber=0;
int ringNumber = 0;
Expand Down Expand Up @@ -310,7 +310,7 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
<< geomDet->surface().toGlobal(iterRecHit->localPosition()).z() << " "
<< geomDet->surface().toGlobal(iterRecHit->localPosition()).perp() << std::endl;
*/
//comment out end
//comment out end
unsigned int subid = detId.subdetId();
int layer_num = 0;
if ((subid == 1) || (subid == 2)) {
Expand Down Expand Up @@ -342,8 +342,8 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
*/
}
} // end of rechit loop
} // end of detid loop
} // end of loop test on recHitColl size
} // end of detid loop
} // end of loop test on recHitColl size

// Now loop over recotracks

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

// now for strip rechits
edm::Handle<SiStripRecHit2DCollection> rechitsrphi;
Expand Down Expand Up @@ -538,8 +538,8 @@ void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
striptree_->Fill();
init();
} // end of rechit loop
} // end of detid loop
} // end of loop test on rechit size
} // end of detid loop
} // end of loop test on rechit size

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

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

} // end analyze function

Expand Down