Changeset 1069 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Timestamp:

Oct 3, 2017 4:28:37 PM (5 years ago)

Author:

krzywon

Message:

More code cleanup in the NXcanSAS writer.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WriteHDF5.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WriteHDF5.ipf

@@ -6 +6 @@
 
 //************************
-// Vers 1.14 20170928
+// Vers 1.15 20171003
 //
 //************************
@@ -359 +359 @@
         Make/O/T/N=5 $(collimationBase + ":attrVals") = {"SAScollimation","NXcollimator"}
         CreateStrNxCansas(fileID,collimationParent,"","",empty,$(collimationBase + ":attr"),$(collimationBase + ":attrVals"))
-        // Create SAScollimation length entry
-        Make/O/N=1 $(collimationBase + ":length") = {15.3} // TODO: Get real value
-        CreateVarNxCansas(fileID,collimationParent,"sasaperture","length",$(collimationBase + ":length"),units,m)
         // Create SAScollimation distance entry
         Make/O/N=1 $(collimationBase + ":distance") = {rw[25]}
@@ -473 +470 @@
         Make/T/N=1 $(base + ":entryAttr") = {""}
         Make/T/N=1 $(base + ":entryAttrVals") = {""}
-        CreateStrNxCansas(fileID,parent,"","definition",NxCansas_strPtToWave("NXcanSAS"),$(base + ":entryAttr"),$(base + ":entryAttrVals"))
-End
-
-//
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////
-// Functions to put values into usable form for NxCansas
-
-// Convert a number to a string
-Function /WAVE NxCansas_varToWave(number)
-        Variable number
-        Wave returnWave
-        Make/N=1 returnWave = {number}
-        return returnWave
-End
-
-// Create a single point wave from a string
-Function /WAVE NxCansas_strPtToWave(str)
-        String str
-        Wave/T returnWave
-        Make/T/N=1 returnWave = {str}
-        return returnWave
+        CreateStrNxCansas(fileID,parent,"","definition",{"NXcanSAS"},$(base + ":entryAttr"),$(base + ":entryAttrVals"))
 End