Changeset 1230

Timestamp:

Feb 26, 2013 12:27:06 AM (12 years ago)

Author:

jemian

Message:

tighten up the example illustrating the NeXus? proposition

File:

• mda2idd_report/src/mda2nx.py (modified) (6 diffs)

mda2idd_report/src/mda2nx.py ¶

@@ -44 +44 @@
         nxh5_lib.makeDataset(nxentry, 'original_filename', data=data[0]['filename'])
         
-        nxdata = nxh5_lib.makeGroup(nxentry, 'data', "NXdata", signal='', axes='')
+        nxdata = nxh5_lib.makeGroup(nxentry, 'data', "NXdata")
         
         # TODO: prepare to slice arrays due to difference in curr_pt and npts (dimensions acquired v. planned)
         
+        signal = []
+        axes = []
         if rank > 0:
             nxh5_lib.makeDataset(nxentry, 'date_time', data=data[1].time)
@@ -68 +70 @@
                                             EPICS_PV=item.name)
                     if default_pos is None:
-                        default_pos = item
-                        dataset_name = 'p%d' % (order+1)
-                        nxh5_lib.makeLink(nxdata, ds, dataset_name)
                         # Massively big assumption here that the first positioner found
                         # for each dimension will be used as one of the axes to plot
                         # the first detector found in the highest dimension
                         # Hopefully, this mostly succeeds or can be be changed later.
-                        axes = nxdata.attrs['axes']
-                        if len(axes) > 0:
-                            axes += ','
-                        nxdata.attrs['axes'] = axes+dataset_name
+                        default_pos = item
+                        dataset_name = 'p%d' % (order+1)
+                        nxh5_lib.makeLink(nxdata, ds, dataset_name)
+                        axes.append(dataset_name)
                 default_det = None
                 for item in dim.d:
@@ -92 +91 @@
                         dataset_name = 'd%d' % (order+1)
                         nxh5_lib.makeLink(nxdata, ds, dataset_name)
-                        nxdata.attrs['signal'] = dataset_name
+                        signal = [dataset_name]
                 for item in dim.t:
                     nxh5_lib.makeDataset(nxcoll, 
@@ -100 +99 @@
                                             number=item.number,
                                             EPICS_PV=item.name)
+        nxdata.attrs['signal'] = signal
+        nxdata.attrs[signal[0] + '_indices'] = axes
         
         pvs = epics_pvs(data)
@@ -118 +119 @@
 def makeSafeHdf5Name(proposed):
     '''return a name that is safe to use as a NeXus HDF5 object'''
-    # Note that this a safe NeXus object name starts with a letter (upper or lower case)
+    # Note that a safe NeXus object name starts with a letter (upper or lower case)
     # or "_" (underscore), then letters, numbers, and "_" and is limited to
     # no more than 63 characters (imposed by the HDF5 rules for names).
@@ -179 +180 @@
                                     "NXdata",
                                     signal="image",
-                                    axes="x,y",
-                                    x_indices="1",
-                                    y_indices="1,2",
+                                    axes=['x', 'y'],
+                                    x_indices=[1],
+                                    y_indices=[1,2],
                                     )
         if default_data is None: