Skip to content

Add type for HGC/CALOROC output #101

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

Add type for HGC/CALOROC output #101

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b921de7
Add type for HGCROC output
ruse-traveler Feb 9, 2025
8353464
Merge branch 'main' into add-hgcroc-digitization
ruse-traveler Mar 17, 2025
c866c34
Make ToT a vector of samples, and rename to CALOROC
ruse-traveler Mar 17, 2025
95e6f97
Make AMPLITUDE (not ToT) vector, add phase of samples
ruse-traveler Mar 17, 2025
e638c94
Add 1A/AB distinction
ruse-traveler Apr 1, 2025
0b5f271
Upgrade ToA or ToT to vector members
ruse-traveler Apr 1, 2025
85ae8ad
Add Sylvester and Norbert to authors, fix time units
ruse-traveler Apr 8, 2025
55fff88
Fix typo, make units consistent
ruse-traveler Apr 10, 2025
75f0537
Make units consistent
ruse-traveler Apr 10, 2025
5a6441d
Make units consistent
ruse-traveler Apr 10, 2025
6fa9bf5
Make units consistent
ruse-traveler Apr 10, 2025
1a41810
Make non-time-related fields unsigned ints
ruse-traveler Apr 29, 2025
6397ca3
Update edm4eic.yaml
veprbl May 2, 2025
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
21 changes: 21 additions & 0 deletions edm4eic.yaml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having just fixed a whole bunch of signed/unsigned comparisons, can we please use unsigned ints where appropriate?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point! Most of these can be uint32_ts...

Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,27 @@ datatypes:
## ==========================================================================
## Calorimetry
## ==========================================================================

edm4eic::RawCALOROCHit:
Description: "Raw hit from a CALOROC/HGCROC chip"
Author: "D. Anderson, S. Joosten, N. Novitzky"
Members:
- uint32_t type // Chip type, 0 - type 1A, 1 - type 1B
- uint64_t cellID // Detector specific (geometrical) cell id
- int32_t samplePhase // Phase of samples in [# samples], for synchronizing across chips
- int32_t timeStamp // [TDC counts]
VectorMembers:
- uint32_t amplitude // Iff type == 0, amplitudes of waveform are stored here [ADC counts]
- uint32_t lowGainAmplitude // Iff type == 1, low gain amplitudes of waveform are stored here [ADC counts]
- uint32_t highGainAmplitude // Iff type == 1, high gain amplitudes of waveform are stored here [ADC counts]
- int32_t timeOfArrival // Calculated times of arrival [TDC counts]
- int32_t timeOverThreshold // Calculated times over threshold [TDC counts]
ExtraCode:
declaration: "
bool isType1A() const {return getType() == 0;}\n
bool isType1B() const {return getType() == 1;}\n
"

edm4eic::CalorimeterHit:
Description: "Calorimeter hit"
Author: "W. Armstrong, S. Joosten"
Expand Down