|
18 | 18 | */ |
19 | 19 | public class DetectorEventDecoder { |
20 | 20 |
|
21 | | - boolean sharedManagers = false; |
22 | 21 | ConstantsManager translationManager = new ConstantsManager(); |
23 | 22 | ConstantsManager fitterManager = new ConstantsManager(); |
24 | 23 | ConstantsManager scalerManager = new ConstantsManager(); |
@@ -54,8 +53,7 @@ public DetectorEventDecoder(DetectorEventDecoder d) { |
54 | 53 | translationManager = d.translationManager; |
55 | 54 | fitterManager = d.fitterManager; |
56 | 55 | scalerManager = d.scalerManager; |
57 | | - sharedManagers = true; |
58 | | - initDecoder(); |
| 56 | + initDecoder(false); |
59 | 57 | } |
60 | 58 |
|
61 | 59 | public void setTimestamp(String timestamp) { |
@@ -104,7 +102,11 @@ public final void initDecoderDev(){ |
104 | 102 | "/runcontrol/helicity","/daq/config/scalers/dsc1"})); |
105 | 103 | } |
106 | 104 |
|
107 | | - public final void initDecoder(){ |
| 105 | + public final void initDecoder() { |
| 106 | + initDecoder(true); |
| 107 | + } |
| 108 | + |
| 109 | + public final void initDecoder(boolean initializeManagers){ |
108 | 110 |
|
109 | 111 | // Detector translation table |
110 | 112 | keysTrans = Arrays.asList(new DetectorType[]{DetectorType.FTCAL,DetectorType.FTHODO,DetectorType.FTTRK,DetectorType.LTCC,DetectorType.ECAL,DetectorType.FTOF, |
@@ -136,7 +138,7 @@ public final void initDecoder(){ |
136 | 138 |
|
137 | 139 | keysMicromega = Arrays.asList(new DetectorType[]{DetectorType.BMT,DetectorType.FMT,DetectorType.FTTRK}); |
138 | 140 |
|
139 | | - if (!sharedManagers) { |
| 141 | + if (initializeManagers) { |
140 | 142 | translationManager.init(tablesTrans); |
141 | 143 | fitterManager.init(tablesFitter); |
142 | 144 | scalerManager.init(Arrays.asList(new String[]{"/runcontrol/fcup","/runcontrol/slm","/runcontrol/hwp", |
|
0 commit comments