Skip to content

Commit 08b4b45

Browse files
committed
fix rebase mistake
1 parent 3fac600 commit 08b4b45

1 file changed

Lines changed: 3 additions & 13 deletions

File tree

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ public float getRcdbSolenoidScale() {
9494
getValue()).floatValue();
9595
}
9696

97-
public DetectorEventDecoder(){
98-
this.initDecoder();
99-
}
100-
10197
public final void initDecoderDev() {
10298

10399
keysFilter = new HashSet<>();
@@ -173,18 +169,12 @@ public final void initDecoder(boolean initializeManagers){
173169
tableFitter.put(DetectorType.RASTER, "/daq/fadc/raster");
174170
tableFitter.put(DetectorType.AHDC, "/daq/fadc/ahdc");
175171

176-
translationManager.init(tableTrans.values().stream().collect(Collectors.toList()));
177-
fitterManager.init(tableFitter.values().stream().collect(Collectors.toList()));
178-
scalerManager.init("/runcontrol/slm","/runcontrol/hwp","/runcontrol/helicity","/daq/config/scalers/dsc1");
179-
180172
if (initializeManagers) {
181-
translationManager.init(tablesTrans);
182-
fitterManager.init(tablesFitter);
183-
scalerManager.init(Arrays.asList(new String[]{"/runcontrol/fcup","/runcontrol/slm","/runcontrol/hwp",
184-
"/runcontrol/helicity","/daq/config/scalers/dsc1"}));
173+
translationManager.init(tableTrans.values().stream().collect(Collectors.toList()));
174+
fitterManager.init(tableFitter.values().stream().collect(Collectors.toList()));
175+
scalerManager.init("/runcontrol/slm","/runcontrol/hwp","/runcontrol/helicity","/daq/config/scalers/dsc1");
185176
checkTables();
186177
}
187-
188178
}
189179

190180
public void checkTables() {

0 commit comments

Comments
 (0)