From 92e97def3ea15e3f36d92598c1af946ebc9ef342 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mon, 9 Nov 2015 06:39:54 +0100
Subject: [PATCH] replace jdcal calls with upstream
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
mne/io/tag.py | 2 +-
mne/io/write.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mne/io/tag.py b/mne/io/tag.py
index 1f95733..08d9a79 100644
--- a/mne/io/tag.py
+++ b/mne/io/tag.py
@@ -475,7 +475,7 @@ def read_tag(fid, pos=None, shape=None, rlims=None):
s, dtype='>i4,>u4,>i4,>i4')[0]))
elif tag.type == FIFF.FIFFT_JULIAN:
tag.data = int(np.fromstring(fid.read(4), dtype=">i4"))
- tag.data = jd2jcal(tag.data)
+ tag.data = jd2jcal(tag.data, 0)[:-1]
else:
raise Exception('Unimplemented tag data type %s' % tag.type)
diff --git a/mne/io/write.py b/mne/io/write.py
index da090fb..f8a5522 100644
--- a/mne/io/write.py
+++ b/mne/io/write.py
@@ -91,7 +91,7 @@ def write_julian(fid, kind, data):
"""Writes a Julian-formatted date to a FIF file"""
assert len(data) == 3
data_size = 4
- jd = np.sum(jcal2jd(*data))
+ jd = np.sum(jcal2jd(*data)[-1])
data = np.array(jd, dtype='>i4')
_write(fid, data, kind, data_size, FIFF.FIFFT_JULIAN, '>i4')
--
2.6.3