Skip to content

feat: speedup DC indexed table access by reducing hashing #1235

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

Closed
baltzell wants to merge 5 commits into from
Closed

feat: speedup DC indexed table access by reducing hashing #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3887b5d
switch to row/hash based lookup
baltzell Apr 28, 2026
9f2a41c
reduce hashing
baltzell Apr 28, 2026
40553ff
add integer-based accessors
baltzell Apr 30, 2026
d5e1ed5
use integer access for jitter bank
baltzell Apr 30, 2026
64fd1ae
use integer-based access for read DC::tdc banks
baltzell Apr 30, 2026
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
45 changes: 45 additions & 0 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/banks/FilteredBank.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,51 @@ public float getFloat(String varName, int index ){
return bank.getFloat(varName, indexList.get(index));
}

/**
* @param element
* @param index
* @return value for the filtered index
*/
public int getByte(int element, int index) {
return bank.getByte(element, indexList.get(index));
}

/**
* @param element
* @param index
* @return value for the filtered index
*/
public int getShort(int element, int index) {
return bank.getShort(element, indexList.get(index));
}

/**
* @param element
* @param index
* @return value for the filtered index
*/
public int getInt(int element, int index) {
return bank.getInt(element, indexList.get(index));
}

/**
* @param element
* @param index
* @return value for the filtered index
*/
public long getLong(int element, int index) {
return bank.getLong(element, indexList.get(index));
}

/**
* @param element
* @param index
* @return value for the filtered index
*/
public float getFloat(int element, int index) {
return bank.getFloat(element, indexList.get(index));
}

/**
* @param index filtered index to retrieve
* @return true bank row index corresponding to the filtered index
Expand Down
16 changes: 9 additions & 7 deletions reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,14 +519,16 @@ private void addReverseTT(int run, IndexedTable tt) {
int crate = tt.getList().getIndexGenerator().getIndex((long)key, 0);
int slot = tt.getList().getIndexGenerator().getIndex((long)key, 1);
int channel = tt.getList().getIndexGenerator().getIndex((long)key, 2);
int sector = tt.getIntValue("sector", crate,slot,channel);
int layer = tt.getIntValue("layer", crate,slot,channel);
int comp = tt.getIntValue("component", crate,slot,channel);
int order = tt.getIntValue("order", crate,slot,channel);
int sector = tt.getIntValueByHash(0, (long)key);
int layer = tt.getIntValueByHash(1, (long)key);
int comp = tt.getIntValueByHash(2, (long)key);
int order = tt.getIntValueByHash(3, (long)key);
reverse.addEntry(sector, layer, comp, order);
reverse.setIntValue(crate, "crate", sector, layer, comp, order);
reverse.setIntValue(slot, "slot", sector, layer, comp, order);
reverse.setIntValue(channel, "channel", sector, layer, comp, order);
long hash = IndexedTable.DEFAULT_GENERATOR.hashCode(sector,layer,comp,order);
reverse.setIntValueByHash(crate, 0, hash);
reverse.setIntValueByHash(crate, 1, hash);
reverse.setIntValueByHash(slot, 2, hash);
reverse.setIntValueByHash(channel, 3, hash);
}
reverseTTs.put(run, reverse);
}
Expand Down
16 changes: 8 additions & 8 deletions reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ private void getDCRBJitters(boolean swapBits) {

DataBank bankTS = event.getBank(bankNames.getTimeStampBank());
for(int i=0; i<bankTS.rows(); i++) {
int crate = bankTS.getByte("crate", i);
int slot = bankTS.getByte("slot", i);
long timestamp = bankTS.getLong("timestamp", i);
int crate = bankTS.getByte(0, i);
int slot = bankTS.getByte(1, i);
long timestamp = bankTS.getLong(2, i);
if(swapBits) {
timestamp = (Long) (((timestamp&0x0000ffffff000000L)>>24)|((timestamp&0x0000000000ffffffL)<<24));
}
Expand Down Expand Up @@ -186,12 +186,12 @@ public void fetch_DCHits(DataEvent event) {

this.set_NumTDCBankRows(bankFiltered.rows());
for (int i = 0; i < bankFiltered.rows(); i++) {
int sector = bankFiltered.getByte("sector", i);
int layer = (bankFiltered.getByte("layer", i)-1)%6 + 1;
int superlayer = (bankFiltered.getByte("layer", i)-1)/6 + 1;
int wire = bankFiltered.getShort("component", i);
int sector = bankFiltered.getByte(0, i);
int layer = (bankFiltered.getByte(1, i)-1)%6 + 1;
int superlayer = (bankFiltered.getByte(1, i)-1)/6 + 1;
int wire = bankFiltered.getShort(2, i);
int order = bankFiltered.trueOrder(i);
int jitter = this.getJitter(sector, bankFiltered.getByte("layer", i), wire, order);
int jitter = this.getJitter(sector, bankFiltered.getByte(1, i), wire, order);
int tdc = bankFiltered.getInt("TDC", i) - jitter;
int index = bankFiltered.trueIndex(i);

Expand Down
Loading