NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[no commit message]

Browse Source
This commit is contained in:
darksnake 2016-04-17 15:24:16 +03:00
parent d67a74ccd0
commit 441e8a1a3a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
numass-storage/src/main/java/inr/numass/storage/NumassDataLoader.java
View File

@ -184,9 +184,15 @@ public class NumassDataLoader extends AbstractLoader implements ObjectLoader<Env
// LocalDateTime startTime = envelope.meta().get // LocalDateTime startTime = envelope.meta().get
double u = envelope.meta().getDouble("external_meta.HV1_value", 0); double u = envelope.meta().getDouble("external_meta.HV1_value", 0);
double pointTime;
if(envelope.meta().hasValue("external_meta.acquisition_time")){
pointTime = envelope.meta().getValue("external_meta.acquisition_time").doubleValue();
} else {
pointTime = envelope.meta().getValue("acquisition_time").doubleValue();
}
RawNMPoint raw = new RawNMPoint(u, u, RawNMPoint raw = new RawNMPoint(u, u,
events, events,
envelope.meta().getValue("external_meta.acquisition_time").doubleValue(), pointTime,
readTime(envelope.meta())); readTime(envelope.meta()));
return transformation.apply(raw); return transformation.apply(raw);

2
numass-viewer/build.gradle
View File

@ -5,7 +5,7 @@ if (!hasProperty('mainClass')) {
} }
mainClassName = mainClass mainClassName = mainClass
version = "0.2.4" version = "0.2.5"
description = "The viewer for numass data" description = "The viewer for numass data"