Skip to content

commit for associating the FPHXBCO and INTT_long_BCO information with TrkrHit #4238

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
ChengWeiShih wants to merge 2 commits into
base: master
Choose a base branch
from
Open

commit for associating the FPHXBCO and INTT_long_BCO information with TrkrHit #4238

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
b63099b
commit for associating the FPHXBCO and INTT_long_BCO information to T…
Mar 31, 2026
2a198c1
Merge branch 'sPHENIX-Collaboration:master' into CarryOverHitStream
ChengWeiShih Mar 31, 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
2 changes: 2 additions & 0 deletions offline/packages/intt/InttCombinedRawDataDecoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,8 @@ int InttCombinedRawDataDecoder::process_event(PHCompositeNode* topNode)
hit = new TrkrHitv2;
//--hit->setAdc(adc);
hit->setAdc(dac);
hit->setFPHXBCO(intthit->get_FPHX_BCO());
hit->setBCO(intthit->get_bco());
hit_set_container_itr->second->addHitSpecificKey(hit_key, hit);
}

Expand Down
8 changes: 8 additions & 0 deletions offline/packages/trackbase/TrkrHit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <phool/PHObject.h>

#include <cstdint>
#include <climits>
#include <cmath>
#include <iostream>
Expand Down Expand Up @@ -55,6 +56,13 @@ class TrkrHit : public PHObject
// after digitization, these are the adc values
virtual void setAdc(const unsigned int) {}
virtual unsigned int getAdc() const { return 0; }

// optional per-hit timing payload used by detectors that need to retain
// the frontend bunch-counter value alongside the digitized hit.
virtual void setFPHXBCO(const uint16_t) {}
virtual uint16_t getFPHXBCO() const { return 0; }
virtual void setBCO(const uint64_t) {}
virtual uint64_t getBCO() const { return 0; }
/*
virtual void setCrossing(const short int) {}
virtual short int getCrossing() { return 0;}
Expand Down
2 changes: 2 additions & 0 deletions offline/packages/trackbase/TrkrHitv1.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ void TrkrHitv1::CopyFrom(const TrkrHit& source)

// copy adc
setAdc(source.getAdc());
setFPHXBCO(source.getFPHXBCO());
setBCO(source.getBCO());
}

unsigned int TrkrHitv1::getAdc() const
Expand Down
12 changes: 10 additions & 2 deletions offline/packages/trackbase/TrkrHitv1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ class TrkrHitv1 : public TrkrHit
// PHObject virtual overloads
void identify(std::ostream& os = std::cout) const override
{
os << "TrkrHitV1 class with adc = " << m_adc << std::endl;
os << "TrkrHitV1 class with adc = " << m_adc
<< " and FPHX_BCO = " << m_fphx_bco
<< " and BCO = " << m_bco << std::endl;
}
void Reset() override {}
int isValid() const override { return 0; }
Expand All @@ -49,11 +51,17 @@ class TrkrHitv1 : public TrkrHit
double getEnergy() const override { return m_edep; }
void setAdc(const unsigned int adc) override { m_adc = adc; }
unsigned int getAdc() const override;
void setFPHXBCO(const uint16_t bco) override { m_fphx_bco = bco; }
uint16_t getFPHXBCO() const override { return m_fphx_bco; }
void setBCO(const uint64_t bco) override { m_bco = bco; }
uint64_t getBCO() const override { return m_bco; }

protected:
double m_edep = 0;
unsigned int m_adc = 0;
ClassDefOverride(TrkrHitv1, 1);
uint16_t m_fphx_bco = 0;
uint64_t m_bco = 0;
ClassDefOverride(TrkrHitv1, 3);
};

#endif // TRACKBASE_TRKRHITV1_H
2 changes: 2 additions & 0 deletions offline/packages/trackbase/TrkrHitv2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ void TrkrHitv2::CopyFrom(const TrkrHit& source)

// copy adc
setAdc(source.getAdc());
setFPHXBCO(source.getFPHXBCO());
setBCO(source.getBCO());
}

// these set and get the energy before digitization
Expand Down
12 changes: 10 additions & 2 deletions offline/packages/trackbase/TrkrHitv2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ class TrkrHitv2 : public TrkrHit
// PHObject virtual overloads
void identify(std::ostream& os = std::cout) const override
{
os << "TrkrHitv2 class with adc = " << m_adc << std::endl;
os << "TrkrHitv2 class with adc = " << m_adc
<< " and FPHX_BCO = " << m_fphx_bco
<< " and BCO = " << m_bco << std::endl;
}
void Reset() override {}
int isValid() const override { return 0; }
Expand All @@ -57,10 +59,16 @@ class TrkrHitv2 : public TrkrHit
// after digitization, these are the adc values
void setAdc(const unsigned int adc) override;
unsigned int getAdc() const override;
void setFPHXBCO(const uint16_t bco) override { m_fphx_bco = bco; }
uint16_t getFPHXBCO() const override { return m_fphx_bco; }
void setBCO(const uint64_t bco) override { m_bco = bco; }
uint64_t getBCO() const override { return m_bco; }

protected:
unsigned short m_adc = 0;
ClassDefOverride(TrkrHitv2, 1);
uint16_t m_fphx_bco = 0;
uint64_t m_bco = 0;
ClassDefOverride(TrkrHitv2, 3);
};

#endif // TRACKBASE_TRKRHITV2_H