Skip to content
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

Jump to bottom

chore(templates/Stack): Add override #1592

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

chore(templates/Stack): Add override #1592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7865555
chore(templates/Stack): Add override
ChristianTackeGSI Sep 30, 2024
5769b5a
refactor(Stack): Use more GetParticle
ChristianTackeGSI Sep 30, 2024
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
2 changes: 1 addition & 1 deletion examples/common/mcstack/FairStack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ TParticle* FairStack::PopPrimaryForTracking(Int_t iPrim)

// Return the iPrim-th TParticle from the fParticle array. This should be
// a primary.
TParticle* part = static_cast<TParticle*>(fParticles->At(iPrim));
TParticle* part = GetParticle(iPrim);
if (!(part->GetMother(0) < 0)) {
LOG(fatal) << "Not a primary track!" << iPrim;
}
Expand Down
4 changes: 2 additions & 2 deletions templates/project_root_containers/MyProjData/MyProjStack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ TParticle* MyProjStack::PopPrimaryForTracking(Int_t iPrim)

// Return the iPrim-th TParticle from the fParticle array. This should be
// a primary.
TParticle* part = (TParticle*)fParticles->At(iPrim);
TParticle* part = GetParticle(iPrim);
if (!(part->GetMother(0) < 0)) {
LOG(fatal) << "MyProjStack:: Not a primary track! " << iPrim;
}
Expand Down Expand Up @@ -425,7 +425,7 @@ TParticle* MyProjStack::GetParticle(Int_t trackID) const
if (trackID < 0 || trackID >= fNParticles) {
LOG(fatal) << "MyProjStack: Particle index " << trackID << " out of range.";
}
return (TParticle*)fParticles->At(trackID);
return static_cast<TParticle*>(fParticles->At(trackID));
}
// -------------------------------------------------------------------------

Expand Down
106 changes: 53 additions & 53 deletions templates/project_root_containers/MyProjData/MyProjStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
Expand Down Expand Up @@ -55,7 +55,7 @@ class MyProjStack : public FairGenericStack
MyProjStack(Int_t size = 100);

/** Destructor **/
virtual ~MyProjStack();
~MyProjStack() override;

/** Add a TParticle to the stack.
** Declared in TVirtualMCStack
Expand All @@ -72,93 +72,93 @@ class MyProjStack : public FairGenericStack
*@param weight Particle weight
*@param is Generation status code (whatever that means)
**/
virtual void PushTrack(Int_t toBeDone,
Int_t parentID,
Int_t pdgCode,
Double_t px,
Double_t py,
Double_t pz,
Double_t e,
Double_t vx,
Double_t vy,
Double_t vz,
Double_t time,
Double_t polx,
Double_t poly,
Double_t polz,
TMCProcess proc,
Int_t& ntr,
Double_t weight,
Int_t is);

virtual void PushTrack(Int_t toBeDone,
Int_t parentID,
Int_t pdgCode,
Double_t px,
Double_t py,
Double_t pz,
Double_t e,
Double_t vx,
Double_t vy,
Double_t vz,
Double_t time,
Double_t polx,
Double_t poly,
Double_t polz,
TMCProcess proc,
Int_t& ntr,
Double_t weight,
Int_t is,
Int_t secondParentId);
void PushTrack(Int_t toBeDone,
Int_t parentID,
Int_t pdgCode,
Double_t px,
Double_t py,
Double_t pz,
Double_t e,
Double_t vx,
Double_t vy,
Double_t vz,
Double_t time,
Double_t polx,
Double_t poly,
Double_t polz,
TMCProcess proc,
Int_t& ntr,
Double_t weight,
Int_t is) override;

void PushTrack(Int_t toBeDone,
Int_t parentID,
Int_t pdgCode,
Double_t px,
Double_t py,
Double_t pz,
Double_t e,
Double_t vx,
Double_t vy,
Double_t vz,
Double_t time,
Double_t polx,
Double_t poly,
Double_t polz,
TMCProcess proc,
Int_t& ntr,
Double_t weight,
Int_t is,
Int_t secondParentId) override;

/** Get next particle for tracking from the stack.
** Declared in TVirtualMCStack
*@param iTrack index of popped track (return)
*@return Pointer to the TParticle of the track
**/
virtual TParticle* PopNextTrack(Int_t& iTrack);
TParticle* PopNextTrack(Int_t& iTrack) override;

/** Get primary particle by index for tracking from stack
** Declared in TVirtualMCStack
*@param iPrim index of primary particle
*@return Pointer to the TParticle of the track
**/
virtual TParticle* PopPrimaryForTracking(Int_t iPrim);
TParticle* PopPrimaryForTracking(Int_t iPrim) override;

/** Get total number of tracks
** Declared in TVirtualMCStack
**/
virtual Int_t GetNtrack() const { return fNParticles; }
Int_t GetNtrack() const override { return fNParticles; }

/** Get number of primary tracks
** Declared in TVirtualMCStack
**/
virtual Int_t GetNprimary() const { return fNPrimaries; }
Int_t GetNprimary() const override { return fNPrimaries; }

/** Get the current track's particle
** Declared in TVirtualMCStack
**/
virtual TParticle* GetCurrentTrack() const;
TParticle* GetCurrentTrack() const override;

/** Get the track number of the parent of the current track
** Declared in TVirtualMCStack
**/
virtual Int_t GetCurrentParentTrackNumber() const;
Int_t GetCurrentParentTrackNumber() const override;

/** Add a TParticle to the fParticles array **/
virtual void AddParticle(TParticle* part);

/** Fill the MCTrack output array, applying filter criteria **/
virtual void FillTrackArray();
void FillTrackArray() override;

/** Update the track index in the MCTracks and MCPoints **/
virtual void UpdateTrackIndex(TRefArray* detArray = 0);
void UpdateTrackIndex(TRefArray* detArray = 0) override;

/** Resets arrays and stack and deletes particles and tracks **/
virtual void Reset();
void Reset() override;

/** Register the MCTrack array to the Root Manager **/
virtual void Register();
void Register() override;

/** Output to screen
**@param iVerbose: 0=events summary, 1=track info
Expand All @@ -184,10 +184,10 @@ class MyProjStack : public FairGenericStack

/** Accessors **/
TParticle* GetParticle(Int_t trackId) const;
TClonesArray* GetListOfParticles() { return fParticles; }
TClonesArray* GetListOfParticles() override { return fParticles; }

/** Clone this object (used in MT mode only) */
virtual FairGenericStack* CloneStack() const { return new MyProjStack(*this); }
FairGenericStack* CloneStack() const override { return new MyProjStack(*this); }

private:
/** STL stack (FILO) used to handle the TParticles for tracking **/
Expand Down Expand Up @@ -230,7 +230,7 @@ class MyProjStack : public FairGenericStack
MyProjStack(const MyProjStack&);
MyProjStack& operator=(const MyProjStack&);

ClassDef(MyProjStack, 1);
ClassDefOverride(MyProjStack, 1);
};

#endif
4 changes: 2 additions & 2 deletions templates/project_stl_containers/MyProjData/MyProjStack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ TParticle* MyProjStack::PopPrimaryForTracking(Int_t iPrim)

// Return the iPrim-th TParticle from the fParticle array. This should be
// a primary.
TParticle* part = (TParticle*)fParticles->At(iPrim);
TParticle* part = GetParticle(iPrim);
if (!(part->GetMother(0) < 0)) {
LOG(fatal) << "MyProjStack:: Not a primary track! " << iPrim;
}
Expand Down Expand Up @@ -430,7 +430,7 @@ TParticle* MyProjStack::GetParticle(Int_t trackID) const
if (trackID < 0 || trackID >= fNParticles) {
LOG(fatal) << "MyProjStack: Particle index " << trackID << " out of range.";
}
return (TParticle*)fParticles->At(trackID);
return static_cast<TParticle*>(fParticles->At(trackID));
}
// -------------------------------------------------------------------------

Expand Down
Loading
Loading