Skip to content

Commit 5f0fac4

Browse files
DanielWielanekkarabowi
authored andcommitted
chore: Cleanup FairEveTracks
This is part of a bigger patchset by @DanielWielanek. Co-Authored-By: Christian Tacke <@ChristianTackeGSI>
1 parent d4f5b10 commit 5f0fac4

File tree

2 files changed

+33
-42
lines changed

2 files changed

+33
-42
lines changed

fairroot/eventdisplay/tracks/FairEveTracks.cxx

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,33 @@
11
/********************************************************************************
2-
* Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
2+
* Copyright (C) 2020-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
33
* *
44
* This software is distributed under the terms of the *
55
* GNU Lesser General Public Licence (LGPL) version 3, *
66
* copied verbatim in the file "LICENSE" *
77
********************************************************************************/
88
/*
9-
* FairTracks.cxx
9+
* FairEveTracks.cxx
1010
*
1111
* Created on: 4 maj 2020
1212
* Author: Daniel Wielanek
1313
1414
* Warsaw University of Technology, Faculty of Physics
1515
*/
1616

17-
#include "FairEveTracks.h"
18-
#include <RtypesCore.h> // for kFALSE, kTRUE, Bool_t, Color_t
19-
#include <TEveManager.h> // for TEveManager, gEve
20-
#include <TEveTrack.h> // for TEveTrackList
21-
#include <TEveTrackPropagator.h> // for TEveTrackPropagator
22-
#include <TString.h> // for TString
23-
#include <algorithm> // for for_each
24-
#include <list> // for __list_iterator, operator!=
25-
#include "FairEveRecoTrackList.h" // for FairEveRecoTrackList
26-
#include "FairEventManager.h" // for FairEventManager
17+
#include "FairEveTracks.h"
2718

19+
#include "FairEveRecoTrackList.h" // for FairEveRecoTrackList
20+
#include "FairEventManager.h" // for FairEventManager
21+
22+
#include <RtypesCore.h> // for kFALSE, kTRUE, Bool_t, Color_t
23+
#include <TEveManager.h> // for TEveManager, gEve
24+
#include <TEveTrackPropagator.h> // for TEveTrackPropagator
25+
#include <TString.h> // for TString
26+
#include <algorithm> // for for_each
27+
#include <list> // for __list_iterator, operator!=
2828

2929
FairEveTracks::FairEveTracks(Bool_t acceptCompound)
30-
: fEventManager(nullptr)
31-
, fPt{0, 10}
32-
, fEta{-10, 10}
33-
, fEnergy{0, 10}
34-
, fUsePt(kFALSE)
35-
, fUseEta(kFALSE)
36-
, fUseEnergy(kFALSE)
37-
, fAcceptCompound(acceptCompound)
30+
: fAcceptCompound(acceptCompound)
3831
{}
3932

4033
void FairEveTracks::ToggleTracks()

fairroot/eventdisplay/tracks/FairEveTracks.h

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/********************************************************************************
2-
* Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
2+
* Copyright (C) 2020-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
33
* *
44
* This software is distributed under the terms of the *
55
* GNU Lesser General Public Licence (LGPL) version 3, *
@@ -16,18 +16,16 @@
1616
#ifndef FAIRTEVERACKS_H_
1717
#define FAIRTEVERACKS_H_
1818

19-
#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
20-
#include <RtypesCore.h> // for Double_t, Bool_t, kFALSE, Color_t
21-
#include <TEveElement.h> // for TEveElement
22-
#include <TNamed.h> // for TNamed
23-
#include <TString.h> // for TString
24-
#include "FairTask.h" // for InitStatus
25-
class FairEventManager; // lines 23-23
26-
class TBuffer;
27-
class TClass;
28-
class TEveTrackList; // lines 24-24
29-
class TMemberInspector;
19+
#include "FairTask.h" // for InitStatus
3020

21+
#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
22+
#include <RtypesCore.h> // for Double_t, Bool_t, kFALSE, Color_t
23+
#include <TEveElement.h> // for TEveElement
24+
#include <TEveTrack.h> // for TEveTrackList
25+
#include <TNamed.h> // for TNamed
26+
#include <TString.h> // for TString
27+
28+
class FairEventManager;
3129

3230
/**
3331
* base evelement that represents tracks
@@ -36,13 +34,13 @@ class FairEveTracks
3634
: public TEveElement
3735
, public TNamed
3836
{
39-
FairEventManager *fEventManager; //!
40-
Double_t fPt[2];
41-
Double_t fEta[2];
42-
Double_t fEnergy[2];
43-
Bool_t fUsePt;
44-
Bool_t fUseEta;
45-
Bool_t fUseEnergy;
37+
FairEventManager* fEventManager{nullptr}; //!
38+
Double_t fPt[2]{0, 10};
39+
Double_t fEta[2]{-10, 10};
40+
Double_t fEnergy[2]{0, 10};
41+
Bool_t fUsePt{kFALSE};
42+
Bool_t fUseEta{kFALSE};
43+
Bool_t fUseEnergy{kFALSE};
4644
const Bool_t fAcceptCompound;
4745

4846
protected:
@@ -69,7 +67,7 @@ class FairEveTracks
6967
*
7068
* @param acceptCompound use compound tracks in track list
7169
*/
72-
FairEveTracks(Bool_t acceptCompound = kFALSE);
70+
explicit FairEveTracks(Bool_t acceptCompound = kFALSE);
7371
/**
7472
* makes visible tracks not visible, hidden tracks become visible
7573
*/
@@ -119,8 +117,8 @@ class FairEveTracks
119117
*/
120118
virtual void Repaint() = 0;
121119
virtual InitStatus Init();
122-
virtual ~FairEveTracks();
123-
ClassDef(FairEveTracks, 0)
120+
~FairEveTracks() override;
121+
ClassDefOverride(FairEveTracks, 0)
124122
};
125123

126124
#endif /* FAIRTEVERACKS_H_ */

0 commit comments

Comments
 (0)