Skip to content

Commit 85d7375

Browse files
committed
cleanup, in prep for faster lookup
1 parent 5b210b1 commit 85d7375

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

‎common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ public void translate(List<DetectorDataDgtz> detectorData){
172172
public void fitPulses(List<DetectorDataDgtz> detectorData) {
173173

174174
// preload CCDB tables once:
175-
ArrayList<IndexedTable> tables = new ArrayList<>();
176-
for (String name : tablesFitter) {
177-
tables.add(fitterManager.getConstants(runNumber, name));
175+
HashMap<DetectorType, IndexedTable> tables = new HashMap<>();
176+
for (int i=0; i<tablesFitter.size(); i++) {
177+
tables.put(keysFitter.get(i), fitterManager.getConstants(runNumber, tablesFitter.get(i)));
178178
}
179179

180180
final long hash0 = IndexedTable.DEFAULT_GENERATOR.hashCode(0,0,0);
@@ -187,9 +187,8 @@ public void fitPulses(List<DetectorDataDgtz> detectorData) {
187187
int channel = data.getDescriptor().getChannel();
188188
DetectorType type = data.getDescriptor().getType();
189189

190-
int idx = keysFitter.indexOf(type);
191-
if (idx < 0) continue;
192-
IndexedTable daqTable = tables.get(idx);
190+
if (!keysFitter.contains(type)) continue;
191+
IndexedTable daqTable = tables.get(type);
193192

194193
if (keysMicromega.contains(type)) {
195194
short adcOffset = (short) daqTable.getDoubleValueByHash("adc_offset", hash0);

0 commit comments

Comments
 (0)