Skip to content

Commit 003d554

Browse files
committed
cleanup
1 parent c39b580 commit 003d554

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.jlab.detector.decode;
22

33
import java.util.ArrayList;
4-
import java.util.Arrays;
54
import java.util.Comparator;
65
import java.util.HashMap;
76
import java.util.HashSet;
@@ -105,18 +104,18 @@ public final void initDecoderDev() {
105104
keysMicromega= new HashSet<>();
106105
tableTrans = new HashMap<>();
107106
tableFitter = new HashMap<>();
107+
108108
keysFilter.add(DetectorType.DC);
109109

110110
tableTrans.put(DetectorType.HTCC, "/daq/tt/clasdev/htcc");
111111
tableTrans.put(DetectorType.BST, "/daq/tt/clasdev/svt");
112112
tableTrans.put(DetectorType.RTPC, "/daq/tt/clasdev/rtpc");
113-
translationManager.init(tableTrans.values().stream().collect(Collectors.toList()));
114113

115114
tableFitter.put(DetectorType.HTCC, "/daq/fadc/clasdev/htcc");
115+
116+
translationManager.init(tableTrans.values().stream().collect(Collectors.toList()));
116117
fitterManager.init(tableFitter.values().stream().collect(Collectors.toList()));
117-
118-
scalerManager.init(Arrays.asList(new String[]{"/runcontrol/fcup","/runcontrol/slm","/runcontrol/hwp",
119-
"/runcontrol/helicity","/daq/config/scalers/dsc1"}));
118+
scalerManager.init("/runcontrol/slm","/runcontrol/hwp","/runcontrol/helicity","/daq/config/scalers/dsc1");
120119
}
121120

122121
public final void initDecoder() {
@@ -156,7 +155,6 @@ public final void initDecoder(boolean initializeManagers){
156155
tableTrans.put(DetectorType.RASTER, "/daq/tt/raster");
157156
tableTrans.put(DetectorType.ATOF, "/daq/tt/atof");
158157
tableTrans.put(DetectorType.AHDC, "/daq/tt/ahdc");
159-
translationManager.init(tableTrans.values().stream().collect(Collectors.toList()));
160158

161159
tableFitter.put(DetectorType.FTCAL, "/daq/fadc/ftcal");
162160
tableFitter.put(DetectorType.FTHODO, "/daq/fadc/fthodo");
@@ -174,10 +172,10 @@ public final void initDecoder(boolean initializeManagers){
174172
tableFitter.put(DetectorType.BAND, "/daq/fadc/band");
175173
tableFitter.put(DetectorType.RASTER, "/daq/fadc/raster");
176174
tableFitter.put(DetectorType.AHDC, "/daq/fadc/ahdc");
175+
176+
translationManager.init(tableTrans.values().stream().collect(Collectors.toList()));
177177
fitterManager.init(tableFitter.values().stream().collect(Collectors.toList()));
178-
179-
scalerManager.init(Arrays.asList(new String[]{"/runcontrol/fcup",
180-
"/runcontrol/slm","/runcontrol/hwp","/runcontrol/helicity","/daq/config/scalers/dsc1"}));
178+
scalerManager.init("/runcontrol/slm","/runcontrol/hwp","/runcontrol/helicity","/daq/config/scalers/dsc1");
181179

182180
if (initializeManagers) {
183181
translationManager.init(tablesTrans);

0 commit comments

Comments
 (0)