From 7f89c69643781d4796a22257046a6281def214c7 Mon Sep 17 00:00:00 2001
From: darksnake <darksnake@LUNA.localdomain>
Date: Thu, 29 Jun 2017 16:57:17 +0300
Subject: [PATCH] Histogram builder

---
 .../src/main/java/inr/numass/NumassProperties.java   |  9 +++++++--
 .../inr/numass/scripts/TestPointAnalyzer.groovy      |  4 ++--
 .../src/main/kotlin/inr/numass/viewer/MainView.kt    | 12 ++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/numass-core/src/main/java/inr/numass/NumassProperties.java b/numass-core/src/main/java/inr/numass/NumassProperties.java
index 233c028c..8e2ca56c 100644
--- a/numass-core/src/main/java/inr/numass/NumassProperties.java
+++ b/numass-core/src/main/java/inr/numass/NumassProperties.java
@@ -6,6 +6,7 @@
 package inr.numass;
 
 import hep.dataforge.context.Global;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -41,12 +42,16 @@ public class NumassProperties {
         }
     }
 
-    public synchronized static void setNumassProperty(String key, String value) {
+    public synchronized static void setNumassProperty(String key, @Nullable String value) {
         try {
             Properties props = new Properties();
             File store = getNumassPropertiesFile();
             props.load(new FileInputStream(store));
-            props.setProperty(key, value);
+            if(value == null){
+                props.remove(key);
+            } else {
+                props.setProperty(key, value);
+            }
             props.store(new FileOutputStream(store), "");
         } catch (IOException ex) {
             Global.instance().getLogger().error("Failed to save numass properties", ex);
diff --git a/numass-main/src/main/groovy/inr/numass/scripts/TestPointAnalyzer.groovy b/numass-main/src/main/groovy/inr/numass/scripts/TestPointAnalyzer.groovy
index c1dfdaea..da6462e5 100644
--- a/numass-main/src/main/groovy/inr/numass/scripts/TestPointAnalyzer.groovy
+++ b/numass-main/src/main/groovy/inr/numass/scripts/TestPointAnalyzer.groovy
@@ -29,13 +29,13 @@ shell.eval {
 
     NumassStorage storage = NumassStorageFactory.buildLocal(rootDir);
 
-    def hv = 15000;
+    def hv = 14000;
     def point = storage.provide("loader::set_2/rawPoint::$hv", RawNMPoint.class).get();
 
     def t0 = (1..150).collect { 5.5e-6 + 2e-7 * it }
 
     def plotPoints = t0.collect {
-        def result = PointAnalyzer.analyzePoint(point, it,500,3100)
+        def result = PointAnalyzer.analyzePoint(point, it)
         MapPoint.fromMap("x.value": it, "y.value": result.cr, "y.err": result.crErr);
     }
     //def cr = t0.collect { PointAnalyzer.analyzePoint(point, it).cr }
diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt
index 5aba9c35..788c0415 100644
--- a/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt
+++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt
@@ -70,10 +70,14 @@ class MainView : View("Numass data viewer") {
             val chooser = DirectoryChooser()
             chooser.title = "Select numass storage root"
             val storageRoot = NumassProperties.getNumassProperty("numass.storage.root")
-            if (storageRoot == null) {
-                chooser.initialDirectory = File(".").absoluteFile
-            } else {
-                chooser.initialDirectory = File(storageRoot)
+            try {
+                if (storageRoot == null) {
+                    chooser.initialDirectory = File(".").absoluteFile
+                } else {
+                    chooser.initialDirectory = File(storageRoot)
+                }
+            } catch (ex: Exception){
+                NumassProperties.setNumassProperty("numass.storage.root", null)
             }
 
             val rootDir = chooser.showDialog(primaryStage.scene.window)