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

[RECONSTRUCTION-UPGRADE] Changes suggested by new llvm18 clang-format #45894

Merged
merged 1 commit into from
Sep 6, 2024
Merged

[RECONSTRUCTION-UPGRADE] Changes suggested by new llvm18 clang-format #45894

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 RecoHGCal/TICL/interface/TICLInterpretationAlgoBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace ticl {
public:
TICLInterpretationAlgoBase(const edm::ParameterSet& conf, edm::ConsumesCollector)
: algo_verbosity_(conf.getParameter<int>("algo_verbosity")) {}
virtual ~TICLInterpretationAlgoBase(){};
virtual ~TICLInterpretationAlgoBase() {}
struct Inputs {
const edm::Event& ev;
const edm::EventSetup& es;
Expand Down
4 changes: 2 additions & 2 deletions RecoHGCal/TICL/interface/TracksterLinkingAlgoBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace ticl {
edm::ConsumesCollector,
cms::Ort::ONNXRuntime const* onnxRuntime = nullptr)
: algo_verbosity_(conf.getParameter<int>("algo_verbosity")), onnxRuntime_(onnxRuntime) {}
virtual ~TracksterLinkingAlgoBase(){};
virtual ~TracksterLinkingAlgoBase() {}

struct Inputs {
const edm::Event& ev;
Expand Down Expand Up @@ -74,7 +74,7 @@ namespace ticl {
const edm::ESHandle<Propagator> propH) = 0;

// To be called by TracksterLinksProducer at the start of TracksterLinksProducer::produce. Subclasses can use this to store Event and EventSetup
virtual void setEvent(edm::Event& iEvent, edm::EventSetup const& iEventSetup){};
virtual void setEvent(edm::Event& iEvent, edm::EventSetup const& iEventSetup) {}

static void fillPSetDescription(edm::ParameterSetDescription& desc) { desc.add<int>("algo_verbosity", 0); };

Expand Down
4 changes: 2 additions & 2 deletions RecoHGCal/TICL/plugins/ClusterFilterBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ namespace reco {
namespace ticl {
class ClusterFilterBase {
public:
explicit ClusterFilterBase(const edm::ParameterSet&){};
virtual ~ClusterFilterBase(){};
explicit ClusterFilterBase(const edm::ParameterSet&) {}
virtual ~ClusterFilterBase() {}

virtual void filter(const std::vector<reco::CaloCluster>& layerClusters,
std::vector<float>& layerClustersMask,
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/ClusterFilterByAlgo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace ticl {
public:
ClusterFilterByAlgo(const edm::ParameterSet& ps)
: ClusterFilterBase(ps), algo_number_(ps.getParameter<std::vector<int>>("algo_number")) {}
~ClusterFilterByAlgo() override{};
~ClusterFilterByAlgo() override {}

void filter(const std::vector<reco::CaloCluster>& layerClusters,
std::vector<float>& layerClustersMask,
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/ClusterFilterByAlgoAndSize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace ticl {
"algo_number")), // hgcal_em = 6, hgcal_had = 7, hgcal_scintillator = 8, hfnose = 9
min_cluster_size_(ps.getParameter<int>("min_cluster_size")),
max_cluster_size_(ps.getParameter<int>("max_cluster_size")) {}
~ClusterFilterByAlgoAndSize() override{};
~ClusterFilterByAlgoAndSize() override {}

void filter(const std::vector<reco::CaloCluster>& layerClusters,
std::vector<float>& layerClustersMask,
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/ClusterFilterByAlgoAndSizeAndLayerRange.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace ticl {
max_cluster_size_(ps.getParameter<int>("max_cluster_size")),
min_layerId_(ps.getParameter<int>("min_layerId")),
max_layerId_(ps.getParameter<int>("max_layerId")) {}
~ClusterFilterByAlgoAndSizeAndLayerRange() override{};
~ClusterFilterByAlgoAndSizeAndLayerRange() override {}

void filter(const std::vector<reco::CaloCluster>& layerClusters,
std::vector<float>& layerClustersMask,
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/ClusterFilterBySize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace ticl {
public:
ClusterFilterBySize(const edm::ParameterSet& ps)
: ClusterFilterBase(ps), max_cluster_size_(ps.getParameter<int>("max_cluster_size")) {}
~ClusterFilterBySize() override{};
~ClusterFilterBySize() override {}

void filter(const std::vector<reco::CaloCluster>& layerClusters,
std::vector<float>& layerClustersMask,
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/GeneralInterpretationAlgo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using namespace ticl;

using Vector = ticl::Trackster::Vector;

GeneralInterpretationAlgo::~GeneralInterpretationAlgo(){};
GeneralInterpretationAlgo::~GeneralInterpretationAlgo() {}

GeneralInterpretationAlgo::GeneralInterpretationAlgo(const edm::ParameterSet &conf, edm::ConsumesCollector cc)
: TICLInterpretationAlgoBase(conf, cc),
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/LinkingAlgoBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace ticl {
public:
LinkingAlgoBase(const edm::ParameterSet& conf) : algo_verbosity_(conf.getParameter<int>("algo_verbosity")) {}

virtual ~LinkingAlgoBase(){};
virtual ~LinkingAlgoBase() {}

virtual void initialize(const HGCalDDDConstants* hgcons,
const hgcal::RecHitTools rhtools,
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/MergedTrackstersProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using namespace ticl;
class MergedTrackstersProducer : public edm::stream::EDProducer<> {
public:
explicit MergedTrackstersProducer(const edm::ParameterSet &ps);
~MergedTrackstersProducer() override{};
~MergedTrackstersProducer() override {}
void produce(edm::Event &, const edm::EventSetup &) override;
static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);

Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/SeedingRegionAlgoBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace ticl {
public:
SeedingRegionAlgoBase(const edm::ParameterSet& conf, edm::ConsumesCollector& sumes)
: algo_verbosity_(conf.getParameter<int>("algo_verbosity")) {}
virtual ~SeedingRegionAlgoBase(){};
virtual ~SeedingRegionAlgoBase() {}

virtual void initialize(const edm::EventSetup& es) = 0;

Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/SeedingRegionByL1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace ticl {
public:
SeedingRegionByL1(const edm::ParameterSet& conf, edm::ConsumesCollector& sumes);

void initialize(const edm::EventSetup& es) override{};
void initialize(const edm::EventSetup& es) override {}
void makeRegions(const edm::Event& ev, const edm::EventSetup& es, std::vector<TICLSeedingRegion>& result) override;
static void fillPSetDescription(edm::ParameterSetDescription& desc);

Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/SeedingRegionGlobal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using namespace ticl;
SeedingRegionGlobal::SeedingRegionGlobal(const edm::ParameterSet &conf, edm::ConsumesCollector &sumes)
: SeedingRegionAlgoBase(conf, sumes) {}

SeedingRegionGlobal::~SeedingRegionGlobal(){};
SeedingRegionGlobal::~SeedingRegionGlobal() {}

void SeedingRegionGlobal::makeRegions(const edm::Event &ev,
const edm::EventSetup &es,
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/SeedingRegionGlobal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace ticl {
SeedingRegionGlobal(const edm::ParameterSet& conf, edm::ConsumesCollector& sumes);
~SeedingRegionGlobal() override;

void initialize(const edm::EventSetup& es) override{};
void initialize(const edm::EventSetup& es) override {}

void makeRegions(const edm::Event& ev, const edm::EventSetup& es, std::vector<TICLSeedingRegion>& result) override;

Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/TICLCandidateProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ using namespace ticl;
class TICLCandidateProducer : public edm::stream::EDProducer<> {
public:
explicit TICLCandidateProducer(const edm::ParameterSet &ps);
~TICLCandidateProducer() override{};
~TICLCandidateProducer() override {}
void produce(edm::Event &, const edm::EventSetup &) override;
static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);

Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/TICLLayerTileProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
class TICLLayerTileProducer : public edm::stream::EDProducer<> {
public:
explicit TICLLayerTileProducer(const edm::ParameterSet &ps);
~TICLLayerTileProducer() override{};
~TICLLayerTileProducer() override {}
void beginRun(edm::Run const &, edm::EventSetup const &) override;
void produce(edm::Event &, const edm::EventSetup &) override;
static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/TracksterLinkingbyFastJet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace ticl {
void initialize(const HGCalDDDConstants* hgcons,
const hgcal::RecHitTools rhtools,
const edm::ESHandle<MagneticField> bfieldH,
const edm::ESHandle<Propagator> propH) override{};
const edm::ESHandle<Propagator> propH) override {};

static void fillPSetDescription(edm::ParameterSetDescription& iDesc) {
iDesc.add<int>("algo_verbosity", 0);
Expand Down
4 changes: 2 additions & 2 deletions RecoHGCal/TICL/plugins/TrackstersMergeProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ using namespace ticl;
class TrackstersMergeProducer : public edm::stream::EDProducer<> {
public:
explicit TrackstersMergeProducer(const edm::ParameterSet &ps);
~TrackstersMergeProducer() override{};
~TrackstersMergeProducer() override {}
void produce(edm::Event &, const edm::EventSetup &) override;
static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);

Expand Down Expand Up @@ -198,7 +198,7 @@ TrackstersMergeProducer::TrackstersMergeProducer(const edm::ParameterSet &ps)

void TrackstersMergeProducer::beginJob() {}

void TrackstersMergeProducer::endJob(){};
void TrackstersMergeProducer::endJob() {}

void TrackstersMergeProducer::beginRun(edm::Run const &iEvent, edm::EventSetup const &es) {
edm::ESHandle<HGCalDDDConstants> hdc = es.getHandle(hdc_token_);
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/test/TiclDebugger.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class TiclDebugger : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
void beginJob() override;
void beginRun(const edm::Run&, const edm::EventSetup&) override;
void analyze(const edm::Event&, const edm::EventSetup&) override;
void endRun(edm::Run const& iEvent, edm::EventSetup const&) override{};
void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}
void endJob() override;

const edm::InputTag trackstersMerge_;
Expand Down
4 changes: 2 additions & 2 deletions RecoLocalCalo/HGCalRecAlgos/interface/HGCalRecHitAbsAlgo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ class HGCalRecHitAbsAlgo {
//HGCalRecHitAbsAlgo() { };

/// Destructor
virtual ~HGCalRecHitAbsAlgo(){};
virtual ~HGCalRecHitAbsAlgo() {}

inline void set(const CaloGeometry& geom) { rhtools_.setGeometry(geom); }

/// make rechits from dataframes
virtual void setLayerWeights(const std::vector<float>& weights){};
virtual void setLayerWeights(const std::vector<float>& weights) {}

virtual void setADCToGeVConstant(const float value) = 0;
virtual HGCRecHit makeRecHit(const HGCUncalibratedRecHit& uncalibRH, const uint32_t& flags) const = 0;
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalCalo/HGCalRecAlgos/interface/HGCalRecHitSimpleAlgo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class HGCalRecHitSimpleAlgo : public HGCalRecHitAbsAlgo {
}

// destructor
~HGCalRecHitSimpleAlgo() override{};
~HGCalRecHitSimpleAlgo() override {}

/// Compute parameters
HGCRecHit makeRecHit(const HGCUncalibratedRecHit& uncalibRH, const uint32_t& flags = 0) const override {
Expand Down
6 changes: 3 additions & 3 deletions RecoLocalCalo/HGCalRecAlgos/interface/HGCalUncalibRecHitRecWeightsAlgo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ template <class C>
class HGCalUncalibRecHitRecWeightsAlgo {
public:
// destructor
virtual ~HGCalUncalibRecHitRecWeightsAlgo(){};
virtual ~HGCalUncalibRecHitRecWeightsAlgo() {}

void set_isSiFESim(const bool isSiFE) { isSiFESim_ = isSiFE; }
bool isSiFESim() const { return isSiFESim_; }
Expand Down Expand Up @@ -74,8 +74,8 @@ class HGCalUncalibRecHitRecWeightsAlgo {
amplitude_ = (std::floor(tdcOnsetfC_ / adcLSB_) + 1.0) * adcLSB_ + (double(sample.data()) + 0.5) * tdcLSB_;
} else {
amplitude_ = double(sample.data()) * adcLSB_; // why do we not have +0.5 here ?
} //isSiFESim_
} //mode()
} //isSiFESim_
} //mode()

// trivial digitization, i.e. no signal shape
else {
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalCalo/HGCalRecAlgos/src/HGCalDepthPreClusterer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ std::vector<reco::HGCalMultiCluster> HGCalDepthPreClusterer::makePreClusters(
else if (layer < rhtools_.firstLayerBH())
radius = radii[1];
float radius2 = radius * radius;
if (distanceCheck<radius2 &&int(thecls[es[j]]->z() * vused[i])> 0) {
if (distanceCheck < radius2 && int(thecls[es[j]]->z() * vused[i]) > 0) {
temp.push_back(thecls[es[j]]);
vused[j] = vused[i];
}
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalCalo/HGCalRecProducers/interface/HGCalImagingAlgo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class HGCalImagingAlgo : public HGCalClusteringAlgoBase {
const double dx = pt1.x - pt2.x;
const double dy = pt1.y - pt2.y;
return (dx * dx + dy * dy);
} //distance squaredq
} //distance squaredq
inline double distance(const Hexel &pt1, const Hexel &pt2) const { //2-d distance on the layer (x-y)
return std::sqrt(distance2(pt1, pt2));
}
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalCalo/HGCalRecProducers/plugins/HGCalImagingAlgo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ double HGCalImagingAlgo::calculateLocalDensity(std::vector<KDNode> &nd, KDTree &
maxdensity = std::max(maxdensity, nd[i].data.rho);
}
} // end loop found
} // end loop nodes
} // end loop nodes
return maxdensity;
}

Expand Down
2 changes: 1 addition & 1 deletion RecoLocalCalo/HGCalRecProducers/plugins/HGCalUncalibRecHitWorkerWeights.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace edm {
class HGCalUncalibRecHitWorkerWeights : public HGCalUncalibRecHitWorkerBaseClass {
public:
HGCalUncalibRecHitWorkerWeights(const edm::ParameterSet&, edm::ConsumesCollector iC, bool useTime);
~HGCalUncalibRecHitWorkerWeights() override{};
~HGCalUncalibRecHitWorkerWeights() override {}

bool runHGCEE(const edm::ESHandle<HGCalGeometry>& geom,
const HGCalDigiCollection& digis,
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalCalo/HGCalRecProducers/src/ComputeClusterTime.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ComputeClusterTime::ComputeClusterTime(float Xmin, float Xmax, float Cterm, floa
xMin_ = 0.1;
};

ComputeClusterTime::ComputeClusterTime() : xMin_(1.), xMax_(5.), cTerm_(0), aTerm_(0){};
ComputeClusterTime::ComputeClusterTime() : xMin_(1.), xMax_(5.), cTerm_(0), aTerm_(0) {}

void ComputeClusterTime::setParameters(float Xmin, float Xmax, float Cterm, float Aterm) {
xMin_ = (Xmin > 0) ? Xmin : 0.1;
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalFastTime/FTLClusterizer/interface/MTDClusterParameterEstimator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class MTDClusterParameterEstimator {
return vlp;
}

MTDClusterParameterEstimator(){};
MTDClusterParameterEstimator() {}
};

#endif
4 changes: 2 additions & 2 deletions RecoLocalFastTime/FTLCommonAlgos/interface/MTDRecHitAlgoBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ class MTDRecHitAlgoBase {
public:
/// Constructor
MTDRecHitAlgoBase(const edm::ParameterSet& conf, edm::ConsumesCollector& sumes)
: name_(conf.getParameter<std::string>("algoName")){};
: name_(conf.getParameter<std::string>("algoName")) {}

/// Destructor
virtual ~MTDRecHitAlgoBase(){};
virtual ~MTDRecHitAlgoBase() {}

/// get event and eventsetup information
virtual void getEvent(const edm::Event&) = 0;
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalFastTime/FTLCommonAlgos/interface/MTDTimeCalib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class MTDTimeCalib {
public:
//constructor & destructor
MTDTimeCalib(edm::ParameterSet const& conf, const MTDGeometry* geom, const MTDTopology* topo);
~MTDTimeCalib(){};
~MTDTimeCalib() {}

//accessors
float getTimeCalib(const MTDDetId& id) const;
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalFastTime/FTLRecProducers/plugins/MTDTrackingRecHitProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void MTDTrackingRecHitProducer::produce(edm::StreamID, edm::Event& evt, const ed
// Now save it =================
recHitsOnDet.push_back(hit);
} // <-- End loop on Clusters
} // <-- End loop on DetUnits
} // <-- End loop on DetUnits
LogDebug("MTDTrackingRecHitProducer") << "outputCollection " << theoutputhits.size();
}

Expand Down
2 changes: 1 addition & 1 deletion RecoLocalMuon/GEMCSCSegment/plugins/GEMCSCSegFit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class GEMCSCSegFit {
// Test whether id is found
if (csclayermap_.find(id) == csclayermap_.end()) { // id is not found
throw cms::Exception("InvalidDetId") << "[GEMCSCSegFit] Failed to find CSCChamber in CSCLayerMap" << std::endl;
} // chamber is not found and exception is thrown
} // chamber is not found and exception is thrown
else { // id is found
return (csclayermap_.find(id)->second)->chamber();
} // chamber found and returned
Expand Down
4 changes: 2 additions & 2 deletions RecoLocalMuon/GEMCSCSegment/plugins/GEMCSCSegmentAlgorithm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
class GEMCSCSegmentAlgorithm {
public:
/// Constructor
explicit GEMCSCSegmentAlgorithm(const edm::ParameterSet&){};
explicit GEMCSCSegmentAlgorithm(const edm::ParameterSet&) {}
/// Destructor
virtual ~GEMCSCSegmentAlgorithm(){};
virtual ~GEMCSCSegmentAlgorithm() {}
/// Run the algorithm = build segments
virtual std::vector<GEMCSCSegment> run(const std::map<uint32_t, const CSCLayer*>& csclayermap,
const std::map<uint32_t, const GEMEtaPartition*>& gemrollmap,
Expand Down
4 changes: 2 additions & 2 deletions RecoLocalMuon/GEMCSCSegment/plugins/GEMCSCSegmentBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ void GEMCSCSegmentBuilder::build(const GEMRecHitCollection* recHits,
<< "] added to CSC segment found in " << CSCId << " [" << CSCId.rawId() << "]" << std::endl;
}
} // end Loop over GEM Rolls
} // end Loop over GEM RecHits
} // end requirement of CSC segment in ME1/1 or ME2/1
} // end Loop over GEM RecHits
} // end requirement of CSC segment in ME1/1 or ME2/1

// Case B :: all other CSC Chambers have no GEM Chamber associated
// ===============================================================
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalMuon/GEMCSCSegment/plugins/GEMCSCSegmentBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

class CSCStationIndex {
public:
CSCStationIndex() : _region(0), _station(0), _ring(0), _chamber(0), _layer(0){};
CSCStationIndex() : _region(0), _station(0), _ring(0), _chamber(0), _layer(0) {}
CSCStationIndex(int region, int station, int ring, int chamber, int layer)
: _region(region), _station(station), _ring(ring), _chamber(chamber), _layer(layer) {}
~CSCStationIndex() {}
Expand Down
12 changes: 6 additions & 6 deletions RecoLocalMuon/GEMCSCSegment/test/GEMCSCCoincidenceRateAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ std::vector<const CSCSegment*> GEMCSCCoincidenceRateAnalyzer::findMuonSegments(
break;
}
} // MuonSegmentMatch
} // checkCSCChamberType
} // MuonChamberMatch
} // MuonCollection
} // checkCSCChamberType
} // MuonChamberMatch
} // MuonCollection

return muon_segment_vec;
}
Expand Down Expand Up @@ -324,8 +324,8 @@ bool GEMCSCCoincidenceRateAnalyzer::checkGEMChamberStatus(const GEMDetId& chambe
// GEMOHStatus is bad. Mask this chamber.
return has_error;
} // isBad
} // range
} // collection
} // range
} // collection

for (auto iter = vfat_status_collection->begin(); iter != vfat_status_collection->end(); iter++) {
const auto [vfat_id, range] = (*iter);
Expand All @@ -337,7 +337,7 @@ bool GEMCSCCoincidenceRateAnalyzer::checkGEMChamberStatus(const GEMDetId& chambe
return has_error;
}
} // range
} // collection
} // collection

return not has_error;
}
Expand Down
Loading