Skip to content

refs #28 but not fully NeXus compliant #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ulrikpedersen merged 4 commits into from
Sep 23, 2014
Merged

refs #28 but not fully NeXus compliant #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47734d8
refs #28, makes existing structure almost NeXus compliant, still need…
prjemian Sep 18, 2014
eecbece
refs #28, transform "performance" into a NeXus NXcollection group
prjemian Sep 18, 2014
125d032
refs #28, changes indicated by Ulrik
prjemian Sep 19, 2014
2372970
fixes #29
prjemian Sep 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,32 @@ 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=\"NX_class\" source=\"constant\" value=\"SDS\" type=\"string\"></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)
Expand Down
6 changes: 3 additions & 3 deletions iocBoot/hdf5_layout_demo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down