From 3127f1e7be4cc33cfefeed11e4be18e3f9fefce8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 9 Jul 2017 16:51:47 +0300
Subject: [PATCH] Site fixed

---
 .../java/inr/numass/data/NumassDataUtils.java |  4 ++-
 .../numass/data/analyzers/SimpleAnalyzer.java | 27 ++++++++++++++++---
 .../inr/numass/data/api/NumassAnalyzer.java   |  9 +++++++
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java b/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java
index f673c804..3b809208 100644
--- a/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java
+++ b/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java
@@ -3,6 +3,8 @@ package inr.numass.data;
 import hep.dataforge.tables.ListTable;
 import hep.dataforge.tables.Table;
 import hep.dataforge.values.Values;
+import inr.numass.data.api.NumassPoint;
+import inr.numass.data.api.NumassSet;
 
 import java.time.Instant;
 import java.util.Arrays;
@@ -17,7 +19,7 @@ import java.util.stream.Stream;
  */
 public class NumassDataUtils {
 
-    public static Collection<NumassPoint> joinSpectra(Stream<NumassData> spectra) {
+    public static Collection<NumassPoint> joinSpectra(Stream<NumassSet> spectra) {
         Map<Double, NumassPoint> map = new LinkedHashMap<>();
         spectra.forEach(datum -> {
             datum.forEach(point -> {
diff --git a/numass-core/src/main/java/inr/numass/data/analyzers/SimpleAnalyzer.java b/numass-core/src/main/java/inr/numass/data/analyzers/SimpleAnalyzer.java
index a28c0cec..a2fcaea8 100644
--- a/numass-core/src/main/java/inr/numass/data/analyzers/SimpleAnalyzer.java
+++ b/numass-core/src/main/java/inr/numass/data/analyzers/SimpleAnalyzer.java
@@ -1,16 +1,19 @@
 package inr.numass.data.analyzers;
 
 import hep.dataforge.meta.Meta;
+import hep.dataforge.tables.Table;
+import hep.dataforge.tables.TableFormat;
+import hep.dataforge.tables.TableFormatBuilder;
 import hep.dataforge.tables.ValueMap;
 import hep.dataforge.values.Values;
-import inr.numass.data.api.NumassAnalyzer;
-import inr.numass.data.api.NumassBlock;
-import inr.numass.data.api.NumassEvent;
-import inr.numass.data.api.SignalProcessor;
+import inr.numass.data.api.*;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.stream.Stream;
 
+import static hep.dataforge.tables.XYAdapter.*;
+import static inr.numass.data.api.NumassPoint.HV_KEY;
+
 /**
  * A simple event counter
  * Created by darksnake on 07.07.2017.
@@ -24,6 +27,7 @@ public class SimpleAnalyzer implements NumassAnalyzer {
     public SimpleAnalyzer(@Nullable SignalProcessor processor) {
         this.processor = processor;
     }
+
     public SimpleAnalyzer() {
         this.processor = null;
     }
@@ -64,4 +68,19 @@ public class SimpleAnalyzer implements NumassAnalyzer {
                 }
         );
     }
+
+    @Override
+    public Table analyze(NumassSet set, Meta config) {
+        TableFormat format = new TableFormatBuilder()
+                .addNumber(HV_KEY, X_VALUE_KEY)
+                .addNumber("length")
+                .addNumber("count")
+                .addNumber(COUNT_RATE_KEY, Y_VALUE_KEY)
+                .addNumber(COUNT_RATE_ERROR_KEY, Y_ERROR_KEY)
+                .addColumn("window")
+                .addTime()
+                .build();
+
+
+    }
 }
diff --git a/numass-core/src/main/java/inr/numass/data/api/NumassAnalyzer.java b/numass-core/src/main/java/inr/numass/data/api/NumassAnalyzer.java
index 1d304cb1..90bbaee9 100644
--- a/numass-core/src/main/java/inr/numass/data/api/NumassAnalyzer.java
+++ b/numass-core/src/main/java/inr/numass/data/api/NumassAnalyzer.java
@@ -1,6 +1,7 @@
 package inr.numass.data.api;
 
 import hep.dataforge.meta.Meta;
+import hep.dataforge.tables.Table;
 import hep.dataforge.values.Values;
 
 /**
@@ -20,5 +21,13 @@ public interface NumassAnalyzer {
      */
     Values analyze(NumassBlock block, Meta config);
 
+    /**
+     * Analyze the whole set
+     * @param set
+     * @param config
+     * @return
+     */
+    Table analyze(NumassSet set, Meta config);
+
 
 }