Skip to content

Commit d0f0ff4

Browse files
authored
Merge pull request #20 from tmadlener/port-pr-71
Fix warnings and remove CentOS7 from CI workflows (iLCSoft#71)
2 parents 67a301f + ded6e84 commit d0f0ff4

33 files changed

Lines changed: 1038 additions & 991 deletions

.github/workflows/key4hep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
build_type: ["release", "nightly"]
10-
image: ["alma9", "ubuntu22", "centos7"]
10+
image: ["alma9", "ubuntu22"]
1111
fail-fast: false
1212

1313
steps:

source/Digitisers/include/DDPlanarDigiProcessor.h

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ class DDPlanarDigiProcessor : public Processor {
6161

6262

6363
DDPlanarDigiProcessor() ;
64+
DDPlanarDigiProcessor(const DDPlanarDigiProcessor&) = delete;
65+
DDPlanarDigiProcessor& operator=(const DDPlanarDigiProcessor&) = delete;
6466

6567
/** Called at the begin of the job before anything is read.
6668
* Use to initialize the processor, e.g. book histograms.
@@ -88,35 +90,35 @@ class DDPlanarDigiProcessor : public Processor {
8890

8991
protected:
9092

91-
std::string _inColName ;
93+
std::string _inColName {};
9294

93-
std::string _outColName ;
94-
std::string _outRelColName ;
95+
std::string _outColName {};
96+
std::string _outRelColName {};
9597

96-
std::string _subDetName ;
98+
std::string _subDetName {};
9799

98-
int _nRun ;
99-
int _nEvt ;
100+
int _nRun {};
101+
int _nEvt {};
100102

101-
FloatVec _resU ;
102-
FloatVec _resV ;
103-
FloatVec _resT ;
103+
FloatVec _resU {};
104+
FloatVec _resV {};
105+
FloatVec _resT {};
104106

105-
bool _isStrip;
107+
bool _isStrip{};
106108

107-
gsl_rng* _rng ;
109+
gsl_rng* _rng {nullptr};
108110

109-
const dd4hep::rec::SurfaceMap* _map ;
111+
const dd4hep::rec::SurfaceMap* _map {nullptr};
110112

111-
bool _forceHitsOntoSurface ;
112-
double _minEnergy ;
113+
bool _forceHitsOntoSurface {};
114+
double _minEnergy {};
113115

114-
bool _useTimeWindow ;
115-
bool _correctTimesForPropagation ;
116-
FloatVec _timeWindow_min ;
117-
FloatVec _timeWindow_max ;
116+
bool _useTimeWindow {};
117+
bool _correctTimesForPropagation {};
118+
FloatVec _timeWindow_min {};
119+
FloatVec _timeWindow_max {};
118120

119-
std::vector<TH1F*> _h ;
121+
std::vector<TH1F*> _h {};
120122

121123
} ;
122124

source/Digitisers/include/DDSpacePointBuilder.h

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ class DDSpacePointBuilder : public Processor {
7171

7272

7373
DDSpacePointBuilder() ;
74+
75+
DDSpacePointBuilder(const DDSpacePointBuilder&) = delete;
76+
DDSpacePointBuilder& operator=(const DDSpacePointBuilder&) = delete;
7477

7578
/** Called at the begin of the job before anything is read.
7679
* Use to initialize the processor, e.g. book histograms.
@@ -102,19 +105,19 @@ class DDSpacePointBuilder : public Processor {
102105

103106
/** Input collection name.
104107
*/
105-
std::string _TrackerHitCollection;
108+
std::string _TrackerHitCollection{};
106109

107110
/** Input relation collection name.
108111
*/
109-
std::string _TrackerHitSimHitRelCollection;
112+
std::string _TrackerHitSimHitRelCollection{};
110113

111114
/** Output collection name.
112115
*/
113-
std::string _SpacePointsCollection;
116+
std::string _SpacePointsCollection{};
114117

115118
/** Output relations collection name.
116119
*/
117-
std::string _relColName;
120+
std::string _relColName{};
118121

119122
/** Calculates the 2 dimensional crossing point of two lines.
120123
* Each line is specified by a point (x,y) and a direction vector (ex,ey).
@@ -196,26 +199,26 @@ class DDSpacePointBuilder : public Processor {
196199
std::string getCellID0Info( int cellID0 );
197200

198201

199-
int _nRun ;
200-
int _nEvt ;
202+
int _nRun {};
203+
int _nEvt {};
201204

202-
unsigned _nOutOfBoundary;
203-
unsigned _nStripsTooParallel;
204-
unsigned _nPlanesNotParallel;
205+
unsigned _nOutOfBoundary{};
206+
unsigned _nStripsTooParallel{};
207+
unsigned _nPlanesNotParallel{};
205208

206-
float _nominal_vertex_x;
207-
float _nominal_vertex_y;
208-
float _nominal_vertex_z;
209+
float _nominal_vertex_x{};
210+
float _nominal_vertex_y{};
211+
float _nominal_vertex_z{};
209212

210-
CLHEP::Hep3Vector _nominal_vertex;
213+
CLHEP::Hep3Vector _nominal_vertex{};
211214

212-
float _striplength_tolerance;
215+
float _striplength_tolerance{};
213216

214-
double _striplength ;
215-
std::string _subDetName ;
217+
double _striplength {};
218+
std::string _subDetName {};
216219

217220
//dd4hep::Detector& lcdd;
218-
const dd4hep::rec::SurfaceMap* surfMap ;
221+
const dd4hep::rec::SurfaceMap* surfMap {nullptr};
219222

220223
} ;
221224

source/Digitisers/include/DDTPCDigiProcessor.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ class DDTPCDigiProcessor : public marlin::Processor {
119119

120120
DDTPCDigiProcessor() ;
121121

122+
DDTPCDigiProcessor(const DDTPCDigiProcessor&) = delete;
123+
DDTPCDigiProcessor& operator=(const DDTPCDigiProcessor&) = delete;
124+
122125
~DDTPCDigiProcessor() ;
123126

124127
/** Called at the begin of the job before anything is read.

source/Digitisers/src/FixedPadSizeDiskLayout.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ double FixedPadSizeDiskLayout::getPadWidth(int padIndex) const {
147147
return _padWidth / _rows.at( rowNum ).RCenter ;
148148

149149
}
150-
catch(std::out_of_range){
150+
catch(std::out_of_range&){
151151
return 0. ;
152152
}
153153
}
@@ -162,7 +162,7 @@ double FixedPadSizeDiskLayout::getPadPitch(int padIndex) const {
162162
return _rows.at( rowNum ).PhiPad;
163163

164164
}
165-
catch(std::out_of_range){
165+
catch(std::out_of_range&){
166166
return 0. ;
167167
}
168168
}

source/Digitisers/src/TPCModularEndplate.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ class TPCModularEndplate {
2929

3030
/// no default c'tor
3131
TPCModularEndplate() = delete ;
32-
32+
TPCModularEndplate(const TPCModularEndplate&) = delete;
33+
TPCModularEndplate& operator=(const TPCModularEndplate&) = delete;
3334

3435
/// intitialize for the gice TPC data
3536
TPCModularEndplate( const dd4hep::rec::FixedPadSizeTPCData* tpc ) ;

source/Refitting/include/ClonesAndSplitTracksFinder.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ class ClonesAndSplitTracksFinder : public marlin::Processor {
7575

7676
lcio::LCCollection* GetCollection(lcio::LCEvent* evt, std::string colName);
7777

78-
std::string _input_track_col_name;
79-
std::string _output_track_col_name;
78+
std::string _input_track_col_name{};
79+
std::string _output_track_col_name{};
8080

8181
MarlinTrk::IMarlinTrkSystem* _trksystem = nullptr;
8282

@@ -95,12 +95,12 @@ class ClonesAndSplitTracksFinder : public marlin::Processor {
9595
bool _mergeSplitTracks = false;
9696

9797
// Track fit parameters
98-
double _initialTrackError_d0;
99-
double _initialTrackError_phi0;
100-
double _initialTrackError_omega;
101-
double _initialTrackError_z0;
102-
double _initialTrackError_tanL;
103-
double _maxChi2perHit;
98+
double _initialTrackError_d0{};
99+
double _initialTrackError_phi0{};
100+
double _initialTrackError_omega{};
101+
double _initialTrackError_z0{};
102+
double _initialTrackError_tanL{};
103+
double _maxChi2perHit{};
104104

105105
std::shared_ptr<UTIL::BitField64> _encoder{};
106106
};

0 commit comments

Comments
 (0)