From 441e8a1a3ad4180def8fa97ba494ee0c6c0a9414 Mon Sep 17 00:00:00 2001
From: darksnake <darksnake@MIRANDA>
Date: Sun, 17 Apr 2016 15:24:16 +0300
Subject: [PATCH] [no commit message]

---
 .../main/java/inr/numass/storage/NumassDataLoader.java    | 8 +++++++-
 numass-viewer/build.gradle                                | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/numass-storage/src/main/java/inr/numass/storage/NumassDataLoader.java b/numass-storage/src/main/java/inr/numass/storage/NumassDataLoader.java
index 4305b1b7..5218e6c2 100644
--- a/numass-storage/src/main/java/inr/numass/storage/NumassDataLoader.java
+++ b/numass-storage/src/main/java/inr/numass/storage/NumassDataLoader.java
@@ -184,9 +184,15 @@ public class NumassDataLoader extends AbstractLoader implements ObjectLoader<Env
 
 //        LocalDateTime startTime = envelope.meta().get
         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,
                 events,
-                envelope.meta().getValue("external_meta.acquisition_time").doubleValue(),
+                pointTime,
                 readTime(envelope.meta()));
 
         return transformation.apply(raw);
diff --git a/numass-viewer/build.gradle b/numass-viewer/build.gradle
index 32fff43b..1e6305c4 100644
--- a/numass-viewer/build.gradle
+++ b/numass-viewer/build.gradle
@@ -5,7 +5,7 @@ if (!hasProperty('mainClass')) {
 }
 mainClassName = mainClass
 
-version = "0.2.4"
+version = "0.2.5"
 
 description = "The viewer for numass data"