Skip to content

chore: Cleanup FairEveTracks #1401

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

Merged
merged 1 commit into from
May 23, 2023
Merged

chore: Cleanup FairEveTracks #1401

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
33 changes: 13 additions & 20 deletions fairroot/eventdisplay/tracks/FairEveTracks.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,33 @@
/********************************************************************************
* Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* Copyright (C) 2020-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
/*
* FairTracks.cxx
* FairEveTracks.cxx
*
* Created on: 4 maj 2020
* Author: Daniel Wielanek
* E-mail: [email protected]
* Warsaw University of Technology, Faculty of Physics
*/

#include "FairEveTracks.h"
#include <RtypesCore.h> // for kFALSE, kTRUE, Bool_t, Color_t
#include <TEveManager.h> // for TEveManager, gEve
#include <TEveTrack.h> // for TEveTrackList
#include <TEveTrackPropagator.h> // for TEveTrackPropagator
#include <TString.h> // for TString
#include <algorithm> // for for_each
#include <list> // for __list_iterator, operator!=
#include "FairEveRecoTrackList.h" // for FairEveRecoTrackList
#include "FairEventManager.h" // for FairEventManager
#include "FairEveTracks.h"

#include "FairEveRecoTrackList.h" // for FairEveRecoTrackList
#include "FairEventManager.h" // for FairEventManager

#include <RtypesCore.h> // for kFALSE, kTRUE, Bool_t, Color_t
#include <TEveManager.h> // for TEveManager, gEve
#include <TEveTrackPropagator.h> // for TEveTrackPropagator
#include <TString.h> // for TString
#include <algorithm> // for for_each
#include <list> // for __list_iterator, operator!=

FairEveTracks::FairEveTracks(Bool_t acceptCompound)
: fEventManager(nullptr)
, fPt{0, 10}
, fEta{-10, 10}
, fEnergy{0, 10}
, fUsePt(kFALSE)
, fUseEta(kFALSE)
, fUseEnergy(kFALSE)
, fAcceptCompound(acceptCompound)
: fAcceptCompound(acceptCompound)
{}

void FairEveTracks::ToggleTracks()
Expand Down
42 changes: 20 additions & 22 deletions fairroot/eventdisplay/tracks/FairEveTracks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* Copyright (C) 2020-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
Expand All @@ -16,18 +16,16 @@
#ifndef FAIRTEVERACKS_H_
#define FAIRTEVERACKS_H_

#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
#include <RtypesCore.h> // for Double_t, Bool_t, kFALSE, Color_t
#include <TEveElement.h> // for TEveElement
#include <TNamed.h> // for TNamed
#include <TString.h> // for TString
#include "FairTask.h" // for InitStatus
class FairEventManager; // lines 23-23
class TBuffer;
class TClass;
class TEveTrackList; // lines 24-24
class TMemberInspector;
#include "FairTask.h" // for InitStatus

#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
#include <RtypesCore.h> // for Double_t, Bool_t, kFALSE, Color_t
#include <TEveElement.h> // for TEveElement
#include <TEveTrack.h> // for TEveTrackList
#include <TNamed.h> // for TNamed
#include <TString.h> // for TString

class FairEventManager;

/**
* base evelement that represents tracks
Expand All @@ -36,13 +34,13 @@ class FairEveTracks
: public TEveElement
, public TNamed
{
FairEventManager *fEventManager; //!
Double_t fPt[2];
Double_t fEta[2];
Double_t fEnergy[2];
Bool_t fUsePt;
Bool_t fUseEta;
Bool_t fUseEnergy;
FairEventManager* fEventManager{nullptr}; //!
Double_t fPt[2]{0, 10};
Double_t fEta[2]{-10, 10};
Double_t fEnergy[2]{0, 10};
Bool_t fUsePt{kFALSE};
Bool_t fUseEta{kFALSE};
Bool_t fUseEnergy{kFALSE};
const Bool_t fAcceptCompound;

protected:
Expand All @@ -69,7 +67,7 @@ class FairEveTracks
*
* @param acceptCompound use compound tracks in track list
*/
FairEveTracks(Bool_t acceptCompound = kFALSE);
explicit FairEveTracks(Bool_t acceptCompound = kFALSE);
/**
* makes visible tracks not visible, hidden tracks become visible
*/
Expand Down Expand Up @@ -119,8 +117,8 @@ class FairEveTracks
*/
virtual void Repaint() = 0;
virtual InitStatus Init();
virtual ~FairEveTracks();
ClassDef(FairEveTracks, 0)
~FairEveTracks() override;
ClassDefOverride(FairEveTracks, 0)
};

#endif /* FAIRTEVERACKS_H_ */