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

Jump to bottom

[L1-UPGRADE] Changes suggested by new llvm18 clang-format #45907

Merged
merged 1 commit into from
Sep 6, 2024
+128 −128
Merged

[L1-UPGRADE] Changes suggested by new llvm18 clang-format #45907

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
6 changes: 3 additions & 3 deletions DataFormats/L1TCalorimeterPhase2/interface/CaloCrystalCluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace l1tp2 {
photonWP80_(0.),
electronWP90_(0.),
looseL1TkMatchWP_(0.),
stage2effMatch_(0.){};
stage2effMatch_(0.) {}

CaloCrystalCluster(const PolarLorentzVector &p4,
float calibratedPt,
Expand Down Expand Up @@ -64,9 +64,9 @@ namespace l1tp2 {
photonWP80_(photonWP80),
electronWP90_(electronWP90),
looseL1TkMatchWP_(looseL1TkMatchWP),
stage2effMatch_(stage2effMatch){};
stage2effMatch_(stage2effMatch) {}

~CaloCrystalCluster() override{};
~CaloCrystalCluster() override {}
inline float calibratedPt() const { return calibratedPt_; };
inline float hovere() const { return hovere_; };
inline float isolation() const { return iso_; };
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/L1TCalorimeterPhase2/interface/CaloJet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace l1tp2 {

class CaloJet : public l1t::L1Candidate {
public:
CaloJet() : l1t::L1Candidate(), calibratedPt_(0.), hovere_(0.), iso_(0.), puCorrPt_(0.){};
CaloJet() : l1t::L1Candidate(), calibratedPt_(0.), hovere_(0.), iso_(0.), puCorrPt_(0.) {}

CaloJet(const PolarLorentzVector& p4, float calibratedPt, float hovere, float iso, float puCorrPt = 0.)
: l1t::L1Candidate(p4), calibratedPt_(calibratedPt), hovere_(hovere), iso_(iso), puCorrPt_(puCorrPt){};
: l1t::L1Candidate(p4), calibratedPt_(calibratedPt), hovere_(hovere), iso_(iso), puCorrPt_(puCorrPt) {}

inline float calibratedPt() const { return calibratedPt_; };
inline float hovere() const { return hovere_; };
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/L1TCalorimeterPhase2/interface/CaloPFCluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace l1tp2 {
clusterIEta_(-99),
clusterIPhi_(-99),
clusterEta_(-99.),
clusterPhi_(-99.){};
clusterPhi_(-99.) {}

CaloPFCluster(const PolarLorentzVector& p4,
float clusterEt,
Expand All @@ -30,7 +30,7 @@ namespace l1tp2 {
clusterIEta_(clusterIEta),
clusterIPhi_(clusterIPhi),
clusterEta_(clusterEta),
clusterPhi_(clusterPhi){};
clusterPhi_(clusterPhi) {}

inline float clusterEt() const { return clusterEt_; };
inline int clusterIEta() const { return clusterIEta_; };
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/L1TCalorimeterPhase2/interface/CaloTower.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace l1tp2 {
l1egTrkIso_(0),
l1egStandaloneSS_(0),
l1egStandaloneIso_(0),
isBarrel_(false){};
isBarrel_(false) {}

public:
inline float ecalTowerEt() const { return ecalTowerEt_; };
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/L1TCalorimeterPhase2/interface/Phase2L1CaloJet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace l1tp2 {
towerIEta_(-99),
towerIPhi_(-99),
towerEta_(-99.),
towerPhi_(-99.){};
towerPhi_(-99.) {}

Phase2L1CaloJet(const PolarLorentzVector& p4,
float jetEt,
Expand All @@ -49,7 +49,7 @@ namespace l1tp2 {
towerIEta_(towerIEta),
towerIPhi_(towerIPhi),
towerEta_(towerEta),
towerPhi_(towerPhi){};
towerPhi_(towerPhi) {}

inline float jetEt() const { return jetEt_; };
inline float tauEt() const { return tauEt_; };
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/L1TCorrelator/interface/TkTriplet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace l1t {
double pair_dz_min,
std::vector<edm::Ptr<L1TTTrackType>> trkPtrList);

~TkTriplet() override{};
~TkTriplet() override {}

int getTripletCharge() const { return charge_; }
double getPairMassMax() const { return pair_mass_max_; }
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/L1THGCal/interface/HGCalClusterT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace l1t {
addConstituent(c, true, fraction);
}

~HGCalClusterT() override{};
~HGCalClusterT() override {}

const std::unordered_map<uint32_t, edm::Ptr<C>>& constituents() const { return constituents_; }
const_iterator constituents_begin() const { return constituents_.begin(); }
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/L1TrackTrigger/interface/TTStub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class TTStub {
bool thePSModule;

static constexpr float dummyBend = 999999; // Dumy value should be away from potential bends
}; /// Close class
}; /// Close class

/*! \brief Implementation of methods
* \details Here, in the header file, the methods which do not depend
Expand Down
8 changes: 4 additions & 4 deletions L1Trigger/DTTriggerPhase2/interface/MPCleanHitsFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ class MPCleanHitsFilter : public MPFilter {
~MPCleanHitsFilter() override = default;

// Main methods
void initialise(const edm::EventSetup& iEventSetup) override{};
void initialise(const edm::EventSetup& iEventSetup) override {}
void run(edm::Event& iEvent,
const edm::EventSetup& iEventSetup,
std::vector<cmsdt::metaPrimitive>& inMPath,
std::vector<cmsdt::metaPrimitive>& outMPath) override{};
std::vector<cmsdt::metaPrimitive>& outMPath) override {};
void run(edm::Event& iEvent,
const edm::EventSetup& iEventSetup,
std::vector<cmsdt::metaPrimitive>& inSLMPath,
std::vector<cmsdt::metaPrimitive>& inCorMPath,
std::vector<cmsdt::metaPrimitive>& outMPath) override{};
std::vector<cmsdt::metaPrimitive>& outMPath) override {};
void run(edm::Event& iEvent,
const edm::EventSetup& iEventSetup,
MuonPathPtrs& inMPath,
MuonPathPtrs& outMPath) override;

void finish() override{};
void finish() override {}

// Other public methods
void removeOutliers(MuonPathPtr& mpath);
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/DTTriggerPhase2/interface/MPCoincidenceFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MPCoincidenceFilter : public MPFilter {
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inMPath,
std::vector<cmsdt::metaPrimitive> &outMPath) override{};
std::vector<cmsdt::metaPrimitive> &outMPath) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &allMPaths,
Expand All @@ -34,7 +34,7 @@ class MPCoincidenceFilter : public MPFilter {
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMPath,
MuonPathPtrs &outMPath) override{};
MuonPathPtrs &outMPath) override {};

void finish() override;

Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/DTTriggerPhase2/interface/MPCorFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class MPCorFilter : public MPFilter {
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inMPath,
std::vector<cmsdt::metaPrimitive> &outMPath) override{};
std::vector<cmsdt::metaPrimitive> &outMPath) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inSLMPath,
Expand All @@ -48,7 +48,7 @@ class MPCorFilter : public MPFilter {
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMPath,
MuonPathPtrs &outMPath) override{};
MuonPathPtrs &outMPath) override {};

void finish() override;

Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/DTTriggerPhase2/interface/MPQualityEnhancerFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ class MPQualityEnhancerFilter : public MPFilter {
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inSLMPath,
std::vector<cmsdt::metaPrimitive> &inCorMPath,
std::vector<cmsdt::metaPrimitive> &outMPath) override{};
std::vector<cmsdt::metaPrimitive> &outMPath) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMPath,
MuonPathPtrs &outMPath) override{};
MuonPathPtrs &outMPath) override {};

void finish() override;

Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/DTTriggerPhase2/interface/MPQualityEnhancerFilterBayes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ class MPQualityEnhancerFilterBayes : public MPFilter {
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inSLMPath,
std::vector<cmsdt::metaPrimitive> &inCorMPath,
std::vector<cmsdt::metaPrimitive> &outMPath) override{};
std::vector<cmsdt::metaPrimitive> &outMPath) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMPath,
MuonPathPtrs &outMPath) override{};
MuonPathPtrs &outMPath) override {};

void finish() override;

Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/DTTriggerPhase2/interface/MPRedundantFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class MPRedundantFilter : public MPFilter {
void run(edm::Event& iEvent,
const edm::EventSetup& iEventSetup,
std::vector<cmsdt::metaPrimitive>& inMPath,
std::vector<cmsdt::metaPrimitive>& outMPath) override{};
std::vector<cmsdt::metaPrimitive>& outMPath) override {};
void run(edm::Event& iEvent,
const edm::EventSetup& iEventSetup,
std::vector<cmsdt::metaPrimitive>& inSLMPath,
std::vector<cmsdt::metaPrimitive>& inCorMPath,
std::vector<cmsdt::metaPrimitive>& outMPath) override{};
std::vector<cmsdt::metaPrimitive>& outMPath) override {};
void run(edm::Event& iEvent,
const edm::EventSetup& iEventSetup,
MuonPathPtrs& inMPath,
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/DTTriggerPhase2/interface/MPSLFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ class MPSLFilter : public MPFilter {
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inSLMPath,
std::vector<cmsdt::metaPrimitive> &inCorMPath,
std::vector<cmsdt::metaPrimitive> &outMPath) override{};
std::vector<cmsdt::metaPrimitive> &outMPath) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMPath,
MuonPathPtrs &outMPath) override{};
MuonPathPtrs &outMPath) override {};

void finish() override;

Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/DTTriggerPhase2/interface/MuonPathAnalyticAnalyzer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ class MuonPathAnalyticAnalyzer : public MuonPathAnalyzer {
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
std::vector<lat_vector> &lateralities,
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override{};
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inMPaths,
std::vector<cmsdt::metaPrimitive> &outMPaths) override{};
std::vector<cmsdt::metaPrimitive> &outMPaths) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
MuonPathPtrs &outMPath) override{};
MuonPathPtrs &outMPath) override {};

void finish() override;

Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/DTTriggerPhase2/interface/MuonPathAnalyzerInChamber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ class MuonPathAnalyzerInChamber : public MuonPathAnalyzer {
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override{};
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
std::vector<lat_vector> &lateralities,
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override{};
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inMPaths,
std::vector<cmsdt::metaPrimitive> &outMPaths) override{};
std::vector<cmsdt::metaPrimitive> &outMPaths) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/DTTriggerPhase2/interface/MuonPathCorFitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@ class MuonPathCorFitter : public MuonPathFitter {
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override{};
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
std::vector<lat_vector> &lateralities,
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override{};
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inMPaths,
std::vector<cmsdt::metaPrimitive> &outMPaths) override;
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
MuonPathPtrs &outMPath) override{};
MuonPathPtrs &outMPath) override {};

void finish() override;

Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/DTTriggerPhase2/interface/MuonPathSLFitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class MuonPathSLFitter : public MuonPathFitter {
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override{};
std::vector<cmsdt::metaPrimitive> &metaPrimitives) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
Expand All @@ -33,11 +33,11 @@ class MuonPathSLFitter : public MuonPathFitter {
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
std::vector<cmsdt::metaPrimitive> &inMPaths,
std::vector<cmsdt::metaPrimitive> &outMPaths) override{};
std::vector<cmsdt::metaPrimitive> &outMPaths) override {};
void run(edm::Event &iEvent,
const edm::EventSetup &iEventSetup,
MuonPathPtrs &inMpath,
MuonPathPtrs &outMPath) override{};
MuonPathPtrs &outMPath) override {};

void finish() override;

Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/DTTriggerPhase2/plugins/DTTrigPhase2Prod.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ void DTTrigPhase2Prod::assignIndexPerBX(std::vector<metaPrimitive>& inMPaths) {
}
}
} // ending second for
} // ending first for
} // ending first for
}

int DTTrigPhase2Prod::assignQualityOrder(const metaPrimitive& mP) const {
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/DTTriggerPhase2/src/LateralityProvider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ LateralityProvider::~LateralityProvider() {}
// ============================================================================
void LateralityProvider::initialise(const edm::EventSetup& iEventSetup) {}

void LateralityProvider::finish(){};
void LateralityProvider::finish() {}

void LateralityProvider::run(edm::Event& iEvent,
const edm::EventSetup& iEventSetup,
MuonPathPtrs& inMpath,
std::vector<lat_vector>& lateralities){};
std::vector<lat_vector>& lateralities) {};
4 changes: 2 additions & 2 deletions L1Trigger/DTTriggerPhase2/src/MPCoincidenceFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void MPCoincidenceFilter::run(edm::Event &iEvent,
outMPaths.push_back(mp);
}

void MPCoincidenceFilter::finish(){};
void MPCoincidenceFilter::finish() {}

///////////////////////////
/// OTHER METHODS
Expand Down Expand Up @@ -189,7 +189,7 @@ std::vector<metaPrimitive> MPCoincidenceFilter::filter(std::vector<metaPrimitive
outMPs.push_back(mp);

} // co check decision
} // input MP iterator
} // input MP iterator

return outMPs;
}
2 changes: 1 addition & 1 deletion L1Trigger/DTTriggerPhase2/src/MPCorFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void MPCorFilter::run(edm::Event &iEvent,
outMPaths.push_back(mp);
}

void MPCorFilter::finish(){};
void MPCorFilter::finish() {}

///////////////////////////
/// OTHER METHODS
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/DTTriggerPhase2/src/MPQualityEnhancerFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void MPQualityEnhancerFilter::run(edm::Event &iEvent,
buff2.clear();
}

void MPQualityEnhancerFilter::finish(){};
void MPQualityEnhancerFilter::finish() {}

///////////////////////////
/// OTHER METHODS
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/DTTriggerPhase2/src/MPQualityEnhancerFilterBayes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void MPQualityEnhancerFilterBayes::run(edm::Event &iEvent,
}
}

void MPQualityEnhancerFilterBayes::finish(){};
void MPQualityEnhancerFilterBayes::finish() {}

///////////////////////////
/// OTHER METHODS
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/DTTriggerPhase2/src/MPSLFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void MPSLFilter::run(edm::Event &iEvent,
}
}

void MPSLFilter::finish(){};
void MPSLFilter::finish() {}

///////////////////////////
/// OTHER METHODS
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/DTTriggerPhase2/src/MotherGrouping.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ void MotherGrouping::run(Event& iEvent,
const DTDigiCollection& digis,
MuonPathPtrs& mpaths) {}

void MotherGrouping::finish(){};
void MotherGrouping::finish() {}
2 changes: 1 addition & 1 deletion L1Trigger/DTTriggerPhase2/src/MuonPathAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ MuonPathAnalyzer::~MuonPathAnalyzer() {}
// ============================================================================
void MuonPathAnalyzer::initialise(const edm::EventSetup& iEventSetup) {}

void MuonPathAnalyzer::finish(){};
void MuonPathAnalyzer::finish() {}
Loading