Skip to content

Redefing BasicXYZVHit::mDetectorID from short to ushort #14760

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
sawenzel merged 1 commit into from
Oct 23, 2025
Merged

Redefing BasicXYZVHit::mDetectorID from short to ushort #14760

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
8 changes: 4 additions & 4 deletions DataFormats/simulation/include/SimulationDataFormat/BaseHits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class BasicXYZVHit : public BaseHit
BasicXYZVHit() = default; // for ROOT IO

// constructor
BasicXYZVHit(T x, T y, T z, E time, V val, int trackid, short did)
BasicXYZVHit(T x, T y, T z, E time, V val, int trackid, unsigned short did)
: mPos(x, y, z), mTime(time), mHitValue(val), BaseHit(trackid), mDetectorID(did)
{
}
Expand All @@ -70,12 +70,12 @@ class BasicXYZVHit : public BaseHit
// getting the time
E GetTime() const { return mTime; }
// get detector + track information
short GetDetectorID() const { return mDetectorID; }
unsigned short GetDetectorID() const { return mDetectorID; }

// modifiers
void SetTime(E time) { mTime = time; }
void SetHitValue(V val) { mHitValue = val; }
void SetDetectorID(short detID) { mDetectorID = detID; }
void SetDetectorID(unsigned short detID) { mDetectorID = detID; }
void SetX(T x) { mPos.SetX(x); }
void SetY(T y) { mPos.SetY(y); }
void SetZ(T z) { mPos.SetZ(z); }
Expand All @@ -87,7 +87,7 @@ class BasicXYZVHit : public BaseHit
}
void SetPos(math_utils::Point3D<T> const& p) { mPos = p; }

ClassDefNV(BasicXYZVHit, 1);
ClassDefNV(BasicXYZVHit, 2);
};

// Class for a hit containing energy loss as hit value
Expand Down
2 changes: 1 addition & 1 deletion Detectors/ITSMFT/common/simulation/src/Digitizer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ void Digitizer::fillOutputContainer(uint32_t frameLast)
void Digitizer::processHit(const o2::itsmft::Hit& hit, uint32_t& maxFr, int evID, int srcID)
{
// convert single hit to digits
int chipID = hit.GetDetectorID();
auto chipID = hit.GetDetectorID();
auto& chip = mChips[chipID];
if (chip.isDisabled()) {
LOG(debug) << "skip disabled chip " << chipID;
Expand Down
2 changes: 1 addition & 1 deletion Detectors/Upgrades/ITS3/simulation/src/Digitizer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ void Digitizer::fillOutputContainer(uint32_t frameLast)
void Digitizer::processHit(const o2::itsmft::Hit& hit, uint32_t& maxFr, int evID, int srcID)
{
// convert single hit to digits
int chipID = hit.GetDetectorID();
auto chipID = hit.GetDetectorID();
auto& chip = mChips[chipID];
if (chip.isDisabled()) {
return;
Expand Down