Skip to content

Fix minor reproducibility issues in TPC hit creation #15846

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

Open
sawenzel wants to merge 2 commits into
base: dev
Choose a base branch
from
+25 −18
Open

Fix minor reproducibility issues in TPC hit creation #15846

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
8ace561
Reset the TPC hit grouping at the end of each event
sawenzel Sep 25, 2026
641b890
Count the charge of the buffered TPC hit in the electron counter
sawenzel Sep 25, 2026
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
4 changes: 4 additions & 0 deletions Detectors/TPC/simulation/include/TPCSimulation/Detector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ class Detector : public o2::base::DetImpl<Detector>
int mElectronCounter = 0;
int mStepCounter = 0;
ElementalHit mHitLast{}; ///<! buffer last processed hit to be able to fill it to mHitsPerSectorCollection
HitGroup* mCurrentGroup = nullptr; ///<! hit group currently being filled
int mOldTrackId = -1; ///<! track of the current hit group
int mOldSectorId = -1; ///<! sector of the current hit group
int mGroupCounter = 0; ///<! number of hits in the current hit group

/// Create the detector materials
virtual void CreateMaterials();
Expand Down
39 changes: 21 additions & 18 deletions Detectors/TPC/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ Bool_t Detector::ProcessHits(FairVolume* vol)

const float time = fMC->TrackTime() * 1.0e9;
const int trackID = fMC->GetStack()->GetCurrentTrackNumber();
const int detID = vol->getMCid();
o2::data::Stack* stack = (o2::data::Stack*)fMC->GetStack();
if (fMC->IsTrackEntering() || fMC->IsTrackExiting()) {
stack->addTrackReference(o2::TrackReference(position.X(), position.Y(), position.Z(), momentum.X(), momentum.Y(),
Expand Down Expand Up @@ -258,37 +257,38 @@ Bool_t Detector::ProcessHits(FairVolume* vol)
}

// ADD HIT
static thread_local int oldTrackId = trackID;
static thread_local int oldDetId = detID;
static thread_local int groupCounter = 0;
static thread_local int oldSectorId = sectorID;
// the first hit of an event starts the grouping afresh
if (!mCurrentGroup) {
mOldTrackId = trackID;
mOldSectorId = sectorID;
mGroupCounter = 0;
}

// a new group is starting -> put it into the container
static thread_local HitGroup* currentgroup = nullptr;
if (groupCounter == 0) {
if (mGroupCounter == 0) {
mHitsPerSectorCollection[sectorID]->emplace_back(trackID);
currentgroup = &(mHitsPerSectorCollection[sectorID]->back());
mCurrentGroup = &(mHitsPerSectorCollection[sectorID]->back());
}
if (trackID == oldTrackId && oldSectorId == sectorID) {
groupCounter++;
if (trackID == mOldTrackId && mOldSectorId == sectorID) {
mGroupCounter++;
mHitCounter++;
mElectronCounter += numberOfElectrons;
currentgroup->addHit(position.X(), position.Y(), position.Z(), time, numberOfElectrons);
mCurrentGroup->addHit(position.X(), position.Y(), position.Z(), time, numberOfElectrons);

// add last buffered hit, which was not yet added to the currentgroup
// add last buffered hit, which was not yet added to the current group
if (mHitLast.GetEnergyLoss() >= 0) {
currentgroup->addHit(mHitLast.GetX(), mHitLast.GetY(), mHitLast.GetZ(), mHitLast.GetTime(), mHitLast.GetEnergyLoss());
mHitLast.mELoss = -1;
groupCounter++;
mCurrentGroup->addHit(mHitLast.GetX(), mHitLast.GetY(), mHitLast.GetZ(), mHitLast.GetTime(), mHitLast.GetEnergyLoss());
mGroupCounter++;
mHitCounter++;
mElectronCounter += mHitLast.GetEnergyLoss();
mHitLast.mELoss = -1;
}
}
// finish group
else {
oldTrackId = trackID;
oldSectorId = sectorID;
groupCounter = 0;
mOldTrackId = trackID;
mOldSectorId = sectorID;
mGroupCounter = 0;

// buffer this hit, otherwise it wouldnt be stored in the HitGroup
mHitLast = ElementalHit(position.X(), position.Y(), position.Z(), time, numberOfElectrons);
Expand All @@ -310,6 +310,9 @@ Bool_t Detector::ProcessHits(FairVolume* vol)

void Detector::EndOfEvent()
{
// the hit grouping must not carry over into the next event
mCurrentGroup = nullptr;
mHitLast.mELoss = -1;
if (!o2::utils::ShmManager::Instance().isOperational()) {
for (int i = 0; i < Sector::MAXSECTOR; ++i) {
mHitsPerSectorCollection[i]->clear();
Expand Down
Loading