From 190dd789b4917766a1dc1d16b6f9d3a81a5808d2 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 19 May 2026 14:20:21 -0400 Subject: [PATCH 1/2] switch from lists to sets/maps --- .../detector/decode/DetectorEventDecoder.java | 147 +++++++++++------- 1 file changed, 94 insertions(+), 53 deletions(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java index ff8df013c1..4d39af5bb6 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java @@ -4,8 +4,10 @@ import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import org.jlab.detector.banks.RawBank.OrderType; import org.jlab.detector.base.DetectorType; import org.jlab.detector.calib.utils.ConstantsManager; @@ -22,13 +24,12 @@ public class DetectorEventDecoder { ConstantsManager fitterManager = new ConstantsManager(); ConstantsManager scalerManager = new ConstantsManager(); - List tablesTrans = null; - List tablesFitter = null; + HashSet keysFilter; + HashSet keysMicromega; - List keysTrans = null; - List keysFitter = null; - List keysFilter = null; - List keysMicromega= null; + HashMap tableTrans; + HashMap tableFitter; + HashMap tablesFitter; private int runNumber = 10; @@ -71,8 +72,11 @@ public void setVariation(String variation) { public void setRunNumber(int run){ if (run != this.runNumber) { translator = new TranslationTable(); - for (int i=0; i(); + for (DetectorType t : tableTrans.keySet()) + translator.add(t, translationManager.getConstants(run, tableTrans.get(t))); + for (DetectorType t: tableFitter.keySet()) + tablesFitter.put(t, fitterManager.getConstants(run, tableFitter.get(t))); } this.runNumber = run; } @@ -91,13 +95,26 @@ public float getRcdbSolenoidScale() { getValue()).floatValue(); } - public final void initDecoderDev(){ - keysTrans = Arrays.asList(new DetectorType[]{ DetectorType.HTCC,DetectorType.BST,DetectorType.RTPC} ); - tablesTrans = Arrays.asList(new String[]{ "/daq/tt/clasdev/htcc","/daq/tt/clasdev/svt","/daq/tt/clasdev/rtpc" }); - keysFitter = Arrays.asList(new DetectorType[]{DetectorType.HTCC}); - tablesFitter = Arrays.asList(new String[]{"/daq/fadc/clasdev/htcc"}); - translationManager.init(tablesTrans); - fitterManager.init(tablesFitter); + public DetectorEventDecoder(){ + this.initDecoder(); + } + + public final void initDecoderDev() { + + keysFilter = new HashSet<>(); + keysMicromega= new HashSet<>(); + tableTrans = new HashMap<>(); + tableFitter = new HashMap<>(); + keysFilter.add(DetectorType.DC); + + tableTrans.put(DetectorType.HTCC, "/daq/tt/clasdev/htcc"); + tableTrans.put(DetectorType.BST, "/daq/tt/clasdev/svt"); + tableTrans.put(DetectorType.RTPC, "/daq/tt/clasdev/rtpc"); + translationManager.init(tableTrans.values().stream().collect(Collectors.toList())); + + tableFitter.put(DetectorType.HTCC, "/daq/fadc/clasdev/htcc"); + fitterManager.init(tableFitter.values().stream().collect(Collectors.toList())); + scalerManager.init(Arrays.asList(new String[]{"/runcontrol/fcup","/runcontrol/slm","/runcontrol/hwp", "/runcontrol/helicity","/daq/config/scalers/dsc1"})); } @@ -108,35 +125,59 @@ public final void initDecoder() { public final void initDecoder(boolean initializeManagers){ - // Detector translation table - keysTrans = Arrays.asList(new DetectorType[]{DetectorType.FTCAL,DetectorType.FTHODO,DetectorType.FTTRK,DetectorType.LTCC,DetectorType.ECAL,DetectorType.FTOF, - DetectorType.HTCC,DetectorType.DC,DetectorType.CTOF,DetectorType.CND,DetectorType.BST,DetectorType.RF,DetectorType.BMT,DetectorType.FMT, - DetectorType.RICH,DetectorType.HEL,DetectorType.BAND,DetectorType.RTPC, - DetectorType.RASTER,DetectorType.ATOF,DetectorType.AHDC - }); - tablesTrans = Arrays.asList(new String[]{ - "/daq/tt/ftcal","/daq/tt/fthodo","/daq/tt/fttrk","/daq/tt/ltcc", - "/daq/tt/ec","/daq/tt/ftof","/daq/tt/htcc","/daq/tt/dc","/daq/tt/ctof","/daq/tt/cnd","/daq/tt/svt", - "/daq/tt/rf","/daq/tt/bmt","/daq/tt/fmt","/daq/tt/rich2","/daq/tt/hel","/daq/tt/band","/daq/tt/rtpc", - "/daq/tt/raster","/daq/tt/atof","/daq/tt/ahdc" - }); - - // ADC waveform fitter translation table - keysFitter = Arrays.asList(new DetectorType[]{DetectorType.FTCAL,DetectorType.FTHODO,DetectorType.FTTRK,DetectorType.FTOF,DetectorType.LTCC, - DetectorType.ECAL,DetectorType.HTCC,DetectorType.CTOF,DetectorType.CND,DetectorType.BMT, - DetectorType.FMT,DetectorType.HEL,DetectorType.RF,DetectorType.BAND,DetectorType.RASTER, - DetectorType.AHDC}); - tablesFitter = Arrays.asList(new String[]{ - "/daq/fadc/ftcal","/daq/fadc/fthodo","/daq/config/fttrk","/daq/fadc/ftof","/daq/fadc/ltcc", - "/daq/fadc/ec", "/daq/fadc/htcc","/daq/fadc/ctof","/daq/fadc/cnd","/daq/config/bmt", - "/daq/config/fmt","/daq/fadc/hel","/daq/fadc/rf","/daq/fadc/band","/daq/fadc/raster", - "/daq/config/ahdc" - }); - - // Data filter list - keysFilter = Arrays.asList(new DetectorType[]{DetectorType.DC}); - - keysMicromega = Arrays.asList(new DetectorType[]{DetectorType.BMT,DetectorType.FMT,DetectorType.FTTRK}); + keysFilter = new HashSet<>(); + keysMicromega= new HashSet<>(); + tableTrans = new HashMap<>(); + tableFitter = new HashMap<>(); + keysFilter.add(DetectorType.DC); + + keysMicromega.add(DetectorType.BMT); + keysMicromega.add(DetectorType.FMT); + keysMicromega.add(DetectorType.FTTRK); + + tableTrans.put(DetectorType.FTCAL, "/daq/tt/ftcal"); + tableTrans.put(DetectorType.FTHODO, "/daq/tt/fthodo"); + tableTrans.put(DetectorType.FTTRK, "/daq/tt/fttrk"); + tableTrans.put(DetectorType.LTCC, "/daq/tt/ltcc"); + tableTrans.put(DetectorType.ECAL, "/daq/tt/ec"); + tableTrans.put(DetectorType.FTOF, "/daq/tt/ftof"); + tableTrans.put(DetectorType.HTCC, "/daq/tt/htcc"); + tableTrans.put(DetectorType.DC, "/daq/tt/dc"); + tableTrans.put(DetectorType.CTOF, "/daq/tt/ctof"); + tableTrans.put(DetectorType.CND, "/daq/tt/cnd"); + tableTrans.put(DetectorType.BST, "/daq/tt/svt"); + tableTrans.put(DetectorType.RF, "/daq/tt/rf"); + tableTrans.put(DetectorType.BMT, "/daq/tt/bmt"); + tableTrans.put(DetectorType.FMT, "/daq/tt/fmt"); + tableTrans.put(DetectorType.RICH, "/daq/tt/rich2"); + tableTrans.put(DetectorType.HEL, "/daq/tt/hel"); + tableTrans.put(DetectorType.BAND, "/daq/tt/band"); + tableTrans.put(DetectorType.RTPC, "/daq/tt/rtpc"); + tableTrans.put(DetectorType.RASTER, "/daq/tt/raster"); + tableTrans.put(DetectorType.ATOF, "/daq/tt/atof"); + tableTrans.put(DetectorType.AHDC, "/daq/tt/ahdc"); + translationManager.init(tableTrans.values().stream().collect(Collectors.toList())); + + tableFitter.put(DetectorType.FTCAL, "/daq/fadc/ftcal"); + tableFitter.put(DetectorType.FTHODO, "/daq/fadc/fthodo"); + tableFitter.put(DetectorType.FTTRK, "/daq/fadc/fttrk"); + tableFitter.put(DetectorType.FTOF, "/daq/fadc/ftof"); + tableFitter.put(DetectorType.LTCC, "/daq/fadc/ltcc"); + tableFitter.put(DetectorType.ECAL, "/daq/fadc/ec"); + tableFitter.put(DetectorType.HTCC, "/daq/fadc/htcc"); + tableFitter.put(DetectorType.CTOF, "/daq/fadc/ctof"); + tableFitter.put(DetectorType.CND, "/daq/fadc/cnd"); + tableFitter.put(DetectorType.BMT, "/daq/fadc/bmt"); + tableFitter.put(DetectorType.FMT, "/daq/fadc/fmt"); + tableFitter.put(DetectorType.HEL, "/daq/fadc/hel"); + tableFitter.put(DetectorType.RF, "/daq/fadc/rf"); + tableFitter.put(DetectorType.BAND, "/daq/fadc/band"); + tableFitter.put(DetectorType.RASTER, "/daq/fadc/raster"); + tableFitter.put(DetectorType.AHDC, "/daq/fadc/ahdc"); + fitterManager.init(tableFitter.values().stream().collect(Collectors.toList())); + + scalerManager.init(Arrays.asList(new String[]{"/runcontrol/fcup", + "/runcontrol/slm","/runcontrol/hwp","/runcontrol/helicity","/daq/config/scalers/dsc1"})); if (initializeManagers) { translationManager.init(tablesTrans); @@ -149,10 +190,11 @@ public final void initDecoder(boolean initializeManagers){ } public void checkTables() { - for (int i=0; i tables = (List)tableTrans.values().stream().collect(Collectors.toList()); + for (int i=0; i detectorData){ public void fitPulses(List detectorData){ // preload CCDB tables once: - ArrayList tables = new ArrayList<>(); - for (String name : tablesFitter) { - tables.add(fitterManager.getConstants(runNumber, name)); + HashMap tables = new HashMap<>(); + for (Map.Entry e : tableFitter.entrySet()) { + tables.put(e.getKey(), fitterManager.getConstants(runNumber, e.getValue())); } for(DetectorDataDgtz data : detectorData){ @@ -199,9 +241,8 @@ public void fitPulses(List detectorData){ long hash0 = IndexedTable.DEFAULT_GENERATOR.hashCode(0,0,0); boolean ismm = keysMicromega.contains(data.getDescriptor().getType()); - for (int j=0; j Date: Tue, 19 May 2026 14:35:51 -0400 Subject: [PATCH 2/2] optimize lookup --- .../detector/decode/DetectorEventDecoder.java | 116 +++++++++--------- 1 file changed, 56 insertions(+), 60 deletions(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java index 4d39af5bb6..664997a163 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java @@ -29,15 +29,15 @@ public class DetectorEventDecoder { HashMap tableTrans; HashMap tableFitter; - HashMap tablesFitter; - private int runNumber = 10; + HashMap tablesFitter; + TranslationTable translator; - private ExtendedFADCFitter extendedFitter = new ExtendedFADCFitter(); - private MVTFitter mvtFitter = new MVTFitter(); - - private TranslationTable translator = new TranslationTable(); + ExtendedFADCFitter extendedFitter = new ExtendedFADCFitter(); + MVTFitter mvtFitter = new MVTFitter(); + int runNumber = 10; + public DetectorEventDecoder(boolean development){ if(development==true){ this.initDecoderDev(); @@ -100,13 +100,6 @@ public DetectorEventDecoder(){ } public final void initDecoderDev() { - - keysFilter = new HashSet<>(); - keysMicromega= new HashSet<>(); - tableTrans = new HashMap<>(); - tableFitter = new HashMap<>(); - keysFilter.add(DetectorType.DC); - tableTrans.put(DetectorType.HTCC, "/daq/tt/clasdev/htcc"); tableTrans.put(DetectorType.BST, "/daq/tt/clasdev/svt"); tableTrans.put(DetectorType.RTPC, "/daq/tt/clasdev/rtpc"); @@ -114,7 +107,7 @@ public final void initDecoderDev() { tableFitter.put(DetectorType.HTCC, "/daq/fadc/clasdev/htcc"); fitterManager.init(tableFitter.values().stream().collect(Collectors.toList())); - + scalerManager.init(Arrays.asList(new String[]{"/runcontrol/fcup","/runcontrol/slm","/runcontrol/hwp", "/runcontrol/helicity","/daq/config/scalers/dsc1"})); } @@ -129,8 +122,9 @@ public final void initDecoder(boolean initializeManagers){ keysMicromega= new HashSet<>(); tableTrans = new HashMap<>(); tableFitter = new HashMap<>(); - keysFilter.add(DetectorType.DC); - + + keysFilter.add(DetectorType.DC); + keysMicromega.add(DetectorType.BMT); keysMicromega.add(DetectorType.FMT); keysMicromega.add(DetectorType.FTTRK); @@ -199,8 +193,9 @@ public void checkTables() { } /** - * applies translation table to the digitized data to translate - * crate,slot channel to sector layer component. + * Apply CCDB /daq/tt translation tables to the digitized data to translate + * crate/slot/channel to sector/layer/component/order. + * * @param detectorData */ public void translate(List detectorData){ @@ -224,56 +219,59 @@ public void translate(List detectorData){ } } - public void fitPulses(List detectorData){ + /** + * Use CCDB /daq/fadc tables to convert waveforms to pulses. + * + * @param detectorData + */ + public void fitPulses(List detectorData) { - // preload CCDB tables once: - HashMap tables = new HashMap<>(); - for (Map.Entry e : tableFitter.entrySet()) { - tables.put(e.getKey(), fitterManager.getConstants(runNumber, e.getValue())); - } + final long hash0 = IndexedTable.DEFAULT_GENERATOR.hashCode(0,0,0); + + for (DetectorDataDgtz data : detectorData) { - for(DetectorDataDgtz data : detectorData){ if (data.getADCSize() == 0) continue; - int crate = data.getDescriptor().getCrate(); - int slot = data.getDescriptor().getSlot(); - int channel = data.getDescriptor().getChannel(); - long hash = IndexedTable.DEFAULT_GENERATOR.hashCode(crate,slot,channel); - long hash0 = IndexedTable.DEFAULT_GENERATOR.hashCode(0,0,0); - boolean ismm = keysMicromega.contains(data.getDescriptor().getType()); - - for (DetectorType type : tableFitter.keySet()) { - IndexedTable daq = tables.get(type); - //custom MM fitter - if (ismm && data.getDescriptor().getType() == type) { - short adcOffset = (short) daq.getDoubleValueByHash("adc_offset", hash0); - double fineTimeStampResolution = (byte) daq.getDoubleValueByHash("dream_clock", hash0); - double samplingTime = (byte) daq.getDoubleValueByHash("sampling_time", hash0); - int sparseSample = daq.getIntValueByHash("sparse", hash0); - ADCData adc = data.getADCData(0); - mvtFitter.fit(adcOffset, fineTimeStampResolution, samplingTime, adc.getPulseArray(), adc.getTimeStamp(), sparseSample); - adc.setHeight((short) (mvtFitter.adcMax)); - adc.setTime((int) (mvtFitter.timeMax)); - adc.setIntegral((int) (mvtFitter.integral)); - adc.setTimeStamp(mvtFitter.timestamp); - // first one wins: - break; - } - else if(daq.hasEntryByHash(hash)==true){ - int nsa = daq.getIntValueByHash("nsa", hash); - int nsb = daq.getIntValueByHash("nsb", hash); - int tet = daq.getIntValueByHash("tet", hash); + + DetectorType type = data.getDescriptor().getType(); + if (!tablesFitter.containsKey(type)) continue; + IndexedTable daqTable = tablesFitter.get(type); + + // For MM, assume crate/slot/channel=0/0/0 for table lookup: + if (keysMicromega.contains(type)) { + short adcOffset = (short) daqTable.getDoubleValueByHash("adc_offset", hash0); + double fineTimeStampResolution = (byte) daqTable.getDoubleValueByHash("dream_clock", hash0); + double samplingTime = (byte) daqTable.getDoubleValueByHash("sampling_time", hash0); + int sparseSample = daqTable.getIntValueByHash("sparse", hash0); + ADCData adc = data.getADCData(0); + mvtFitter.fit(adcOffset, fineTimeStampResolution, samplingTime, adc.getPulseArray(), adc.getTimeStamp(), sparseSample); + adc.setHeight((short) (mvtFitter.adcMax)); + adc.setTime((int) (mvtFitter.timeMax)); + adc.setIntegral((int) (mvtFitter.integral)); + adc.setTimeStamp(mvtFitter.timestamp); + } + + // Otherwise, use crate/slot/channel to find the table entry: + else { + long hash = IndexedTable.DEFAULT_GENERATOR.hashCode( + data.getDescriptor().getCrate(), + data.getDescriptor().getSlot(), + data.getDescriptor().getChannel()); + if (daqTable.hasEntryByHash(hash)) { + int nsa = daqTable.getIntValueByHash("nsa", hash); + int nsb = daqTable.getIntValueByHash("nsb", hash); + int tet = daqTable.getIntValueByHash("tet", hash); int ped = 0; - if(data.getDescriptor().getType() == DetectorType.RF && type == DetectorType.RF) { - ped = daq.getIntValueByHash("pedestal", hash); + if (data.getDescriptor().getType() == DetectorType.RF && type == DetectorType.RF) { + ped = daqTable.getIntValueByHash("pedestal", hash); } - for(int i = 0; i < data.getADCSize(); i++){ + for (int i = 0; i < data.getADCSize(); i++) { ADCData adc = data.getADCData(i); if(adc.getPulseSize()>0){ try { extendedFitter.fit(nsa, nsb, tet, ped, adc.getPulseArray()); } catch (Exception e) { - System.out.println(">>>> error : fitting pulse " - + crate + " / " + slot + " / " + channel); + System.err.println(">>>> error : fitting pulse "+data.getDescriptor().getCrate()+ + " / "+data.getDescriptor().getSlot()+" / "+data.getDescriptor().getChannel()); } int adc_corrected = extendedFitter.adc + extendedFitter.ped*(nsa+nsb); adc.setHeight((short) this.extendedFitter.pulsePeakValue); @@ -283,8 +281,6 @@ else if(daq.hasEntryByHash(hash)==true){ } data.getADCData(i).setADC(nsa, nsb); } - // first one wins: - break; } } }