Skip to content

Commit 98be85e

Browse files
committed
move check upstream
1 parent 6055592 commit 98be85e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,13 @@ public void fitPulses(List<DetectorDataDgtz> detectorData){
184184
int channel = data.getDescriptor().getChannel();
185185
long hash = IndexedTable.DEFAULT_GENERATOR.hashCode(crate,slot,channel);
186186
long hash0 = IndexedTable.DEFAULT_GENERATOR.hashCode(0,0,0);
187+
boolean ismm = keysMicromega.contains(data.getDescriptor().getType());
188+
187189
for (int j=0; j<keysFitter.size(); ++j) {
188190
IndexedTable daq = tables.get(j);
189191
DetectorType type = keysFitter.get(j);
190192
//custom MM fitter
191-
if (data.getDescriptor().getType() == type && keysMicromega.contains(keysFitter.get(j))) {
193+
if (ismm && data.getDescriptor().getType() == type) {
192194
short adcOffset = (short) daq.getDoubleValueByHash("adc_offset", hash0);
193195
double fineTimeStampResolution = (byte) daq.getDoubleValueByHash("dream_clock", hash0);
194196
double samplingTime = (byte) daq.getDoubleValueByHash("sampling_time", hash0);
@@ -232,7 +234,6 @@ else if(daq.hasEntryByHash(hash)==true){
232234
}
233235
}
234236

235-
236237
public void filterTDCs(List<DetectorDataDgtz> detectorData){
237238
int maxMultiplicity = 1;
238239
for(DetectorType type : keysFilter){

0 commit comments

Comments
 (0)