-
Notifications
You must be signed in to change notification settings - Fork 28
feat: indexed table class can handle more than 4 indices #756
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.
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
feat: indexed table class can handle more than 4 indices #756
Conversation
…ttps://github.com/JeffersonLab/coatjava into 755-allow-more-than-four-indices-in-indexed-tables
* update to DC tracking to read and use the new TDC cuts ccdb table. * use live database * build: bump version number to 13.1.0 (#757) * remove unused/defunct classes * convert tabs to spaces * remove unused/defunct classes * remove long-defunct main methods * cleanup * switch example to hipo4 * remove hipo3 support * remove unused/defunct classes * cleanup, tabs/spaces, formatting, ide warnings * cleanup, formatting, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * remove (newly) unused dependencies * restore object creation * convert tabs to spaces * cleanup * remove no-op * build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin (#759) * apply fine timestamp correction to leadingEdgeTime * ahdc hit time corrected * add modeAHDC in PulseExtractorEngine * use wf type for hit selection * take into account simulation * replace string manipulation with bit operation * comment unnecessary code lines * use wfType 0 or 1 * fix: reduce the number of CODEOWNERS (#764) * fix: remove unused `etc/` files (#765) They are 7-8 years old, and it is not clear what they are; they are apparently unused here. --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]>
|
Looks like squash merging #768 confused GitHub's representation of the changes this PR will do, since GitHub claims you propose to change 149 files. That's possibly a weird GitHub bug. I'm going to add a merge commit here (by clicking the update branch button) to see if that clears it up. |
Yep, that fixed it. Strange GitHub bug... |
|
Let's get #769 merged first ... |
Benchmark comparison pipelines: |
…ttps://github.com/JeffersonLab/coatjava into 755-allow-more-than-four-indices-in-indexed-tables
|
Ran benchmarks based on #769 and compared to development: development branch
this branch
|
common-tools/clas-utils/src/main/java/org/jlab/utils/groups/IndexedList.java
Show resolved
Hide resolved
common-tools/clas-utils/src/main/java/org/jlab/utils/groups/IndexedList.java
Outdated
Show resolved
Hide resolved
common-tools/clas-utils/src/main/java/org/jlab/utils/groups/IndexedList.java
Outdated
Show resolved
Hide resolved
common-tools/clas-utils/src/main/java/org/jlab/utils/groups/IndexedList.java
Outdated
Show resolved
Hide resolved
common-tools/clas-utils/src/main/java/org/jlab/utils/groups/IndexedList.java
Outdated
Show resolved
Hide resolved
raffaelladevita
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, line 297 of IndexedList should be updated (I missed that before, sorry!)
common-tools/clas-utils/src/main/java/org/jlab/utils/groups/IndexedList.java
Outdated
Show resolved
Hide resolved
* feat: indexed table class can handle more than 4 indices * feat: default constructor for the IndexGenerator class * restoring main class as it was * update branch (#768) * update to DC tracking to read and use the new TDC cuts ccdb table. * use live database * build: bump version number to 13.1.0 (#757) * remove unused/defunct classes * convert tabs to spaces * remove unused/defunct classes * remove long-defunct main methods * cleanup * switch example to hipo4 * remove hipo3 support * remove unused/defunct classes * cleanup, tabs/spaces, formatting, ide warnings * cleanup, formatting, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * remove (newly) unused dependencies * restore object creation * convert tabs to spaces * cleanup * remove no-op * build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin (#759) * apply fine timestamp correction to leadingEdgeTime * ahdc hit time corrected * add modeAHDC in PulseExtractorEngine * use wf type for hit selection * take into account simulation * replace string manipulation with bit operation * comment unnecessary code lines * use wfType 0 or 1 * fix: reduce the number of CODEOWNERS (#764) * fix: remove unused `etc/` files (#765) They are 7-8 years old, and it is not clear what they are; they are apparently unused here. --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]> * feat: can parse any byte shifts array for indexed tables * default byte shift array can only be used for less than 4 indices * misc fixes to compute long key and checks for byte shifts and index format * check bin width compatible with int * fix retrieving index from key --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]>
* feat: indexed table class can handle more than 4 indices * feat: default constructor for the IndexGenerator class * restoring main class as it was * update branch (#768) * update to DC tracking to read and use the new TDC cuts ccdb table. * use live database * build: bump version number to 13.1.0 (#757) * remove unused/defunct classes * convert tabs to spaces * remove unused/defunct classes * remove long-defunct main methods * cleanup * switch example to hipo4 * remove hipo3 support * remove unused/defunct classes * cleanup, tabs/spaces, formatting, ide warnings * cleanup, formatting, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * remove (newly) unused dependencies * restore object creation * convert tabs to spaces * cleanup * remove no-op * build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin (#759) * apply fine timestamp correction to leadingEdgeTime * ahdc hit time corrected * add modeAHDC in PulseExtractorEngine * use wf type for hit selection * take into account simulation * replace string manipulation with bit operation * comment unnecessary code lines * use wfType 0 or 1 * fix: reduce the number of CODEOWNERS (#764) * fix: remove unused `etc/` files (#765) They are 7-8 years old, and it is not clear what they are; they are apparently unused here. --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]> * feat: can parse any byte shifts array for indexed tables * default byte shift array can only be used for less than 4 indices * misc fixes to compute long key and checks for byte shifts and index format * check bin width compatible with int * fix retrieving index from key --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]>
* feat: indexed table class can handle more than 4 indices * feat: default constructor for the IndexGenerator class * restoring main class as it was * update branch (#768) * update to DC tracking to read and use the new TDC cuts ccdb table. * use live database * build: bump version number to 13.1.0 (#757) * remove unused/defunct classes * convert tabs to spaces * remove unused/defunct classes * remove long-defunct main methods * cleanup * switch example to hipo4 * remove hipo3 support * remove unused/defunct classes * cleanup, tabs/spaces, formatting, ide warnings * cleanup, formatting, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * remove (newly) unused dependencies * restore object creation * convert tabs to spaces * cleanup * remove no-op * build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin (#759) * apply fine timestamp correction to leadingEdgeTime * ahdc hit time corrected * add modeAHDC in PulseExtractorEngine * use wf type for hit selection * take into account simulation * replace string manipulation with bit operation * comment unnecessary code lines * use wfType 0 or 1 * fix: reduce the number of CODEOWNERS (#764) * fix: remove unused `etc/` files (#765) They are 7-8 years old, and it is not clear what they are; they are apparently unused here. --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]> * feat: can parse any byte shifts array for indexed tables * default byte shift array can only be used for less than 4 indices * misc fixes to compute long key and checks for byte shifts and index format * check bin width compatible with int * fix retrieving index from key --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]>
* feat: indexed table class can handle more than 4 indices * feat: default constructor for the IndexGenerator class * restoring main class as it was * update branch (#768) * update to DC tracking to read and use the new TDC cuts ccdb table. * use live database * build: bump version number to 13.1.0 (#757) * remove unused/defunct classes * convert tabs to spaces * remove unused/defunct classes * remove long-defunct main methods * cleanup * switch example to hipo4 * remove hipo3 support * remove unused/defunct classes * cleanup, tabs/spaces, formatting, ide warnings * cleanup, formatting, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * remove (newly) unused dependencies * restore object creation * convert tabs to spaces * cleanup * remove no-op * build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin (#759) * apply fine timestamp correction to leadingEdgeTime * ahdc hit time corrected * add modeAHDC in PulseExtractorEngine * use wf type for hit selection * take into account simulation * replace string manipulation with bit operation * comment unnecessary code lines * use wfType 0 or 1 * fix: reduce the number of CODEOWNERS (#764) * fix: remove unused `etc/` files (#765) They are 7-8 years old, and it is not clear what they are; they are apparently unused here. --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]> * feat: can parse any byte shifts array for indexed tables * default byte shift array can only be used for less than 4 indices * misc fixes to compute long key and checks for byte shifts and index format * check bin width compatible with int * fix retrieving index from key --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]>
* feat: indexed table class can handle more than 4 indices * feat: default constructor for the IndexGenerator class * restoring main class as it was * update branch (#768) * update to DC tracking to read and use the new TDC cuts ccdb table. * use live database * build: bump version number to 13.1.0 (#757) * remove unused/defunct classes * convert tabs to spaces * remove unused/defunct classes * remove long-defunct main methods * cleanup * switch example to hipo4 * remove hipo3 support * remove unused/defunct classes * cleanup, tabs/spaces, formatting, ide warnings * cleanup, formatting, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * remove (newly) unused dependencies * restore object creation * convert tabs to spaces * cleanup * remove no-op * build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin (#759) * apply fine timestamp correction to leadingEdgeTime * ahdc hit time corrected * add modeAHDC in PulseExtractorEngine * use wf type for hit selection * take into account simulation * replace string manipulation with bit operation * comment unnecessary code lines * use wfType 0 or 1 * fix: reduce the number of CODEOWNERS (#764) * fix: remove unused `etc/` files (#765) They are 7-8 years old, and it is not clear what they are; they are apparently unused here. --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]> * feat: can parse any byte shifts array for indexed tables * default byte shift array can only be used for less than 4 indices * misc fixes to compute long key and checks for byte shifts and index format * check bin width compatible with int * fix retrieving index from key --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]>
* feat: indexed table class can handle more than 4 indices * feat: default constructor for the IndexGenerator class * restoring main class as it was * update branch (#768) * update to DC tracking to read and use the new TDC cuts ccdb table. * use live database * build: bump version number to 13.1.0 (#757) * remove unused/defunct classes * convert tabs to spaces * remove unused/defunct classes * remove long-defunct main methods * cleanup * switch example to hipo4 * remove hipo3 support * remove unused/defunct classes * cleanup, tabs/spaces, formatting, ide warnings * cleanup, formatting, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * remove (newly) unused dependencies * restore object creation * convert tabs to spaces * cleanup * remove no-op * build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin (#759) * apply fine timestamp correction to leadingEdgeTime * ahdc hit time corrected * add modeAHDC in PulseExtractorEngine * use wf type for hit selection * take into account simulation * replace string manipulation with bit operation * comment unnecessary code lines * use wfType 0 or 1 * fix: reduce the number of CODEOWNERS (#764) * fix: remove unused `etc/` files (#765) They are 7-8 years old, and it is not clear what they are; they are apparently unused here. --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]> * feat: can parse any byte shifts array for indexed tables * default byte shift array can only be used for less than 4 indices * misc fixes to compute long key and checks for byte shifts and index format * check bin width compatible with int * fix retrieving index from key --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]>
* feat: indexed table class can handle more than 4 indices * feat: default constructor for the IndexGenerator class * restoring main class as it was * update branch (#768) * update to DC tracking to read and use the new TDC cuts ccdb table. * use live database * build: bump version number to 13.1.0 (#757) * remove unused/defunct classes * convert tabs to spaces * remove unused/defunct classes * remove long-defunct main methods * cleanup * switch example to hipo4 * remove hipo3 support * remove unused/defunct classes * cleanup, tabs/spaces, formatting, ide warnings * cleanup, formatting, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * cleanup, formatting, tabs/spaces, ide warnings * remove (newly) unused dependencies * restore object creation * convert tabs to spaces * cleanup * remove no-op * build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin (#759) * apply fine timestamp correction to leadingEdgeTime * ahdc hit time corrected * add modeAHDC in PulseExtractorEngine * use wf type for hit selection * take into account simulation * replace string manipulation with bit operation * comment unnecessary code lines * use wfType 0 or 1 * fix: reduce the number of CODEOWNERS (#764) * fix: remove unused `etc/` files (#765) They are 7-8 years old, and it is not clear what they are; they are apparently unused here. --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]> * feat: can parse any byte shifts array for indexed tables * default byte shift array can only be used for less than 4 indices * misc fixes to compute long key and checks for byte shifts and index format * check bin width compatible with int * fix retrieving index from key --------- Co-authored-by: ziegler <[email protected]> Co-authored-by: Nathan Baltzell <[email protected]> Co-authored-by: raffaelladevita <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Felix Touchte Codjo <[email protected]> Co-authored-by: Christopher Dilks <[email protected]>
It can handle up to 4 indices with 16 bits or up to 9 indices with 7 bits. Could be made more generic.