Merge remote-tracking branch 'upstream/master'

hyperspy/io_plugins/blockfile.py

@@ -61,7 +61,7 @@ def _to_serial_date(dt):
 mapping = {
     'blockfile_header.Beam_energy':
     ("Acquisition_instrument.TEM.beam_energy", lambda x: x * 1e-3),
-    'blockfile_header.Aquisiton_time':
+    'blockfile_header.Acquisition_time':
     ("General.time", _from_serial_date),
     'blockfile_header.Camera_length':
     ("Acquisition_instrument.TEM.camera_length", lambda x: x * 1e-4),
@@ -89,7 +89,7 @@ def get_header_dtype_list(endianess='<'):
             ('Beam_energy', end + 'u4'),        # [V]
             ('SDP', end + 'u2'),                # Pixel size [100 * ppcm]
             ('Camera_length', end + 'u4'),      # [10 * mm]
-            ('Aquisiton_time', end + 'f8'),     # [Serial date]
+            ('Acquisition_time', end + 'f8'),   # [Serial date]
         ] + [
             ('Centering_N%d' % i, 'f8') for i in xrange(8)
         ] + [
@@ -108,7 +108,10 @@ def get_default_header(endianess='<'):
     header['MAGIC'][0] = magics[0]
     header['Data_offset_1'][0] = 0x1000     # Always this value observed
     header['UNKNOWN1'][0] = 131141          # Very typical value (always?)
-    header['Aquisiton_time'][0] = _to_serial_date(datetime.now(tz.tzutc()))
+    header['Acquisition_time'][0] = _to_serial_date(
+        datetime.fromtimestamp(86400, tz.tzutc()))
+        # Default to UNIX epoch + 1 day
+        # Have to add 1 day, as dateutil's timezones dont work before epoch
     return header
 
 

hyperspy/tests/io/test_blockfile.py

@@ -153,7 +153,7 @@ def test_non_square():
         ).astype(np.uint8))
     try:
         with nt.assert_raises(ValueError):
-            signal.save(save_path)
+            signal.save(save_path, overwrite=True)
     finally:
         _remove_file(save_path)
 
@@ -221,7 +221,7 @@ def test_write_data_line():
     signal = hs.signals.Image((255*np.random.rand(3, 5, 5)
         ).astype(np.uint8))
     try:
-        signal.save(save_path)
+        signal.save(save_path, overwrite=True)
         sig_reload = hs.load(save_path)
         np.testing.assert_equal(signal.data, sig_reload.data)
     finally:
@@ -232,7 +232,7 @@ def test_write_data_single():
     signal = hs.signals.Image((255*np.random.rand(5, 5)
         ).astype(np.uint8))
     try:
-        signal.save(save_path)
+        signal.save(save_path, overwrite=True)
         sig_reload = hs.load(save_path)
         np.testing.assert_equal(signal.data, sig_reload.data)
     finally:
@@ -245,7 +245,7 @@ def test_write_data_am_mismatch():
     signal.axes_manager.navigation_axes[1].size = 4
     try:
         with nt.assert_raises(ValueError):
-            signal.save(save_path)
+            signal.save(save_path, overwrite=True)
     finally:
         _remove_file(save_path)
 
@@ -255,7 +255,7 @@ def test_write_cutoff():
         ).astype(np.uint8))
     signal.axes_manager.navigation_axes[0].size = 20
     try:
-        signal.save(save_path)
+        signal.save(save_path, overwrite=True)
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter("always")
             sig_reload = hs.load(save_path)