Skip to content

Commit eda2f60

Browse files
committed
Add more MuonCollider specific fixes
1 parent 0ace7ba commit eda2f60

11 files changed

Lines changed: 35 additions & 25 deletions

source/Refitting/include/RefitFinal.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class RefitFinal : public marlin::Processor {
1818

1919
/// Nhits cut struct
2020
struct NHitsCut{
21-
std::vector<int> detIDs ; // list of detectors IDs from which hits will be summed
22-
int nHits_min ; // minimum number of hits
21+
std::vector<int> detIDs {} ; // list of detectors IDs from which hits will be summed
22+
int nHits_min {}; // minimum number of hits
2323
};
2424

2525
public:
@@ -79,8 +79,8 @@ class RefitFinal : public marlin::Processor {
7979
bool _MSOn = true;
8080
bool _ElossOn = true;
8181

82-
StringVec _NHitsCutsStr ;
83-
std::vector<NHitsCut> _NHitsCuts ;
82+
StringVec _NHitsCutsStr {};
83+
std::vector<NHitsCut> _NHitsCuts {};
8484
double _ReducedChi2Cut = -1.0;
8585

8686
bool _SmoothOn = false;

source/Utils/include/FilterClusters.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ class FilterClusters : public marlin::Processor
4545
std::string _OutRelationCollection {};
4646

4747
//! Ranges for theta
48-
std::vector<std::string> _ThetaRanges;
48+
std::vector<std::string> _ThetaRanges {};
4949

5050
//! Cut-offs for cluster size in various theta ranges
51-
std::vector<std::string> _ClusterSize;
51+
std::vector<std::string> _ClusterSize {};
5252

5353
//! Layers to be filtered
5454
std::vector<std::string> _Layers;

source/Utils/include/FilterConeHits.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ class FilterConeHits : public Processor {
3939

4040

4141
FilterConeHits() ;
42+
FilterConeHits(const FilterConeHits&) = delete;
43+
FilterConeHits& operator=(const FilterConeHits&) = delete;
4244

4345
virtual void init() ;
4446

source/Utils/include/FilterDoubleLayerHits.h

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ class FilterDoubleLayerHits : public Processor {
6262

6363

6464
FilterDoubleLayerHits() ;
65+
FilterDoubleLayerHits(const FilterDoubleLayerHits) = delete ;
66+
FilterDoubleLayerHits& operator=(const FilterDoubleLayerHits) = delete ;
6567

6668
virtual const std::string & name() const { return Processor::name() ; }
6769

@@ -92,40 +94,40 @@ class FilterDoubleLayerHits : public Processor {
9294
dd4hep::rec::Vector2D globalToLocal(long int cellID, const dd4hep::rec::Vector3D& posGlobal, dd4hep::rec::ISurface** surf) ;
9395

9496
////Input collection name.
95-
std::string _inColName ;
97+
std::string _inColName {};
9698

9799
////Output collection name.
98-
std::string _outColName ;
100+
std::string _outColName {};
99101

100102
////Maximum time difference between hits in a doublet
101-
double _dtMax ;
103+
double _dtMax {};
102104

103105
////Double layer cuts configuration
104-
StringVec _dlCutConfigs ;
106+
StringVec _dlCutConfigs {};
105107

106108
////Whether to fill diagnostic histograms
107-
bool _fillHistos ;
109+
bool _fillHistos {false};
108110

109111
////Subdetector name (needed to get the sensor surface manager)
110-
std::string _subDetName ;
112+
std::string _subDetName {};
111113

112-
std::vector<DoubleLayerCut> _dlCuts ;
114+
std::vector<DoubleLayerCut> _dlCuts {};
113115

114116
////Surface map for getting local hit positions at sensor surface
115-
const dd4hep::rec::SurfaceMap* _map ;
117+
const dd4hep::rec::SurfaceMap* _map {nullptr};
116118

117119

118120
////Array of flags for hits to be accepted
119121
bool _hitAccepted[NHITS_MAX] ;
120122

121123
////Map of vectors of hits grouped by position in the detector
122-
std::map<SensorPosition, std::vector<size_t> > _hitsGrouped;
124+
std::map<SensorPosition, std::vector<size_t> > _hitsGrouped{};
123125

124126
////Monitoring histograms
125-
std::map<std::string, TH1*> _histos ;
127+
std::map<std::string, TH1*> _histos {};
126128

127-
int _nRun ;
128-
int _nEvt ;
129+
int _nRun {};
130+
int _nEvt {};
129131
} ;
130132

131133
#endif

source/Utils/include/FilterTimeHits.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ class FilterTimeHits : public Processor
4242
virtual Processor *newProcessor() { return new FilterTimeHits; }
4343

4444
FilterTimeHits();
45+
FilterTimeHits(const FilterTimeHits&) = delete;
46+
FilterTimeHits& operator=(const FilterTimeHits&) = delete;
4547

4648
virtual void init();
4749

source/Utils/include/SplitCollectionByLayer.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ class SplitCollectionByLayer : public Processor {
3030

3131
///helper struct
3232
struct OutColInfo{
33+
OutColInfo(const OutColInfo&) = delete;
34+
OutColInfo& operator=(const OutColInfo&) = delete;
35+
3336
std::vector<size_t> layers{} ;
3437
LCCollection* collection{nullptr};
3538
OutColInfo() : layers(std::vector<size_t>(0)), collection(nullptr) {}

source/Utils/include/SplitCollectionByPolarAngle.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ class SplitCollectionByPolarAngle : public Processor {
3939

4040

4141
SplitCollectionByPolarAngle() ;
42+
SplitCollectionByPolarAngle(const SplitCollectionByPolarAngle&) = delete ;
43+
SplitCollectionByPolarAngle& operator=(const SplitCollectionByPolarAngle&) = delete ;
4244

4345
virtual void init() ;
4446

source/Utils/src/FilterClusters.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ void FilterClusters::processEvent( LCEvent * evt )
141141
//Get hit subdetector/layer
142142
std::string _encoderString = lcio::LCTrackerCellID::encoding_string();
143143
UTIL::CellIDDecoder<lcio::TrackerHit> decoder(_encoderString);
144-
uint32_t systemID = decoder(trkhit)["system"];
145144
uint32_t layerID = decoder(trkhit)["layer"];
146145
bool filter_layer = false;
147146
for (size_t j=0; j<_Layers.size(); ++j){

source/Utils/src/FilterConeHits.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void FilterConeHits::init() {
116116
}
117117

118118

119-
void FilterConeHits::processRunHeader( LCRunHeader* run) {
119+
void FilterConeHits::processRunHeader( LCRunHeader* ) {
120120

121121
_nRun++ ;
122122

@@ -391,7 +391,7 @@ void FilterConeHits::processEvent( LCEvent * evt ) {
391391

392392

393393

394-
void FilterConeHits::check( LCEvent * evt ) {
394+
void FilterConeHits::check( LCEvent * ) {
395395
}
396396

397397

source/Utils/src/FilterTimeHits.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void FilterTimeHits::init()
9999
m_corrected_time = new TH1F("m_corrected_time", "Corrected time of the hit [ps]", 1000, -250., 250.);
100100
}
101101

102-
void FilterTimeHits::processRunHeader(LCRunHeader *run)
102+
void FilterTimeHits::processRunHeader(LCRunHeader *)
103103
{
104104
_nRun++;
105105
}
@@ -326,7 +326,7 @@ void FilterTimeHits::processEvent(LCEvent *evt)
326326
_nEvt++;
327327
}
328328

329-
void FilterTimeHits::check(LCEvent *evt)
329+
void FilterTimeHits::check(LCEvent *)
330330
{
331331
}
332332

0 commit comments

Comments
 (0)