Changeset 1195

Timestamp:

Aug 15, 2019 4:09:23 PM (3 years ago)

Author:

krzywon

Message:

Write SASprocess for NSORTed files, but not other meta data.

Location:

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures

Files:

• Common/NIST_NXcanSAS_v709.ipf (modified) (1 diff)
• Reduction/SANS/Write_SANS_NXcanSAS.ipf (modified) (2 diffs)

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Common/NIST_NXcanSAS_v709.ipf

@@ -578 +578 @@
         endif
         
-        process = CreateNSORTProcess(firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34)
-        
         NewDataFolder/O/S root:Packages:NIST:NSORT
         SetDataFolder root:Packages:NIST:NSORT
+        
+        process = CreateNSORTProcess(firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34)
+        Make/O/T/N=1 processNote = process
         
         Variable pts = numpnts(qw)

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/SANS/Write_SANS_NXcanSAS.ipf

@@ -94 +94 @@
         // Write all meta data
         if (CmpStr(type,"NSORT") == 0)
-                Wave process = $(destStr + ":process")
-                // TODO: Write to file
+                Wave/T process = $(destStr + ":processNote")
+                String processNote = process[0]
+                WriteProcess(fileID,nxcansasBase,parentBase,"NSORTed Data",processNote)
         Else
                 WriteMetaData(fileID,parentBase,nxcansasBase,rw,textw)
@@ -432 +433 @@
         CreateVarNxCansas(fileID,sampleParent,"","transmission",$(sampleBase + ":transmission"),empty,empty)
 End
-        
+
+Function WriteProcess(fileID,parentBase,base,processName,processNote)
+        Variable fileID
+        String parentBase,base,processName,processNote
+        Print "ProcessNote: ",processNote
+        // Create SASprocess entry
+        Make/T/O/N=1 empty = {""}
+        String processParent = parentBase + "sasprocess/"
+        String processBase = base + ":sasprocess"
+        NewDataFolder/O/S $(processBase)
+        Make/O/T/N=5 $(processBase + ":attr") = {"canSAS_class","NX_class"}
+        Make/O/T/N=5 $(processBase + ":attrVals") = {"SASprocess","NXprocess"}
+        CreateStrNxCansas(fileID,processParent,"","",empty,$(processBase + ":attr"),$(processBase + ":attrVals"))
+        // Create SASprocess name entry
+        Make/O/T/N=1 $(processBase + ":name") = {processName}
+        CreateStrNxCansas(fileID,processParent,"","name",$(processBase + ":name"),empty,empty)
+        // Create SASprocess note entries
+        Make/O/T/N=1 $(processBase + ":note0") = {processNote}
+        CreateStrNxCansas(fileID,processParent,"","note0",$(processBase + ":note0"),empty,empty)
+End
+
 //
 ///////////////////////////////////////////////////////////////////////////