From 040a003ab80e900039eafdff09d9757b07a31558 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 7 Apr 2025 14:21:35 -0400 Subject: [PATCH 1/2] fix indentation --- .../main/java/org/jlab/detector/pulse/HipoExtractor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java index 146b087449..6ab098d145 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java @@ -129,8 +129,8 @@ protected List getPulses(int n, IndexedTable it, DataBank wfBank) { for (int i=0; i p = it==null ? extract(null, i, timestamp, time, samples) : extract(it.getNamedEntry(getIndices(wfBank,i)), i, timestamp, time, samples); if (p!=null && !p.isEmpty()) { @@ -149,8 +149,8 @@ protected List 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()) { From 104447dfd27709026e514d2610a82c9ff1a835e7 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 7 Apr 2025 14:22:03 -0400 Subject: [PATCH 2/2] reduce to 30 samples --- .../jlab/detector/decode/CLASDecoder4.java | 2 +- etc/bankdefs/hipo4/data.json | 34 ------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java index 9db665354f..aa366ed859 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java @@ -249,7 +249,7 @@ public List 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) { diff --git a/etc/bankdefs/hipo4/data.json b/etc/bankdefs/hipo4/data.json index 9f42279e5d..826813894d 100644 --- a/etc/bankdefs/hipo4/data.json +++ b/etc/bankdefs/hipo4/data.json @@ -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"} ] },