Skip to content

Finalize AHDC waveform length #546

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

Merged
baltzell merged 2 commits into from
Apr 8, 2025
Merged

Finalize AHDC waveform length #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
040a003
fix indentation
baltzell Apr 7, 2025
104447d
reduce to 30 samples
baltzell Apr 7, 2025
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
2 changes: 1 addition & 1 deletion common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public List<DetectorDataDgtz> getEntriesSCALER(DetectorType type,
}

public void extractPulses(Event event) {
ahdcExtractor.update(64, null, event, schemaFactory, "AHDC::wf", "AHDC::adc");
ahdcExtractor.update(30, null, event, schemaFactory, "AHDC::wf", "AHDC::adc");
}

public Bank getDataBankWF(String name, DetectorType type) {
Expand Down
8 changes: 4 additions & 4 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ protected List<Pulse> getPulses(int n, IndexedTable it, DataBank wfBank) {
for (int i=0; i<wfBank.rows(); ++i) {
for (int j=0; j<n; ++j)
samples[j] = wfBank.getShort(String.format("s%d",j+1), i);
long timestamp = wfBank.getLong("timestamp",i);
int time = wfBank.getInt("time",i);
long timestamp = wfBank.getLong("timestamp",i);
int time = wfBank.getInt("time",i);
List<Pulse> p = it==null ? extract(null, i, timestamp, time, samples) :
extract(it.getNamedEntry(getIndices(wfBank,i)), i, timestamp, time, samples);
if (p!=null && !p.isEmpty()) {
Expand All @@ -149,8 +149,8 @@ protected List<Pulse> getPulses(int n, IndexedTable it, Bank wfBank) {
samples[j] = wfBank.getShort(String.format("s%d",j+1), i);
// FIXME: Can speed this up (but looks like not for DataBank?):
//samples[j] = wfBank.getShort(String.format(5+j,j+1), i);
int time = wfBank.getInt("time",i);
long timestamp = wfBank.getLong("timestamp",i);
int time = wfBank.getInt("time",i);
long timestamp = wfBank.getLong("timestamp",i);
List p = it==null ? extract(null, i, timestamp, time, samples) :
extract(it.getNamedEntry(getIndices(wfBank,i)), i, timestamp, time, samples);
if (p!=null && !p.isEmpty()) {
Expand Down
34 changes: 0 additions & 34 deletions etc/bankdefs/hipo4/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,40 +40,6 @@
{ "name":"s28" , "type":"S", "info":""},
{ "name":"s29" , "type":"S", "info":""},
{ "name":"s30" , "type":"S", "info":""},
{ "name":"s31" , "type":"S", "info":""},
{ "name":"s32" , "type":"S", "info":""},
{ "name":"s33" , "type":"S", "info":""},
{ "name":"s34" , "type":"S", "info":""},
{ "name":"s35" , "type":"S", "info":""},
{ "name":"s36" , "type":"S", "info":""},
{ "name":"s37" , "type":"S", "info":""},
{ "name":"s38" , "type":"S", "info":""},
{ "name":"s39" , "type":"S", "info":""},
{ "name":"s40" , "type":"S", "info":""},
{ "name":"s41" , "type":"S", "info":""},
{ "name":"s42" , "type":"S", "info":""},
{ "name":"s43" , "type":"S", "info":""},
{ "name":"s44" , "type":"S", "info":""},
{ "name":"s45" , "type":"S", "info":""},
{ "name":"s46" , "type":"S", "info":""},
{ "name":"s47" , "type":"S", "info":""},
{ "name":"s48" , "type":"S", "info":""},
{ "name":"s49" , "type":"S", "info":""},
{ "name":"s50" , "type":"S", "info":""},
{ "name":"s51" , "type":"S", "info":""},
{ "name":"s52" , "type":"S", "info":""},
{ "name":"s53" , "type":"S", "info":""},
{ "name":"s54" , "type":"S", "info":""},
{ "name":"s55" , "type":"S", "info":""},
{ "name":"s56" , "type":"S", "info":""},
{ "name":"s57" , "type":"S", "info":""},
{ "name":"s58" , "type":"S", "info":""},
{ "name":"s59" , "type":"S", "info":""},
{ "name":"s60" , "type":"S", "info":""},
{ "name":"s61" , "type":"S", "info":""},
{ "name":"s62" , "type":"S", "info":""},
{ "name":"s63" , "type":"S", "info":""},
{ "name":"s64" , "type":"S", "info":""},
{ "name":"time" , "type":"I", "info":"for fine time correction"}
]
},
Expand Down