Merge branch 'master' of github.com:timetag/ETA

timetag · Jul 27, 2019 · 543afb4 · 543afb4
2 parents 183775f + cf51282
commit 543afb4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/etabackend/eta.py b/etabackend/eta.py
@@ -4,7 +4,7 @@
 import multiprocessing
 from subprocess import run
 #multiprocessing.freeze_support()
-ETA_VERSION = "v0.6.2"
+ETA_VERSION = "v0.6.3"
 try:
     #deps check
     import webinstall

diff --git a/etabackend/eta_runtime.py b/etabackend/eta_runtime.py
@@ -240,7 +240,7 @@ def simple_cut(self, filename, cuts=1, keep_indexes=None, format=-1):
         if ret1 is not 0:
             raise ValueError(
                 "ETA.SIMPLE_CUT: File {} is not found or incorrect, err code {}.".format(filename, ret1))
-        BytesofRecords = parse_output[-2]
+        BytesofRecords = parse_output[5] 
         TTF_header_offset = parse_output[0]
         TTF_filesize = parse_output[1]
 

diff --git a/etabackend/parser_header.py b/etabackend/parser_header.py
@@ -8,11 +8,12 @@
 NumRecords_get = link_global("NumRecords")
 RecordType_get =link_global("RecordType")
 PARSE_TimeTagFileHeader = link_function("PARSE_TimeTagFileHeader",2)
-@jit(nopython=True, parallel=True, nogil=True)
+@jit(nopython=True, nogil=True)
 def parse_header(filename1, filetype):
     link_libs()
     filename = ffi.from_buffer(filename1)
     ret1 = PARSE_TimeTagFileHeader(filename,nb.int32(filetype))
+    # can not return them as a list because the cast from int32 to unicode is not possible 
     return (ret1,[
             TTF_header_offset_get(),#0
             TTF_filesize_get(),#1

diff --git a/gui/package.json b/gui/package.json
@@ -3,7 +3,7 @@
   "license": "MIT",
   "author": "Zuzeng Lin <zuzeng@kth.se>",
   "homepage": "http://timetag.github.io",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "scripts": {
     "dev": "electron .",
     "dist": "electron-builder",

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="etabackend",
-    version="0.6.2",
+    version="0.6.3",
     author="ETA Team",
     description="Extensible Timetag Analyzer",
     include_package_data=True,