|
9 | 9 | import org.jlab.jnp.hipo4.data.Event; |
10 | 10 | import org.jlab.jnp.hipo4.data.SchemaFactory; |
11 | 11 | import org.jlab.utils.groups.IndexedTable; |
| 12 | +import java.util.logging.Logger; |
| 13 | +import org.jlab.logging.SplitLogger; |
12 | 14 |
|
13 | 15 | /** |
14 | 16 | * |
@@ -51,6 +53,8 @@ public class DaqScalers { |
51 | 53 | private long timestamp=0; |
52 | 54 | private int evnum=0; |
53 | 55 |
|
| 56 | + private static final Logger logger = SplitLogger.create(DaqScalers.class.getName()); |
| 57 | + |
54 | 58 | public DaqScalers setTimestamp(long timestamp) { |
55 | 59 | this.timestamp=timestamp; |
56 | 60 | return this; |
@@ -95,11 +99,13 @@ public static double getSeconds(Date rst,Date uet) { |
95 | 99 | public static DaqScalers create(Bank runScalerBank) { |
96 | 100 | DaqScalers ds=new DaqScalers(); |
97 | 101 | 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"); |
103 | 109 | } |
104 | 110 | return ds; |
105 | 111 | } |
|
0 commit comments