Skip to content

test: RG-A Sp18 6.4 GeV rebuild-scalers with 125MHz clock and generalized clock rollover correction #1198

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

Draft
c-dilks wants to merge 8 commits into
base: development
Choose a base branch
from
Draft

test: RG-A Sp18 6.4 GeV rebuild-scalers with 125MHz clock and generalized clock rollover correction #1198

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
74157e7
test: scaler clock diagnostics
c-dilks Mar 20, 2026
1d4795b
fix: type
c-dilks Mar 20, 2026
1dd5d2a
feat: print time
c-dilks Mar 20, 2026
3552dc0
test: 125 MHz DSC2 clock for RG-A Spring 2018 6.4 GeV
c-dilks Apr 7, 2026
6f6f0e7
fix: cherry pick generalized rollover correction
c-dilks Apr 7, 2026
cd4c205
fix: correct by `2**32` always; complain if this may not be valid
c-dilks Apr 9, 2026
569c65a
fix: rat warning
c-dilks Apr 9, 2026
b9eafed
fix: increase thresh
c-dilks Apr 9, 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
Prev Previous commit
Next Next commit
test: 125 MHz DSC2 clock for RG-A Spring 2018 6.4 GeV 
We suspect the DSC2 clock frequency for RG-A Spring 2018 6.4 GeV data
was 125 MHz, not 1 MHz. This PR allows one to run `RebuildScalers` with
the higher frequency clock, and more generalized clock rollover
corrections.

**do not merge**
  • Loading branch information
@c-dilks
c-dilks committed Apr 7, 2026
commit 3552dc07e46ff2e840465fac6922c8066413230e
14 changes: 7 additions & 7 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/scalers/DaqScaler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ protected void calibrate(IndexedTable fcupTable,IndexedTable slmTable,double sec

if (this.clock > 0) {

String prefix = String.format("clocktest [%s]", this.getClass().getSimpleName());
System.out.println(String.format("%s: -----------", prefix));
System.out.println(String.format("%s: toString: %s", prefix, this.toString()));
System.out.println(String.format("%s: seconds=%f liveSeconds=%f", prefix, seconds, liveSeconds));
// String prefix = String.format("clocktest [%s]", this.getClass().getSimpleName());
// System.out.println(String.format("%s: -----------", prefix));
// System.out.println(String.format("%s: toString: %s", prefix, this.toString()));
// System.out.println(String.format("%s: seconds=%f liveSeconds=%f", prefix, seconds, liveSeconds));

final double fcup_slope = fcupTable.getDoubleValue("slope",0,0,0); // Hz/nA
final double fcup_offset = fcupTable.getDoubleValue("offset",0,0,0); // Hz
Expand All @@ -104,9 +104,9 @@ protected void calibrate(IndexedTable fcupTable,IndexedTable slmTable,double sec
this.beamChargeGated = qg * fcup_atten / fcup_slope;
}

System.out.println(String.format("%s: BANK fcup=%d fcupGated=%d", prefix, this.fcup, this.gatedFcup));
System.out.println(String.format("%s: CCDB fcup_offset=%f fcup_slope=%f fcup_atten=%f", prefix, fcup_offset, fcup_slope, fcup_atten));
System.out.println(String.format("%s: clockFreq=%f beamCharge=%f beamChargeGated=%f", prefix, this.clockFreq, this.beamCharge, this.beamChargeGated));
// System.out.println(String.format("%s: BANK fcup=%d fcupGated=%d", prefix, this.fcup, this.gatedFcup));
// System.out.println(String.format("%s: CCDB fcup_offset=%f fcup_slope=%f fcup_atten=%f", prefix, fcup_offset, fcup_slope, fcup_atten));
// System.out.println(String.format("%s: clockFreq=%f beamCharge=%f beamChargeGated=%f", prefix, this.clockFreq, this.beamCharge, this.beamChargeGated));
}
}

Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/scalers/Dsc2Scaler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public Dsc2Scaler() {}
* @param seconds dwell time, provided in case the clock rolls over
*/
public Dsc2Scaler(Bank bank, IndexedTable fcupTable, IndexedTable slmTable, double seconds) {
this.clockFreq=1e6; // FIXME: this is what's actually used
this.clockFreq=125e6; // for RG-A spring 2018 6.4 GeV data
this.read(bank);
this.calibrate(fcupTable,slmTable,seconds);
}
Expand All @@ -50,7 +50,7 @@ public Dsc2Scaler(Bank bank, IndexedTable fcupTable, IndexedTable slmTable, doub
* @param dscTable /daq/config/scalers/dsc1 CCDB table
*/
public Dsc2Scaler(Bank bank, IndexedTable fcupTable, IndexedTable slmTable, IndexedTable dscTable) {
this.clockFreq = dscTable.getIntValue("frequency", 0,0,0);
this.clockFreq = 125e6; // for RG-A spring 2018 6.4 GeV data // dscTable.getIntValue("frequency", 0,0,0);
this.read(bank);
this.calibrate(fcupTable,slmTable);
}
Expand Down