Changeset ac38ab4 in sasview for src/sas/sascalc

Timestamp:

Jul 11, 2018 11: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.

Location:

src/sas/sascalc

Files:

• dataloader/readers/cansas_reader_HDF5.py (modified) (3 diffs)
• file_converter/nxcansas_writer.py (modified) (2 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:

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -175 +175 @@
             names=['beam_size_x', 'beam_size_y'],
             units=data_info.source.beam_size_unit, write_fn=_write_h5_float)
-
 
         # Collimation metadata
@@ -232 +231 @@
             detector_entry.attrs['name'] = ''
 
+        # Process meta data
+        if len(data_info.process) > 0 and not data_info.process[0].is_empty():
+            i = 1
+            for process in data_info.process:
+                process_entry = sasentry.create_group(
+                    'sasprocess{0:0=2d}'.format(i))
+                process_entry.attrs['canSAS_class'] = 'SASprocess'
+                if process.name:
+                    name = _h5_string(process.name)
+                    process_entry.create_dataset('name', data=name)
+                if process.date:
+                    date = _h5_string(process.date)
+                    process_entry.create_dataset('date', data=date)
+                if process.description:
+                    desc = _h5_string(process.description)
+                    process_entry.create_dataset('description', data=desc)
+                j = 1
+                for term in process.term:
+                    if term:
+                        h5_term = _h5_string(term)
+                        process_entry.create_dataset('term{0:0=2d}'.format(j),
+                                                     data=h5_term)
+                    j += 1
+                j = 1
+                for note in process.notes:
+                    if note:
+                        h5_note = _h5_string(note)
+                        process_entry.create_dataset('note{0:0=2d}'.format(j),
+                                                     data=h5_note)
+                    j += 1
+                i += 1
+
+        # Transmission Spectrum
+        if len(data_info.trans_spectrum) > 0:
+            i = 1
+            for trans in data_info.trans_spectrum:
+                trans_entry = sasentry.create_group(
+                    'sastransmission_spectrum{0:0=2d}'.format(i))
+                trans_entry.attrs['canSAS_class'] = 'SAStransmission_spectrum'
+                trans_entry.attrs['signal'] = 'T'
+                trans_entry.attrs['T_axes'] = 'T'
+                trans_entry.attrs['name'] = trans.name
+                if trans.timestamp is not '':
+                    trans_entry.attrs['timestamp'] = trans.timestamp
+                transmission = trans_entry.create_dataset(
+                    'T', data=trans.transmission)
+                transmission.attrs['unertainties'] = 'Tdev'
+                trans_entry.create_dataset('Tdev',
+                                           data = trans.transmission_deviation)
+                trans_entry.create_dataset('lambda', data=trans.wavelength)
+
         note_entry = sasentry.create_group('sasnote'.format(i))
         note_entry.attrs['canSAS_class'] = 'SASnote'