Skip to content

Commit 997b461

Browse files
authored
feat(scalers): warn if RUN::scaler has more than 1 row (#919)
1 parent 0a95644 commit 997b461

File tree

1 file changed

+11
-5
lines changed
  • common-tools/clas-detector/src/main/java/org/jlab/detector/scalers

1 file changed

+11
-5
lines changed

common-tools/clas-detector/src/main/java/org/jlab/detector/scalers/DaqScalers.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import org.jlab.jnp.hipo4.data.Event;
1010
import org.jlab.jnp.hipo4.data.SchemaFactory;
1111
import org.jlab.utils.groups.IndexedTable;
12+
import java.util.logging.Logger;
13+
import org.jlab.logging.SplitLogger;
1214

1315
/**
1416
*
@@ -51,6 +53,8 @@ public class DaqScalers {
5153
private long timestamp=0;
5254
private int evnum=0;
5355

56+
private static final Logger logger = SplitLogger.create(DaqScalers.class.getName());
57+
5458
public DaqScalers setTimestamp(long timestamp) {
5559
this.timestamp=timestamp;
5660
return this;
@@ -95,11 +99,13 @@ public static double getSeconds(Date rst,Date uet) {
9599
public static DaqScalers create(Bank runScalerBank) {
96100
DaqScalers ds=new DaqScalers();
97101
ds.dsc2=new Dsc2Scaler();
98-
for (int ii=0; ii<runScalerBank.getRows(); ii++) {
99-
ds.dsc2.setLivetime(runScalerBank.getFloat("livetime", ii));
100-
ds.dsc2.setBeamCharge(runScalerBank.getFloat("fcup",ii));
101-
ds.dsc2.setBeamChargeGated(runScalerBank.getFloat("fcupgated",ii));
102-
break;
102+
if (runScalerBank.getRows() > 0) {
103+
ds.dsc2.setLivetime(runScalerBank.getFloat("livetime", 0));
104+
ds.dsc2.setBeamCharge(runScalerBank.getFloat("fcup",0));
105+
ds.dsc2.setBeamChargeGated(runScalerBank.getFloat("fcupgated",0));
106+
}
107+
if (runScalerBank.getRows() > 1) {
108+
logger.warning("found event where RUN::scaler bank has more than 1 row");
103109
}
104110
return ds;
105111
}

0 commit comments

Comments
 (0)