Skip to content

feat(scalers): warn if RUN::scaler has more than 1 row #919

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
c-dilks merged 3 commits into from
Nov 13, 2025
Merged

feat(scalers): warn if RUN::scaler has more than 1 row #919

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b73671e
feat(scalers): warn if `RUN::scaler` has more than 1 row
c-dilks Oct 28, 2025
f394524
fix: allow > 1
c-dilks Nov 13, 2025
69eb763
style: clearer conditional
c-dilks Nov 13, 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
16 changes: 11 additions & 5 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/scalers/DaqScalers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import org.jlab.jnp.hipo4.data.Event;
import org.jlab.jnp.hipo4.data.SchemaFactory;
import org.jlab.utils.groups.IndexedTable;
import java.util.logging.Logger;
import org.jlab.logging.SplitLogger;

/**
*
Expand Down Expand Up @@ -51,6 +53,8 @@ public class DaqScalers {
private long timestamp=0;
private int evnum=0;

private static final Logger logger = SplitLogger.create(DaqScalers.class.getName());

public DaqScalers setTimestamp(long timestamp) {
this.timestamp=timestamp;
return this;
Expand Down Expand Up @@ -95,11 +99,13 @@ public static double getSeconds(Date rst,Date uet) {
public static DaqScalers create(Bank runScalerBank) {
DaqScalers ds=new DaqScalers();
ds.dsc2=new Dsc2Scaler();
for (int ii=0; ii<runScalerBank.getRows(); ii++) {
ds.dsc2.setLivetime(runScalerBank.getFloat("livetime", ii));
ds.dsc2.setBeamCharge(runScalerBank.getFloat("fcup",ii));
ds.dsc2.setBeamChargeGated(runScalerBank.getFloat("fcupgated",ii));
break;
if (runScalerBank.getRows() > 0) {
ds.dsc2.setLivetime(runScalerBank.getFloat("livetime", 0));
ds.dsc2.setBeamCharge(runScalerBank.getFloat("fcup",0));
ds.dsc2.setBeamChargeGated(runScalerBank.getFloat("fcupgated",0));
}
if (runScalerBank.getRows() > 1) {
logger.warning("found event where RUN::scaler bank has more than 1 row");
}
return ds;
}
Expand Down