Skip to content

Commit fe7b1db

Browse files
vkuceravkucera
committed
Fix readability/inheritance
1 parent 8eea70b commit fe7b1db

3 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class EventSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
111111
template <typename CollisionToFilter, typename AssociatedTracks>
112112
void StoreMultiplicities(CollisionToFilter const&, AssociatedTracks const&);
113113
int CalculateMaskLength() override;
114-
virtual void StoreArmedMask() override;
114+
void StoreArmedMask() override;
115115

116116
std::vector<CutBrick<float>*> mBFieldSelection; //! the magnetic field selection cuts
117117
MultiplicityBrick* mMultiplicityClasses; //! the multiplicity classes cuts

‎PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class PIDSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
9898
PIDSelectionFilterAndAnalysis();
9999
PIDSelectionFilterAndAnalysis(const TString&, selmodes);
100100
PIDSelectionFilterAndAnalysis(const PIDSelectionConfigurable& pidsel, selmodes mode);
101-
virtual ~PIDSelectionFilterAndAnalysis() override;
101+
~PIDSelectionFilterAndAnalysis() override;
102102

103103
void SetPTOF(float ptof) { mPTOF = ptof; }
104104
void SetRequireTOF(bool requiretof = false) { mRequireTOF = requiretof; }
@@ -133,8 +133,8 @@ class PIDSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
133133

134134
private:
135135
void ConstructCutFromString(const TString&);
136-
virtual int CalculateMaskLength() override;
137-
virtual void StoreArmedMask() override;
136+
int CalculateMaskLength() override;
137+
void StoreArmedMask() override;
138138

139139
float mPTOF = 0.8f; ///< the p threshold for cheking TOF information
140140
bool mRequireTOF = false; ///< is TOF required

‎PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class CutBrick : public TNamed
4646
CutBrick();
4747
CutBrick(const char*, const char*);
4848
CutBrick(const CutBrick&) = delete;
49-
virtual ~CutBrick() override = default;
49+
~CutBrick() override = default;
5050
CutBrick& operator=(const CutBrick&) = delete;
5151

5252
public:
@@ -111,13 +111,13 @@ class CutBrickLimit : public CutBrick<TValueToFilter>
111111
CutBrickLimit();
112112
CutBrickLimit(const char*, const TValueToFilter&);
113113
CutBrickLimit(const TString&);
114-
virtual ~CutBrickLimit() override = default;
114+
~CutBrickLimit() override = default;
115115
CutBrickLimit(const CutBrickLimit&) = delete;
116116
CutBrickLimit& operator=(const CutBrickLimit&) = delete;
117117

118-
virtual std::vector<bool> IsArmed() override;
119-
virtual std::vector<bool> Filter(const TValueToFilter&) override;
120-
virtual int Length() override { return 1; }
118+
std::vector<bool> IsArmed() override;
119+
std::vector<bool> Filter(const TValueToFilter&) override;
120+
int Length() override { return 1; }
121121

122122
private:
123123
void ConstructCutFromString(const TString&);
@@ -155,12 +155,12 @@ class CutBrickFnLimit : public CutBrickLimit<TValueToFilter>
155155
CutBrickFnLimit();
156156
CutBrickFnLimit(const char*, const TF1&);
157157
CutBrickFnLimit(const TString&);
158-
virtual ~CutBrickFnLimit() override = default;
158+
~CutBrickFnLimit() override = default;
159159
CutBrickFnLimit(const CutBrickFnLimit&) = delete;
160160
CutBrickFnLimit& operator=(const CutBrickFnLimit&) = delete;
161161

162162
/// sets the value of the limit according the passed variable value
163-
virtual void setIndependentFnVar(float x) override
163+
void setIndependentFnVar(float x) override
164164
{
165165
this->mLimit = TValueToFilter(mFunction.Eval(x));
166166
}
@@ -182,13 +182,13 @@ class CutBrickThreshold : public CutBrick<TValueToFilter>
182182
CutBrickThreshold();
183183
CutBrickThreshold(const char*, const TValueToFilter&);
184184
CutBrickThreshold(const TString&);
185-
virtual ~CutBrickThreshold() override = default;
185+
~CutBrickThreshold() override = default;
186186
CutBrickThreshold(const CutBrickThreshold&) = delete;
187187
CutBrickThreshold& operator=(const CutBrickThreshold&) = delete;
188188

189-
virtual std::vector<bool> IsArmed() override;
190-
virtual std::vector<bool> Filter(const TValueToFilter&) override;
191-
virtual int Length() override { return 1; }
189+
std::vector<bool> IsArmed() override;
190+
std::vector<bool> Filter(const TValueToFilter&) override;
191+
int Length() override { return 1; }
192192

193193
private:
194194
void ConstructCutFromString(const TString&);
@@ -226,12 +226,12 @@ class CutBrickFnThreshold : public CutBrickThreshold<TValueToFilter>
226226
CutBrickFnThreshold();
227227
CutBrickFnThreshold(const char*, const TF1&);
228228
CutBrickFnThreshold(const TString&);
229-
virtual ~CutBrickFnThreshold() override = default;
229+
~CutBrickFnThreshold() override = default;
230230
CutBrickFnThreshold(const CutBrickFnThreshold&) = delete;
231231
CutBrickFnThreshold& operator=(const CutBrickFnThreshold&) = delete;
232232

233233
/// sets the value of the threshold according the passed variable value
234-
virtual void setIndependentFnVar(float x) override
234+
void setIndependentFnVar(float x) override
235235
{
236236
this->mThreshold = TValueToFilter(mFunction.Eval(x));
237237
}
@@ -253,13 +253,13 @@ class CutBrickRange : public CutBrick<TValueToFilter>
253253
CutBrickRange();
254254
CutBrickRange(const char*, const TValueToFilter&, const TValueToFilter&);
255255
CutBrickRange(const TString&);
256-
virtual ~CutBrickRange() override = default;
256+
~CutBrickRange() override = default;
257257
CutBrickRange(const CutBrickRange&) = delete;
258258
CutBrickRange& operator=(const CutBrickRange&) = delete;
259259

260-
virtual std::vector<bool> IsArmed() override;
261-
virtual std::vector<bool> Filter(const TValueToFilter&) override;
262-
virtual int Length() override { return 1; }
260+
std::vector<bool> IsArmed() override;
261+
std::vector<bool> Filter(const TValueToFilter&) override;
262+
int Length() override { return 1; }
263263

264264
private:
265265
void ConstructCutFromString(const TString&);
@@ -298,12 +298,12 @@ class CutBrickFnRange : public CutBrickRange<TValueToFilter>
298298
CutBrickFnRange();
299299
CutBrickFnRange(const char*, const TF1&, const TF1&);
300300
CutBrickFnRange(const TString&);
301-
virtual ~CutBrickFnRange() override = default;
301+
~CutBrickFnRange() override = default;
302302
CutBrickFnRange(const CutBrickFnRange&) = delete;
303303
CutBrickFnRange& operator=(const CutBrickFnRange&) = delete;
304304

305305
/// sets the value of the limits according the passed variable value
306-
virtual void setIndependentFnVar(float x) override
306+
void setIndependentFnVar(float x) override
307307
{
308308
this->mLow = TValueToFilter(mLowFunction.Eval(x));
309309
this->mUp = TValueToFilter(mUpFunction.Eval(x));
@@ -327,13 +327,13 @@ class CutBrickExtToRange : public CutBrick<TValueToFilter>
327327
CutBrickExtToRange();
328328
CutBrickExtToRange(const char*, const TValueToFilter&, const TValueToFilter&);
329329
CutBrickExtToRange(const TString&);
330-
virtual ~CutBrickExtToRange() override = default;
330+
~CutBrickExtToRange() override = default;
331331
CutBrickExtToRange(const CutBrickExtToRange&) = delete;
332332
CutBrickExtToRange& operator=(const CutBrickExtToRange&) = delete;
333333

334-
virtual std::vector<bool> IsArmed() override;
335-
virtual std::vector<bool> Filter(const TValueToFilter&) override;
336-
virtual int Length() override { return 1; }
334+
std::vector<bool> IsArmed() override;
335+
std::vector<bool> Filter(const TValueToFilter&) override;
336+
int Length() override { return 1; }
337337

338338
private:
339339
void ConstructCutFromString(const TString&);
@@ -372,12 +372,12 @@ class CutBrickFnExtToRange : public CutBrickExtToRange<TValueToFilter>
372372
CutBrickFnExtToRange();
373373
CutBrickFnExtToRange(const char*, const TF1&, const TF1&);
374374
CutBrickFnExtToRange(const TString&);
375-
virtual ~CutBrickFnExtToRange() override = default;
375+
~CutBrickFnExtToRange() override = default;
376376
CutBrickFnExtToRange(const CutBrickFnExtToRange&) = delete;
377377
CutBrickFnExtToRange& operator=(const CutBrickFnExtToRange&) = delete;
378378

379379
/// sets the value of the limits according the passed variable value
380-
virtual void setIndependentFnVar(float x) override
380+
void setIndependentFnVar(float x) override
381381
{
382382
this->mLow = TValueToFilter(mLowFunction.Eval(x));
383383
this->mUp = TValueToFilter(mUpFunction.Eval(x));
@@ -403,16 +403,16 @@ class CutBrickSelectorMultipleRanges : public CutBrick<TValueToFilter>
403403
CutBrickSelectorMultipleRanges();
404404
CutBrickSelectorMultipleRanges(const char*, const std::vector<TValueToFilter>&);
405405
CutBrickSelectorMultipleRanges(const TString&);
406-
virtual ~CutBrickSelectorMultipleRanges() override = default;
406+
~CutBrickSelectorMultipleRanges() override = default;
407407
CutBrickSelectorMultipleRanges(const CutBrickSelectorMultipleRanges&) = delete;
408408
CutBrickSelectorMultipleRanges& operator=(const CutBrickSelectorMultipleRanges&) = delete;
409409

410-
virtual std::vector<bool> IsArmed() override;
411-
virtual std::vector<bool> Filter(const TValueToFilter&) override;
410+
std::vector<bool> IsArmed() override;
411+
std::vector<bool> Filter(const TValueToFilter&) override;
412412
/// Return the length needed to code the brick status
413413
/// The length is in brick units. The actual length is implementation dependent
414414
/// \returns Brick length in units of bricks
415-
virtual int Length() override { return mActive.size(); }
415+
int Length() override { return mActive.size(); }
416416

417417
private:
418418
void ConstructCutFromString(const TString&);
@@ -433,18 +433,18 @@ class CutWithVariations : public CutBrick<TValueToFilter>
433433
CutWithVariations();
434434
CutWithVariations(const char*, const char*, bool);
435435
CutWithVariations(const TString&);
436-
virtual ~CutWithVariations() override = default;
436+
~CutWithVariations() override = default;
437437
CutWithVariations(const CutWithVariations&) = delete;
438438
CutWithVariations& operator=(const CutWithVariations&) = delete;
439439

440440
bool AddDefaultBrick(CutBrick<TValueToFilter>* brick);
441441
bool AddVariationBrick(CutBrick<TValueToFilter>* brick);
442442
TList& getDefaultBricks() { return mDefaultBricks; }
443443
TList& getVariantBricks() { return mVariationBricks; }
444-
virtual std::vector<bool> IsArmed() override;
445-
virtual std::vector<bool> Filter(const TValueToFilter&) override;
446-
virtual int Length() override;
447-
virtual int getArmedIndex() override;
444+
std::vector<bool> IsArmed() override;
445+
std::vector<bool> Filter(const TValueToFilter&) override;
446+
int Length() override;
447+
int getArmedIndex() override;
448448

449449
private:
450450
void ConstructCutFromString(const TString&);
@@ -467,7 +467,7 @@ class SpecialCutBrick : public TNamed
467467
SpecialCutBrick();
468468
SpecialCutBrick(const char*, const char*);
469469
SpecialCutBrick(const SpecialCutBrick&) = delete;
470-
virtual ~SpecialCutBrick() override = default;
470+
~SpecialCutBrick() override = default;
471471
SpecialCutBrick& operator=(const SpecialCutBrick&) = delete;
472472

473473
public:
@@ -511,7 +511,7 @@ class TrackSelectionBrick : public SpecialCutBrick
511511
public:
512512
TrackSelectionBrick() = default;
513513
TrackSelectionBrick(const TString&);
514-
virtual ~TrackSelectionBrick() override = default;
514+
~TrackSelectionBrick() override = default;
515515

516516
enum class TrackCuts : int {
517517
kTrackType = 0,
@@ -532,7 +532,7 @@ class TrackSelectionBrick : public SpecialCutBrick
532532

533533
static const std::string mCutNames[static_cast<int>(TrackCuts::kNCuts)];
534534

535-
virtual std::vector<bool> IsArmed() override;
535+
std::vector<bool> IsArmed() override;
536536
template <typename TrackToFilter>
537537
bool Filter(TrackToFilter const& track)
538538
{

0 commit comments

Comments
 (0)