Skip to content

feat: QADB binning support#770

Merged
baltzell merged 32 commits intodevelopmentfrom
scaler-seq-sampling
Sep 11, 2025
Merged

feat: QADB binning support#770
baltzell merged 32 commits intodevelopmentfrom
scaler-seq-sampling

Conversation

@c-dilks
Copy link
Member

@c-dilks c-dilks commented Aug 1, 2025 •
edited
Loading

features:

  • new classes to support QADB binning
    • QadbBin: a single QADB bin
    • QadbBinSequence: a sequence of QadbBins
  • both new classes are generic, allowing a QadbBin to hold any arbitrary data
  • both classes inherit from DaqScalersSequence since:
    • QadbBin is a sequence of scalers within that bin; the first and last scalers are the bin boundaries
    • QadbBinSequence is a sequence of scalers at the bin boundaries
    • Both of these are subsequences of the original DaqScalersSequence
    • inheritance from DaqScalersSequence is preferred over encapsulation, for cleaner access to protected members without exposing them publicly; furthermore, both QadbBin and QadbBinSequence are fundamentally sequences of scalers, therefore they are "specializations" of DaqScalerSequence

purpose:

  • upstream QADB binning implementation out of clas12-timeline and make use of DaqScalersSequence
  • use it in clas12-timeline with refactor: use DaqScalersSequence from coatjava to generate QA bins clas12-timeline#367
    • see this PR's description for comparison test results
  • this is the first step toward refactoring the "high-level physics" QA timelines to be consistent with the usual "detector" timelines
  • now "anything" could be done in QADB bins, if wanted

@c-dilks c-dilks force-pushed the scaler-seq-sampling branch from 093adb5 to a3f1a1f Compare August 5, 2025 17:35
@c-dilks c-dilks changed the title feat: downsampling of DaqScalersSequence and additional FC charge calculation methods feat: additional FC charge calculation method for RG-A Spring 2018, and QADB production support Aug 6, 2025
@c-dilks c-dilks force-pushed the scaler-seq-sampling branch 2 times, most recently from 2ad63f5 to 1783cce Compare August 8, 2025 19:41
@c-dilks c-dilks force-pushed the scaler-seq-sampling branch 2 times, most recently from 67e826d to 31d383f Compare August 27, 2025 16:24
@c-dilks c-dilks changed the title feat: additional FC charge calculation method for RG-A Spring 2018, and QADB production support feat: QADB binning support Aug 27, 2025
c-dilks
c-dilks commented Aug 28, 2025
View reviewed changes
@c-dilks c-dilks mentioned this pull request Aug 29, 2025
Merged
@c-dilks
Copy link
Member Author

c-dilks commented Aug 29, 2025

Verified that this PR (with this one) returns the exact same results as before, for run 17575.

c-dilks added 20 commits September 3, 2025 17:36
@c-dilks
feat: downsampling
fc1ec34
@c-dilks
feat: test wrapper
f0e9f7f
@c-dilks
feat: write charge comparison table
bfa5202
@c-dilks
feat: initial correction implementation
14c87ed
@c-dilks
fix: need protected default constructor for inheritance
fdfdeff
@c-dilks
refactor: separate readSequence event loop to a protected method
780eb7a 
so that a derived class can use it
@c-dilks
fix: cleanup, since downsampling moved downstream
d99544e
@c-dilks
feat: store event number
6f0ad00
@c-dilks
feat: QADB binning classes
b1eb7d0
@c-dilks
feat: some example code
2f9e177
@c-dilks
feat: general coatjava script
3cd9b27
@c-dilks
fix: start convincing this stuff to work
45e89f3
@c-dilks
fix: fencepost error, and missing event number
853c17e
@c-dilks
feat: handle charge
a1339be
@c-dilks
feat: get charge extrema
c2afbd3
@c-dilks
feat: support RG-D charge override
8b44ea4
@c-dilks
feat: sugar
e5a017d
@c-dilks
refactor: organize methods
c93eaa2
@c-dilks
fix: spelling
9551c00
@c-dilks
fix: +1
0a12c48
@c-dilks c-dilks force-pushed the scaler-seq-sampling branch from 4876b9c to a2ef191 Compare September 4, 2025 19:53
@c-dilks
Copy link
Member Author

c-dilks commented Sep 9, 2025

For more detailed testing results, see JeffersonLab/clas12-timeline#367

/ready

@c-dilks c-dilks marked this pull request as ready for review September 9, 2025 16:38
@c-dilks c-dilks enabled auto-merge (squash) September 9, 2025 16:38
@baltzell baltzell disabled auto-merge September 11, 2025 22:26
@baltzell baltzell enabled auto-merge (squash) September 11, 2025 22:26
@baltzell baltzell disabled auto-merge September 11, 2025 22:28
@baltzell baltzell mentioned this pull request Sep 11, 2025
Closed
@c-dilks
Copy link
Member Author

c-dilks commented Sep 11, 2025

This should be squash merged. I have been "backmerging" (merge development -> this branch) to keep it up-to-date, since rebasing is too difficult. Squash merging will keep the history linear on development, and reduce all commits (including backmerge commits) to a single new commit.

@baltzell baltzell enabled auto-merge (squash) September 11, 2025 23:14
@baltzell baltzell merged commit df98aa9 into development Sep 11, 2025
30 checks passed
@c-dilks c-dilks deleted the scaler-seq-sampling branch September 11, 2025 23:19
c-dilks added a commit that referenced this pull request Sep 15, 2025
@c-dilks
feat: QADB binning support (#770)
ba38dfc 
* feat: downsampling

* feat: test wrapper

* feat: write charge comparison table

* feat: initial correction implementation

* fix: need protected default constructor for inheritance

* refactor: separate `readSequence` event loop to a protected method

so that a derived class can use it

* fix: cleanup, since downsampling moved downstream

* feat: store event number

* feat: QADB binning classes

* feat: some example code

* feat: general `coatjava` script

* fix: start convincing this stuff to work

* fix: fencepost error, and missing event number

* feat: handle charge

* feat: get charge extrema

* feat: support RG-D charge override

* feat: sugar

* refactor: organize methods

* fix: spelling

* fix: +1

* fix: if on boundary take earlier bin

to be consistent with the current QADB convention

* fix: remove bin/coatjava

* fix: cleanup diff

* doc: cleanup

* feat: validate scaler ordering

* fix: docstrings

* refactor: DeMorgan law

* feat: instantiation without `data` creation

* refactor: cleanup
tongtongcao pushed a commit that referenced this pull request Sep 22, 2025
@c-dilks @tongtongcao
feat: QADB binning support (#770)
d78ec4b 
* feat: downsampling

* feat: test wrapper

* feat: write charge comparison table

* feat: initial correction implementation

* fix: need protected default constructor for inheritance

* refactor: separate `readSequence` event loop to a protected method

so that a derived class can use it

* fix: cleanup, since downsampling moved downstream

* feat: store event number

* feat: QADB binning classes

* feat: some example code

* feat: general `coatjava` script

* fix: start convincing this stuff to work

* fix: fencepost error, and missing event number

* feat: handle charge

* feat: get charge extrema

* feat: support RG-D charge override

* feat: sugar

* refactor: organize methods

* fix: spelling

* fix: +1

* fix: if on boundary take earlier bin

to be consistent with the current QADB convention

* fix: remove bin/coatjava

* fix: cleanup diff

* doc: cleanup

* feat: validate scaler ordering

* fix: docstrings

* refactor: DeMorgan law

* feat: instantiation without `data` creation

* refactor: cleanup
tongtongcao pushed a commit that referenced this pull request Nov 18, 2025
@c-dilks @tongtongcao
feat: QADB binning support (#770)
33d4984 
* feat: downsampling

* feat: test wrapper

* feat: write charge comparison table

* feat: initial correction implementation

* fix: need protected default constructor for inheritance

* refactor: separate `readSequence` event loop to a protected method

so that a derived class can use it

* fix: cleanup, since downsampling moved downstream

* feat: store event number

* feat: QADB binning classes

* feat: some example code

* feat: general `coatjava` script

* fix: start convincing this stuff to work

* fix: fencepost error, and missing event number

* feat: handle charge

* feat: get charge extrema

* feat: support RG-D charge override

* feat: sugar

* refactor: organize methods

* fix: spelling

* fix: +1

* fix: if on boundary take earlier bin

to be consistent with the current QADB convention

* fix: remove bin/coatjava

* fix: cleanup diff

* doc: cleanup

* feat: validate scaler ordering

* fix: docstrings

* refactor: DeMorgan law

* feat: instantiation without `data` creation

* refactor: cleanup
tongtongcao pushed a commit that referenced this pull request Nov 21, 2025
@c-dilks @tongtongcao
feat: QADB binning support (#770)
dacc8f0 
* feat: downsampling

* feat: test wrapper

* feat: write charge comparison table

* feat: initial correction implementation

* fix: need protected default constructor for inheritance

* refactor: separate `readSequence` event loop to a protected method

so that a derived class can use it

* fix: cleanup, since downsampling moved downstream

* feat: store event number

* feat: QADB binning classes

* feat: some example code

* feat: general `coatjava` script

* fix: start convincing this stuff to work

* fix: fencepost error, and missing event number

* feat: handle charge

* feat: get charge extrema

* feat: support RG-D charge override

* feat: sugar

* refactor: organize methods

* fix: spelling

* fix: +1

* fix: if on boundary take earlier bin

to be consistent with the current QADB convention

* fix: remove bin/coatjava

* fix: cleanup diff

* doc: cleanup

* feat: validate scaler ordering

* fix: docstrings

* refactor: DeMorgan law

* feat: instantiation without `data` creation

* refactor: cleanup
tongtongcao pushed a commit that referenced this pull request Dec 5, 2025
@c-dilks @tongtongcao
feat: QADB binning support (#770)
fca0aeb 
* feat: downsampling

* feat: test wrapper

* feat: write charge comparison table

* feat: initial correction implementation

* fix: need protected default constructor for inheritance

* refactor: separate `readSequence` event loop to a protected method

so that a derived class can use it

* fix: cleanup, since downsampling moved downstream

* feat: store event number

* feat: QADB binning classes

* feat: some example code

* feat: general `coatjava` script

* fix: start convincing this stuff to work

* fix: fencepost error, and missing event number

* feat: handle charge

* feat: get charge extrema

* feat: support RG-D charge override

* feat: sugar

* refactor: organize methods

* fix: spelling

* fix: +1

* fix: if on boundary take earlier bin

to be consistent with the current QADB convention

* fix: remove bin/coatjava

* fix: cleanup diff

* doc: cleanup

* feat: validate scaler ordering

* fix: docstrings

* refactor: DeMorgan law

* feat: instantiation without `data` creation

* refactor: cleanup
tongtongcao pushed a commit that referenced this pull request Dec 5, 2025
@c-dilks @tongtongcao
feat: QADB binning support (#770)
eccd063 
* feat: downsampling

* feat: test wrapper

* feat: write charge comparison table

* feat: initial correction implementation

* fix: need protected default constructor for inheritance

* refactor: separate `readSequence` event loop to a protected method

so that a derived class can use it

* fix: cleanup, since downsampling moved downstream

* feat: store event number

* feat: QADB binning classes

* feat: some example code

* feat: general `coatjava` script

* fix: start convincing this stuff to work

* fix: fencepost error, and missing event number

* feat: handle charge

* feat: get charge extrema

* feat: support RG-D charge override

* feat: sugar

* refactor: organize methods

* fix: spelling

* fix: +1

* fix: if on boundary take earlier bin

to be consistent with the current QADB convention

* fix: remove bin/coatjava

* fix: cleanup diff

* doc: cleanup

* feat: validate scaler ordering

* fix: docstrings

* refactor: DeMorgan law

* feat: instantiation without `data` creation

* refactor: cleanup
tongtongcao pushed a commit that referenced this pull request Dec 31, 2025
@c-dilks @tongtongcao
feat: QADB binning support (#770)
b32791a 
* feat: downsampling

* feat: test wrapper

* feat: write charge comparison table

* feat: initial correction implementation

* fix: need protected default constructor for inheritance

* refactor: separate `readSequence` event loop to a protected method

so that a derived class can use it

* fix: cleanup, since downsampling moved downstream

* feat: store event number

* feat: QADB binning classes

* feat: some example code

* feat: general `coatjava` script

* fix: start convincing this stuff to work

* fix: fencepost error, and missing event number

* feat: handle charge

* feat: get charge extrema

* feat: support RG-D charge override

* feat: sugar

* refactor: organize methods

* fix: spelling

* fix: +1

* fix: if on boundary take earlier bin

to be consistent with the current QADB convention

* fix: remove bin/coatjava

* fix: cleanup diff

* doc: cleanup

* feat: validate scaler ordering

* fix: docstrings

* refactor: DeMorgan law

* feat: instantiation without `data` creation

* refactor: cleanup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@baltzell baltzell baltzell approved these changes

@raffaelladevita raffaelladevita Awaiting requested review from raffaelladevita raffaelladevita is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@c-dilks @baltzell