Skip to content

Commit acb6ba2

Browse files
committed
fix data type
1 parent 99e38e1 commit acb6ba2

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ protected List<Pulse> getPulses(int n, IndexedTable it, DataBank wfBank) {
130130
for (int j=0; j<n; ++j)
131131
samples[j] = wfBank.getShort(String.format("s%d",j+1), i);
132132
long timestamp = wfBank.getLong("timestamp",i);
133-
long time = wfBank.getLong("time",i);
133+
int time = wfBank.getInt("time",i);
134134
List<Pulse> p = it==null ? extract(null, i, timestamp, time, samples) :
135135
extract(it.getNamedEntry(getIndices(wfBank,i)), i, timestamp, time, samples);
136136
if (p!=null && !p.isEmpty()) {
@@ -149,7 +149,7 @@ protected List<Pulse> getPulses(int n, IndexedTable it, Bank wfBank) {
149149
samples[j] = wfBank.getShort(String.format("s%d",j+1), i);
150150
// FIXME: Can speed this up (but looks like not for DataBank?):
151151
//samples[j] = wfBank.getShort(String.format(5+j,j+1), i);
152-
long time = wfBank.getLong("time",i);
152+
int time = wfBank.getInt("time",i);
153153
long timestamp = wfBank.getLong("timestamp",i);
154154
List p = it==null ? extract(null, i, timestamp, time, samples) :
155155
extract(it.getNamedEntry(getIndices(wfBank,i)), i, timestamp, time, samples);

etc/bankdefs/hipo4/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
{ "name":"s62" , "type":"S", "info":""},
7575
{ "name":"s63" , "type":"S", "info":""},
7676
{ "name":"s64" , "type":"S", "info":""},
77-
{ "name":"time" , "type":"S", "info":"for fine time correction"}
77+
{ "name":"time" , "type":"I", "info":"for fine time correction"}
7878
]
7979
},
8080
{

0 commit comments

Comments
 (0)