From 8708d2d0083e8260f72629717c5fa1a8650a8c44 Mon Sep 17 00:00:00 2001
From: Mario Fink <mario.fink@physik.uni-wuerzburg.de>
Date: Mon, 26 Apr 2021 19:41:56 +0200
Subject: [PATCH] * cython/py_imc_termite.pyx: json loads take care of floats,
 fix column assignment * imc_channel.hpp: fix floating precision for
 get_channel() * extend/include advanced usage in examples

---
 cython/py_imc_termite.pyx |  9 +++++----
 lib/imc_channel.hpp       |  4 ++--
 python/usage.py           |  2 +-
 python/usage_adv.py       | 22 +++++++---------------
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/cython/py_imc_termite.pyx b/cython/py_imc_termite.pyx
index d103984..4c5500d 100644
--- a/cython/py_imc_termite.pyx
+++ b/cython/py_imc_termite.pyx
@@ -3,6 +3,7 @@
 from imc_termite cimport imc_termite
 
 import json as jn
+import decimal
 # import numpy as np
 
 cdef class imctermite:
@@ -21,7 +22,7 @@ cdef class imctermite:
   # get JSON list of channels
   def get_channels(self, bool data):
     chnlst = self.cpp_imc.get_channels(True,data)
-    chnlstjn = [jn.loads(chn.decode(errors="ignore")) for chn in chnlst]
+    chnlstjn = [jn.loads(chn.decode(errors="ignore"),parse_float=decimal.Decimal) for chn in chnlst]
     return chnlstjn
 
   # print channels
@@ -31,11 +32,11 @@ cdef class imctermite:
   # print table including channels
   def print_table(self, string outputfile):
     chnlst = self.cpp_imc.get_channels(True,True)
-    chnlstjn = [jn.loads(chn.decode(errors="ignore")) for chn in chnlst]
+    chnlstjn = [jn.loads(chn.decode(errors="ignore"),parse_float=decimal.Decimal) for chn in chnlst]
     with open(outputfile.decode(),'w') as fout:
       for chn in chnlstjn:
-        fout.write(str(chn['yunit']).rjust(20)+str(chn['xunit']).rjust(20)+'\n')
-        fout.write(str(chn['yname']).rjust(20)+str(chn['xname']).rjust(20)+'\n')
+        fout.write('#' +str(chn['xname']).rjust(19)+str(chn['yname']).rjust(20)+'\n')
+        fout.write('#'+str(chn['xunit']).rjust(19)+str(chn['yunit']).rjust(20)+'\n')
         for n in range(0,len(chn['ydata'])):
           fout.write(str(chn['xdata'][n]).rjust(20)+
                      str(chn['ydata'][n]).rjust(20)+'\n')
diff --git a/lib/imc_channel.hpp b/lib/imc_channel.hpp
index a5766cf..26f5d3f 100644
--- a/lib/imc_channel.hpp
+++ b/lib/imc_channel.hpp
@@ -95,7 +95,7 @@ namespace imc
     ss<<"[";
     if ( myvec.size() <= limit )
     {
-      for ( dt el: myvec ) ss<<el<<",";
+      for ( dt el: myvec ) ss<<std::setprecision(10)<<el<<",";
     }
     else
     {
@@ -104,7 +104,7 @@ namespace imc
       ss<<"...";
       for ( unsigned long int i = myvec.size()-heals; i < myvec.size(); i++ )
       {
-        ss<<myvec[i]<<",";
+        ss<<std::setprecision(10)<<myvec[i]<<",";
       }
     }
     std::string sumstr = ss.str();
diff --git a/python/usage.py b/python/usage.py
index 1f7eef9..2efe44a 100644
--- a/python/usage.py
+++ b/python/usage.py
@@ -25,4 +25,4 @@ print(len(chnxdata))
 imcraw.print_channels(b"./")
 
 # print all channels in single file
-# imcraw.print_table(b"./allchannels.csv")
+imcraw.print_table(b"./allchannels.csv")
diff --git a/python/usage_adv.py b/python/usage_adv.py
index d3ad76e..e1424cd 100644
--- a/python/usage_adv.py
+++ b/python/usage_adv.py
@@ -2,6 +2,7 @@
 import imc_termite
 import json
 import glob
+import os
 from pathlib import Path
 
 # list files in sample directory
@@ -12,29 +13,20 @@ print(rawlist1)
 
 for fl in rawlist1:
 
-    print("converting " + str(fl))
+    print("converting " + str(fl) + " : " + str(os.path.basename(fl)) )
 
     # declare and initialize instance of "imctermite" by passing a raw-file
     try :
         imcraw = imc_termite.imctermite(fl.encode())
     except RuntimeError as e :
-        print("failed to load/parse raw-file: " + str(e))
+        raise Exception("failed to load/parse raw-file: " + str(e))
 
     # obtain list of channels as list of dictionaries (without data)
     channels = imcraw.get_channels(False)
     print(json.dumps(channels,indent=4, sort_keys=False))
 
-# # obtain data of first channel (with data)
-# channelsdata = imcraw.get_channels(True)
-# if len(channelsdata) > 0 :
-#     chnydata = channelsdata[0]['ydata']
-#     chnxdata = channelsdata[0]['xdata']
-#
-# print(len(chnydata))
-# print(len(chnxdata))
-#
-# # print the channels into a specific directory
-# imcraw.print_channels(b"./")
+    # print the channels into a specific directory
+    imcraw.print_channels(b"./")
 
-# print all channels in single file
-# imcraw.print_table(b"./allchannels.csv")
+    # print all channels in single file
+    imcraw.print_table(("./"+str(os.path.basename(fl).split('.')[0])+"_allchannels.csv").encode())