Changeset 7fce2bc in sasview for src/sas

Timestamp:

Aug 23, 2016 10:16:36 AM (8 years ago)

Author:

lewis

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

be88076

Parents:

0836f77

Message:

Implement writing SASnote in NXcansSASWriter

File:

• src/sas/sascalc/file_converter/nxcansas_writer.py (modified) (2 diffs)

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -39 +39 @@
             compatible with the Reader read() method.
             """
-            if not isinstance(string, str):
+            if isinstance(string, np.ndarray):
+                return string
+            elif not isinstance(string, str):
                 string = str(string)
 
@@ -224 +226 @@
             detector_entry.attrs['name'] = ''
 
-        # TODO: implement writing SASnote
-        i = 1
-        note_entry = sasentry.create_group('sasnote{0:0=2d}'.format(i))
+        note_entry = sasentry.create_group('sasnote'.format(i))
         note_entry.attrs['canSAS_class'] = 'SASnote'
+        notes = None
+        if len(data_info.notes) > 1:
+            notes = [np.string_(n) for n in data_info.notes]
+            notes = np.array(notes)
+        elif data_info.notes != []:
+            notes = _h5_string(data_info.notes[0])
+        if notes is not None:
+            note_entry.create_dataset('SASnote', data=notes)
 
         f.close()