From 8a85458865175ed877a229c7e198791094705e6d Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Wed, 18 Aug 2021 13:06:37 +0200
Subject: [PATCH] Minor DataStream.Reader and Elde.FlowMeter fixes

---
 TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs                 | 2 ++
 TBF/BenchControl/RegisterReaders/DataStream/Reader/Reader.cs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs
index 23b55ea7b..8e9f6e250 100644
--- a/TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs
+++ b/TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs
@@ -23,6 +23,8 @@ namespace TBF.BenchControl.Elde.FlowMeter
 
         public double LtrPerPulseCorrected(double flow, int rangeIx)
         {
+            if (flow == 0) return LtrPerPulse;      /// To avoid division by zero
+
             /// Apply correction
             var rangeCorrections = new List<Config.Entities.MeasurementCorrection>();
             foreach (var corr in Corrections)
diff --git a/TBF/BenchControl/RegisterReaders/DataStream/Reader/Reader.cs b/TBF/BenchControl/RegisterReaders/DataStream/Reader/Reader.cs
index 82d39ffe0..33aab420c 100644
--- a/TBF/BenchControl/RegisterReaders/DataStream/Reader/Reader.cs
+++ b/TBF/BenchControl/RegisterReaders/DataStream/Reader/Reader.cs
@@ -57,6 +57,8 @@ namespace TBF.BenchControl.RegisterReaders.DataStream.Reader
 
         public override void Initialize()
         {
+            samplesDict = new Dictionary<Int64, DataFrame>();
+
             if (DebugLevel == DebugMode.Normal)
             {
                 if (Position < 1 || Position > Math.Min(Config.Data.WMsCount, mefImport.DataStreamIFace.GetMetersCount()))
@@ -64,8 +66,6 @@ namespace TBF.BenchControl.RegisterReaders.DataStream.Reader
                     throw new ArgumentException("Position is out of range");
                 }
 
-                samplesDict = new Dictionary<Int64, DataFrame>();
-
                 log.FatalFormat("{0} initialized: {1}", Name, this);
             }
             else