Skip to content

fix: use global /daq/tt translation table in decoding #1064

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

Open
baltzell wants to merge 1 commit into
base: development
Choose a base branch
from
+18 −34
Open

fix: use global /daq/tt translation table in decoding #1064

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
52 changes: 18 additions & 34 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 @@ -34,6 +34,8 @@ public class DetectorEventDecoder {
private ExtendedFADCFitter extendedFitter = new ExtendedFADCFitter();
private MVTFitter mvtFitter = new MVTFitter();

private TranslationTable translator = new TranslationTable();

public DetectorEventDecoder(boolean development){
if(development==true){
this.initDecoderDev();
Expand All @@ -55,6 +57,11 @@ public void setVariation(String variation) {
}

public void setRunNumber(int run){
if (run != this.runNumber) {
translator = new TranslationTable();
for (int i=0; i<keysTrans.size(); i++)
translator.add(keysTrans.get(i), translationManager.getConstants(run, tablesTrans.get(i)));
}
this.runNumber = run;
}

Expand Down Expand Up @@ -140,44 +147,21 @@ public void checkTables() {
*/
public void translate(List<DetectorDataDgtz> detectorData){

// Preload CCDB tables:
ArrayList<IndexedTable> tables = new ArrayList<>();
for (String name : tablesTrans) {
tables.add(translationManager.getConstants(runNumber, name));
}
for (DetectorDataDgtz d : detectorData) {

for (DetectorDataDgtz data : detectorData) {
// Get the hardware indexing for this detector data object:
long hash = IndexedTable.DEFAULT_GENERATOR.hashCode(d.getDescriptor().getCrate(),
d.getDescriptor().getSlot(), d.getDescriptor().getChannel());

// Get the hardware indexing for this detector hit:
int crate = data.getDescriptor().getCrate();
int slot = data.getDescriptor().getSlot();
int channel = data.getDescriptor().getChannel();
long hash = IndexedTable.DEFAULT_GENERATOR.hashCode(crate,slot,channel);

// Try to find it in the translation tables:
for (int j=0; j<tablesTrans.size(); ++j) {

IndexedTable t = tables.get(j);

// Found it; now set the detector indexing for this hit:
if (t.hasEntryByHash(hash)) {
if (translator.hasEntryByHash(hash)) {

int sector = t.getIntValueByHash(0, hash);
int layer = t.getIntValueByHash(1, hash);
int component = t.getIntValueByHash(2, hash);
int order = t.getIntValueByHash(3, hash);
// The tanslated detector indexing:
List<Integer> x = translator.getIntegersByHash(hash);

data.getDescriptor().setSectorLayerComponent(sector, layer, component);
data.getDescriptor().setOrder(order);
data.getDescriptor().setType(keysTrans.get(j));

for(int i = 0; i < data.getADCSize(); i++) data.getADCData(i).setOrder(order);
for(int i = 0; i < data.getTDCSize(); i++) data.getTDCData(i).setOrder(order);

// Assume there's only one instance of this crate/slot/channel
// in all translation tables, and we found it, so stop:
break;
}
// Set the translated detector indexing:
d.getDescriptor().setSectorLayerComponentOrderType(x.get(0),x.get(1),x.get(2),x.get(3),x.get(4));
for (int i=0; i<d.getADCSize(); i++) d.getADCData(i).setOrder(x.get(3));
for (int i=0; i<d.getTDCSize(); i++) d.getTDCData(i).setOrder(x.get(3));
}
}
}
Expand Down