Skip to content

feat(FairGenericStack): Provide better default functions #1585

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
ChristianTackeGSI merged 2 commits into from
Sep 19, 2024
Merged

feat(FairGenericStack): Provide better default functions #1585

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
9676612
feat(Base): Improve FairGenericStack::Reset
ChristianTackeGSI Sep 10, 2024
23a39ba
feat(FairGenericStack): Provide basic current track handling
ChristianTackeGSI Sep 14, 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
13 changes: 6 additions & 7 deletions examples/common/mcstack/FairStack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ FairStack::FairStack(Int_t size)
, fStoreMap()
, fIndexMap()
, fPointsMap()
, fCurrentTrack(-1)
, fNPrimaries(0)
, fNParticles(0)
, fNTracks(0)
Expand Down Expand Up @@ -149,8 +148,9 @@ TParticle* FairStack::PopNextTrack(Int_t& iTrack)
return nullptr;
}

fCurrentTrack = thisParticle->GetStatusCode();
iTrack = fCurrentTrack;
const auto currentTrack = thisParticle->GetStatusCode();
SetCurrentTrack(currentTrack);
iTrack = currentTrack;

return thisParticle;
}
Expand All @@ -177,7 +177,7 @@ TParticle* FairStack::PopPrimaryForTracking(Int_t iPrim)

TParticle* FairStack::GetCurrentTrack() const
{
TParticle* currentPart = GetParticle(fCurrentTrack);
TParticle* currentPart = GetParticle(FairGenericStack::GetCurrentTrackNumber());
if (!currentPart) {
LOG(warn) << "Current track not found in stack!";
}
Expand Down Expand Up @@ -239,7 +239,7 @@ void FairStack::FillTrackArray()

Int_t FairStack::GetCurrentTrackNumber() const
{
return FSTrackMapLookup(fCurrentTrack);
return FSTrackMapLookup(FairGenericStack::GetCurrentTrackNumber());
}

void FairStack::UpdateTrackIndex(TRefArray* detList)
Expand Down Expand Up @@ -302,15 +302,14 @@ void FairStack::UpdateTrackIndex(TRefArray* detList)
void FairStack::Reset()
{
fIndex = 0;
fCurrentTrack = -1;
fNPrimaries = fNParticles = fNTracks = 0;
while (!fStack.empty()) {
fStack.pop();
}
fParticles->Clear();
fTracks->Clear();
fFSTrackMap.clear();
fPointsMap.clear();
FairGenericStack::Reset();
}

void FairStack::Register()
Expand Down
7 changes: 0 additions & 7 deletions examples/common/mcstack/FairStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,6 @@ class FairStack : public FairGenericStack
**/
TParticle* PopPrimaryForTracking(Int_t iPrim) override;

/** Set the current track number
** Declared in TVirtualMCStack
*@param iTrack track number
**/
void SetCurrentTrack(Int_t iTrack) override { fCurrentTrack = iTrack; }

/** Get total number of tracks
** Declared in TVirtualMCStack
**/
Expand Down Expand Up @@ -241,7 +235,6 @@ class FairStack : public FairGenericStack
std::map<std::pair<Int_t, Int_t>, Int_t> fPointsMap; //!

/** Some indizes and counters **/
Int_t fCurrentTrack; //! Index of current track
Int_t fNPrimaries; //! Number of primary particles
Int_t fNParticles; //! Number of entries in fParticles
Int_t fNTracks; //! Number of entries in fTracks
Expand Down
20 changes: 19 additions & 1 deletion fairroot/base/sim/FairGenericStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,17 @@ class FairGenericStack : public TVirtualMCStack
*/
Int_t GetCurrentTrackID() const { return GetCurrentTrackNumber(); }

/** Set the current track number
** Declared in TVirtualMCStack
*@param iTrack track number
**/
void SetCurrentTrack(Int_t iTrack) override { fCurrentTrack = iTrack; }

/** Get the number of the current track
** Declared in TVirtualMCStack
**/
Int_t GetCurrentTrackNumber() const override { return fCurrentTrack; }

/** Virtual method PushTrack.
** Add a TParticle to the stack.
** This function has an extra argument wrt to the function defined in the base class.
Expand Down Expand Up @@ -98,7 +109,11 @@ class FairGenericStack : public TVirtualMCStack
virtual void FinishPrimary() {}

/** Resets arrays and stack and deletes particles and tracks **/
virtual void Reset() {}
virtual void Reset()
{
fCurrentTrack = -1;
fFSTrackMap.clear();
}

/** Register the MCTrack array to the Root Manager **/
virtual void Register() {}
Expand Down Expand Up @@ -212,6 +227,9 @@ class FairGenericStack : public TVirtualMCStack
return track;
}

private:
Int_t fCurrentTrack{-1}; //!< Index of current track

ClassDefOverride(FairGenericStack, 1);
};

Expand Down
15 changes: 7 additions & 8 deletions templates/project_root_containers/MyProjData/MyProjStack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (C) 2014-2023 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 @@ -45,7 +45,6 @@ MyProjStack::MyProjStack(Int_t size)
, fIndexMap()
, fIndexIter()
, fPointsMap()
, fCurrentTrack(-1)
, fNPrimaries(0)
, fNParticles(0)
, fNTracks(0)
Expand All @@ -68,7 +67,6 @@ MyProjStack::MyProjStack(const MyProjStack& right)
, fIndexMap()
, fIndexIter()
, fPointsMap()
, fCurrentTrack()
, fNPrimaries()
, fNParticles()
, fNTracks()
Expand Down Expand Up @@ -187,8 +185,9 @@ TParticle* MyProjStack::PopNextTrack(Int_t& iTrack)
return NULL;
}

fCurrentTrack = thisParticle->GetStatusCode();
iTrack = fCurrentTrack;
const auto currentTrack = thisParticle->GetStatusCode();
SetCurrentTrack(currentTrack);
iTrack = currentTrack;

return thisParticle;
}
Expand Down Expand Up @@ -220,7 +219,7 @@ TParticle* MyProjStack::PopPrimaryForTracking(Int_t iPrim)
// ----- Virtual public method GetCurrentTrack -------------------------
TParticle* MyProjStack::GetCurrentTrack() const
{
TParticle* currentPart = GetParticle(fCurrentTrack);
TParticle* currentPart = GetParticle(GetCurrentTrackNumber());
if (!currentPart) {
LOG(warning) << "MyProjStack: Current track not found in stack!";
}
Expand Down Expand Up @@ -342,14 +341,14 @@ void MyProjStack::UpdateTrackIndex(TRefArray* detList)
void MyProjStack::Reset()
{
fIndex = 0;
fCurrentTrack = -1;
fNPrimaries = fNParticles = fNTracks = 0;
while (!fStack.empty()) {
fStack.pop();
}
fParticles->Clear();
fTracks->Clear();
fPointsMap.clear();
FairGenericStack::Reset();
}
// -------------------------------------------------------------------------

Expand Down Expand Up @@ -383,7 +382,7 @@ void MyProjStack::AddPoint(DetectorId detId)
{
Int_t iDet = detId;
// cout << "Add point for Detektor" << iDet << endl;
pair<Int_t, Int_t> a(fCurrentTrack, iDet);
pair<Int_t, Int_t> a(GetCurrentTrackID(), iDet);
if (fPointsMap.find(a) == fPointsMap.end()) {
fPointsMap[a] = 1;
} else {
Expand Down
12 changes: 0 additions & 12 deletions templates/project_root_containers/MyProjData/MyProjStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,6 @@ class MyProjStack : public FairGenericStack
**/
virtual TParticle* PopPrimaryForTracking(Int_t iPrim);

/** Set the current track number
** Declared in TVirtualMCStack
*@param iTrack track number
**/
virtual void SetCurrentTrack(Int_t iTrack) { fCurrentTrack = iTrack; }

/** Get total number of tracks
** Declared in TVirtualMCStack
**/
Expand All @@ -146,11 +140,6 @@ class MyProjStack : public FairGenericStack
**/
virtual TParticle* GetCurrentTrack() const;

/** Get the number of the current track
** Declared in TVirtualMCStack
**/
virtual Int_t GetCurrentTrackNumber() const { return fCurrentTrack; }

/** Get the track number of the parent of the current track
** Declared in TVirtualMCStack
**/
Expand Down Expand Up @@ -224,7 +213,6 @@ class MyProjStack : public FairGenericStack
std::map<std::pair<Int_t, Int_t>, Int_t> fPointsMap; //!

/** Some indizes and counters **/
Int_t fCurrentTrack; //! Index of current track
Int_t fNPrimaries; //! Number of primary particles
Int_t fNParticles; //! Number of entries in fParticles
Int_t fNTracks; //! Number of entries in fTracks
Expand Down
15 changes: 7 additions & 8 deletions templates/project_stl_containers/MyProjData/MyProjStack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (C) 2014-2023 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 @@ -45,7 +45,6 @@ MyProjStack::MyProjStack(Int_t size)
, fIndexMap()
, fIndexIter()
, fPointsMap()
, fCurrentTrack(-1)
, fNPrimaries(0)
, fNParticles(0)
, fNTracks(0)
Expand All @@ -68,7 +67,6 @@ MyProjStack::MyProjStack(const MyProjStack& right)
, fIndexMap()
, fIndexIter()
, fPointsMap()
, fCurrentTrack()
, fNPrimaries()
, fNParticles()
, fNTracks()
Expand Down Expand Up @@ -187,8 +185,9 @@ TParticle* MyProjStack::PopNextTrack(Int_t& iTrack)
return NULL;
}

fCurrentTrack = thisParticle->GetStatusCode();
iTrack = fCurrentTrack;
const auto currentTrack = thisParticle->GetStatusCode();
SetCurrentTrack(currentTrack);
iTrack = currentTrack;

return thisParticle;
}
Expand Down Expand Up @@ -220,7 +219,7 @@ TParticle* MyProjStack::PopPrimaryForTracking(Int_t iPrim)
// ----- Virtual public method GetCurrentTrack -------------------------
TParticle* MyProjStack::GetCurrentTrack() const
{
TParticle* currentPart = GetParticle(fCurrentTrack);
TParticle* currentPart = GetParticle(GetCurrentTrackNumber());
if (!currentPart) {
LOG(warning) << "MyProjStack: Current track not found in stack!";
}
Expand Down Expand Up @@ -347,14 +346,14 @@ void MyProjStack::UpdateTrackIndex(TRefArray* detList)
void MyProjStack::Reset()
{
fIndex = 0;
fCurrentTrack = -1;
fNPrimaries = fNParticles = fNTracks = 0;
while (!fStack.empty()) {
fStack.pop();
}
fParticles->Clear();
fTracks->Clear();
fPointsMap.clear();
FairGenericStack::Reset();
}
// -------------------------------------------------------------------------

Expand Down Expand Up @@ -388,7 +387,7 @@ void MyProjStack::AddPoint(DetectorId detId)
{
Int_t iDet = detId;
// cout << "Add point for Detektor" << iDet << endl;
pair<Int_t, Int_t> a(fCurrentTrack, iDet);
pair<Int_t, Int_t> a(GetCurrentTrackID(), iDet);
if (fPointsMap.find(a) == fPointsMap.end()) {
fPointsMap[a] = 1;
} else {
Expand Down
12 changes: 0 additions & 12 deletions templates/project_stl_containers/MyProjData/MyProjStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,6 @@ class MyProjStack : public FairGenericStack
**/
virtual TParticle* PopPrimaryForTracking(Int_t iPrim);

/** Set the current track number
** Declared in TVirtualMCStack
*@param iTrack track number
**/
virtual void SetCurrentTrack(Int_t iTrack) { fCurrentTrack = iTrack; }

/** Get total number of tracks
** Declared in TVirtualMCStack
**/
Expand All @@ -146,11 +140,6 @@ class MyProjStack : public FairGenericStack
**/
virtual TParticle* GetCurrentTrack() const;

/** Get the number of the current track
** Declared in TVirtualMCStack
**/
virtual Int_t GetCurrentTrackNumber() const { return fCurrentTrack; }

/** Get the track number of the parent of the current track
** Declared in TVirtualMCStack
**/
Expand Down Expand Up @@ -224,7 +213,6 @@ class MyProjStack : public FairGenericStack
std::map<std::pair<Int_t, Int_t>, Int_t> fPointsMap; //!

/** Some indizes and counters **/
Int_t fCurrentTrack; //! Index of current track
Int_t fNPrimaries; //! Number of primary particles
Int_t fNParticles; //! Number of entries in fParticles
Int_t fNTracks; //! Number of entries in fTracks
Expand Down