Skip to content

Commit 5513c0c

Browse files
committed
switch TOF hit bank reading to enums
1 parent 9125f62 commit 5513c0c

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

reconstruction/tof/src/main/java/org/jlab/rec/tof/banks/BaseHitReader.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import java.util.Map;
88
import java.util.Set;
99
import org.jlab.detector.banks.RawDataBank;
10+
import org.jlab.io.banks.FTOF__adc;
11+
import org.jlab.io.banks.FTOF__tdc;
1012
import org.jlab.io.base.DataEvent;
1113
import org.jlab.utils.groups.IndexedTable;
1214

@@ -99,13 +101,13 @@ public Map<DetectorLocation, ArrayList<BaseHit>> get_Hits(DataEvent event,
99101
ADCIdx2 = new int[bankSize];
100102

101103
for (int i = 0; i < bankSize; i++) {
102-
sectorADC[i] = bank.getByte("sector", i);
103-
layerADC[i] = bank.getByte("layer", i);
104-
componentADC[i] = bank.getShort("component", i);
104+
sectorADC[i] = bank.getByte(FTOF__adc.sector, i);
105+
layerADC[i] = bank.getByte(FTOF__adc.layer, i);
106+
componentADC[i] = bank.getShort(FTOF__adc.component, i);
105107
int order = bank.trueOrder(i);
106-
int ADC = bank.getInt("ADC", i);
107-
double time = bank.getFloat("time", i);
108-
int pedestalADC = bank.getShort("ped", i);
108+
int ADC = bank.getInt(FTOF__adc.ADC, i);
109+
double time = bank.getFloat(FTOF__adc.time, i);
110+
int pedestalADC = bank.getShort(FTOF__adc.ped, i);
109111

110112
ADC1[i] = -1;
111113
ADC2[i] = -1;
@@ -163,11 +165,11 @@ public Map<DetectorLocation, ArrayList<BaseHit>> get_Hits(DataEvent event,
163165
TDCIdx2 = new int[bankSize];
164166

165167
for (int i = 0; i < bankSize; i++) {
166-
sectorTDC[i] = bank.getByte("sector", i);
167-
layerTDC[i] = bank.getByte("layer", i);
168-
componentTDC[i] = bank.getShort("component", i);
168+
sectorTDC[i] = bank.getByte(FTOF__tdc.sector, i);
169+
layerTDC[i] = bank.getByte(FTOF__tdc.layer, i);
170+
componentTDC[i] = bank.getShort(FTOF__tdc.component, i);
169171
int order = bank.trueOrder(i);
170-
int TDC = bank.getInt("TDC", i);
172+
int TDC = bank.getInt(FTOF__tdc.TDC, i);
171173

172174
TDC1[i] = -1;
173175
TDC2[i] = -1;

0 commit comments

Comments
 (0)