From 47734d88c3000b4387ecd74009e7a99e727e7dbd Mon Sep 17 00:00:00 2001
From: "Pete R. Jemian" <prjemian@gmail.com>
Date: Thu, 18 Sep 2014 13:19:15 -0500
Subject: [PATCH 1/4] refs #28, makes existing structure almost NeXus
 compliant, still needs a hard link from /entry/instrument/detector/data to
 /entry/data/data need support software interface to create NDF5 hard links
 from specifications in an XML file

---
 ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp b/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
index 5d8819b3f..b6d19d422 100644
--- a/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
+++ b/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
@@ -37,25 +37,31 @@ namespace hdf5
 
   const std::string LayoutXML::DEFAULT_LAYOUT = " \
   <group name=\"entry\"> \
-    <attribute name=\"NX_class\" source=\"constant\" value=\"NX_entry\" type=\"string\"></attribute> \
+    <attribute name=\"NX_class\" source=\"constant\" value=\"NXentry\" type=\"string\"></attribute> \
     <group name=\"instrument\"> \
-      <attribute name=\"NX_class\" source=\"constant\" value=\"NX_instrument\" type=\"string\"></attribute> \
+      <attribute name=\"NX_class\" source=\"constant\" value=\"NXinstrument\" type=\"string\"></attribute> \
       <group name=\"detector\"> \
+        <attribute name=\"NX_class\" source=\"constant\" value=\"NXdetector\" type=\"string\"></attribute> \
         <dataset name=\"data\" source=\"detector\" det_default=\"true\"> \
-          <attribute name=\"NX_class\" source=\"constant\" value=\"SDS\"></attribute> \
           <attribute name=\"signal\" source=\"constant\" value=\"1\" type=\"int\"></attribute> \
         </dataset> \
         <group name=\"NDAttributes\"> \
+          <attribute name=\"NX_class\" source=\"constant\" value=\"NXcollection\" type=\"string\"></attribute> \
           <dataset name=\"ColorMode\" source=\"ndattribute\" ndattribute=\"ColorMode\"> \
           </dataset> \
         </group>          <!-- end group NDAttribute --> \
       </group>            <!-- end group detector --> \
       <group name=\"NDAttributes\" ndattr_default=\"true\"> \
+        <attribute name=\"NX_class\" source=\"constant\" value=\"NXcollection\" type=\"string\"></attribute> \
       </group>            <!-- end group NDAttribute (default) --> \
       <group name=\"performance\"> \
         <dataset name=\"timestamp\"></dataset> \
       </group>            <!-- end group performance --> \
     </group>              <!-- end group instrument --> \
+    <group name=\"data\"> \
+      <attribute name=\"NX_class\" source=\"constant\" value=\"NXdata\" type=\"string\"></attribute> \
+      <!-- needs a hard link from /entry/instrument/detector/data to /entry/data/data --> \
+    </group>              <!-- end group data --> \
   </group>                <!-- end group entry --> ";
 
   LayoutXML::LayoutXML() : ptr_tree(NULL), ptr_curr_element(NULL)

From eecbece0313ec8852d66017cd73049fedc452b5a Mon Sep 17 00:00:00 2001
From: "Pete R. Jemian" <prjemian@gmail.com>
Date: Thu, 18 Sep 2014 14:27:31 -0500
Subject: [PATCH 2/4] refs #28, transform "performance" into a NeXus
 NXcollection group

---
 ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp b/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
index b6d19d422..a7e8b6c2b 100644
--- a/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
+++ b/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
@@ -55,6 +55,7 @@ namespace hdf5
         <attribute name=\"NX_class\" source=\"constant\" value=\"NXcollection\" type=\"string\"></attribute> \
       </group>            <!-- end group NDAttribute (default) --> \
       <group name=\"performance\"> \
+        <attribute name=\"NX_class\" source=\"constant\" value=\"NXcollection\" type=\"string\"></attribute> \
         <dataset name=\"timestamp\"></dataset> \
       </group>            <!-- end group performance --> \
     </group>              <!-- end group instrument --> \

From 125d03223ff75c673c2d566ef7abdd8c6306f897 Mon Sep 17 00:00:00 2001
From: "Pete R. Jemian" <prjemian@gmail.com>
Date: Fri, 19 Sep 2014 10:10:32 -0500
Subject: [PATCH 3/4] refs #28, changes indicated by Ulrik

---
 ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp b/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
index a7e8b6c2b..e0aee3c87 100644
--- a/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
+++ b/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
@@ -43,6 +43,7 @@ namespace hdf5
       <group name=\"detector\"> \
         <attribute name=\"NX_class\" source=\"constant\" value=\"NXdetector\" type=\"string\"></attribute> \
         <dataset name=\"data\" source=\"detector\" det_default=\"true\"> \
+          <attribute name=\"NX_class\" source=\"constant\" value=\"SDS\" type=\"string\"></attribute> \
           <attribute name=\"signal\" source=\"constant\" value=\"1\" type=\"int\"></attribute> \
         </dataset> \
         <group name=\"NDAttributes\"> \
@@ -55,7 +56,6 @@ namespace hdf5
         <attribute name=\"NX_class\" source=\"constant\" value=\"NXcollection\" type=\"string\"></attribute> \
       </group>            <!-- end group NDAttribute (default) --> \
       <group name=\"performance\"> \
-        <attribute name=\"NX_class\" source=\"constant\" value=\"NXcollection\" type=\"string\"></attribute> \
         <dataset name=\"timestamp\"></dataset> \
       </group>            <!-- end group performance --> \
     </group>              <!-- end group instrument --> \

From 23729705d4a9b78464d61e38c090b9e2f2aacfb9 Mon Sep 17 00:00:00 2001
From: "Pete R. Jemian" <prjemian@gmail.com>
Date: Mon, 22 Sep 2014 16:15:12 -0500
Subject: [PATCH 4/4] fixes #29

---
 iocBoot/hdf5_layout_demo.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/iocBoot/hdf5_layout_demo.xml b/iocBoot/hdf5_layout_demo.xml
index dfee5ed1f..b36d5ffcf 100644
--- a/iocBoot/hdf5_layout_demo.xml
+++ b/iocBoot/hdf5_layout_demo.xml
@@ -3,9 +3,9 @@
   <group name="entry">
     <attribute name="test_float_array" source="constant" value="1.3,2.9,3.4,4.8,5.234" type="float"></attribute>
     <attribute name="test_int_array" source="constant" value="1,2,3,4,5,6,7,8,9,0" type="int"></attribute>
-    <attribute name="NX_class" source="constant" value="NX_entry" type="string"></attribute>
+    <attribute name="NX_class" source="constant" value="NXentry" type="string"></attribute>
     <group name="detector">
-      <attribute name="NX_class" source="constant" value="NX_detector" type="string"></attribute>
+      <attribute name="NX_class" source="constant" value="NXdata" type="string"></attribute>
       <dataset name="data1" source="detector" det_default="true">
         <attribute name="test_att_1" source="ndattribute" ndattribute="ArrayCounter"></attribute>
         <attribute name="test_att_2" source="ndattribute" ndattribute="AcqTime"></attribute>
@@ -32,7 +32,7 @@
       <dataset name="ArrayCounter" source="ndattribute" ndattribute="ArrayCounter"/>
     </group>
     <group name="instruments" ndattr_default="true">
-      <attribute name="NX_class" source="constant" value="NX_instrument" type="string"></attribute>
+      <attribute name="NX_class" source="constant" value="NXinstrument" type="string"></attribute>
     </group>
   </group>
 </xml>