Skip to content

feat: decoding lookup optimizaions #1274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
baltzell wants to merge 1 commit into
base: decodering-sets
Choose a base branch
from
Draft

feat: decoding lookup optimizaions #1274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 56 additions & 60 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ public class DetectorEventDecoder {

HashMap<DetectorType,String> tableTrans;
HashMap<DetectorType,String> tableFitter;
HashMap<DetectorType,IndexedTable> tablesFitter;

private int runNumber = 10;
HashMap<DetectorType, IndexedTable> 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();
Expand Down Expand Up @@ -89,21 +89,14 @@ 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");
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"}));
}
Expand All @@ -114,8 +107,9 @@ public final void initDecoder(){
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);
Expand Down Expand Up @@ -177,8 +171,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<DetectorDataDgtz> detectorData){
Expand All @@ -202,56 +197,59 @@ public void translate(List<DetectorDataDgtz> detectorData){
}
}

public void fitPulses(List<DetectorDataDgtz> detectorData){
/**
* Use CCDB /daq/fadc tables to convert waveforms to pulses.
*
* @param detectorData
*/
public void fitPulses(List<DetectorDataDgtz> detectorData) {

// preload CCDB tables once:
HashMap<DetectorType,IndexedTable> tables = new HashMap<>();
for (Map.Entry<DetectorType, String> 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);
Expand All @@ -261,8 +259,6 @@ else if(daq.hasEntryByHash(hash)==true){
}
data.getADCData(i).setADC(nsa, nsb);
}
// first one wins:
break;
}
}
}
Expand Down