Changeset ac38ab4 in sasview for src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

Timestamp:

Jul 11, 2018 9:33:00 AM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

7fd5e2a

Parents:

b799f09

Message:

Save process and transmission spectrum and fix issues with loading them.

File:

• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (3 diffs)

src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

@@ -420 +420 @@
         :param key: class name data_point was taken from
         """
+        term_match = re.compile(u'^term[0-9]+$')
         if key == u'Title':  # CanSAS 2.0
             self.process.name = data_point
@@ -428 +429 @@
         elif key == u'date':
             self.process.date = data_point
-        elif key == u'term':
-            self.process.term = data_point
+        elif term_match.match(key):
+            self.process.term.append(data_point)
         else:
             self.process.notes.append(data_point)
@@ -473 +474 @@
             spectrum_list = []
             for spectrum in self.current_datainfo.trans_spectrum:
-                spectrum.transmission = np.delete(spectrum.transmission, [0])
                 spectrum.transmission = spectrum.transmission.astype(np.float64)
-                spectrum.transmission_deviation = np.delete(
-                    spectrum.transmission_deviation, [0])
                 spectrum.transmission_deviation = \
                     spectrum.transmission_deviation.astype(np.float64)
-                spectrum.wavelength = np.delete(spectrum.wavelength, [0])
                 spectrum.wavelength = spectrum.wavelength.astype(np.float64)
                 if len(spectrum.transmission) > 0: