Changeset 1186 for sans

Timestamp:

Jul 22, 2019 11:58:39 AM (4 years ago)

Author:

krzywon

Message:

Fix issues with processNote, Qdev, and temperature for the VSANS NXcanSAS writer.

File:

• sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS/V_Write_VSANS_NXcanSAS.ipf (modified) (8 diffs)

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS/V_Write_VSANS_NXcanSAS.ipf

@@ -82 +82 @@
         Make/O/T/N=5 $(dataBase + ":attrVals") = {"SASdata","I","Q","NXdata","0",V_getDataEndTime(folderStr)}
         CreateStrNxCansas(fileID,dataParent,"","",empty,$(dataBase + ":attr"),$(dataBase + ":attrVals"))
+        //
+        // TODO: Reinstate Qdev/resolutions when I can fix the reader issue
+        //
         // Create q entry
         NewDataFolder/O/S $(dataBase + ":q")
-        Make/T/N=2 $(dataBase + ":q:attr") = {"units","resolutions"}
-        Make/T/N=2 $(dataBase + ":q:attrVals") = {"1/angstrom","Qdev"}
+        Make/O/T/N=2 $(dataBase + ":q:attr") = {"units"}//,"resolutions"}
+        Make/O/T/N=2 $(dataBase + ":q:attrVals") = {"1/angstrom"}//,"Qdev"}
         CreateVarNxCansas(fileID,dataParent,"sasdata","Q",qw,$(dataBase + ":q:attr"),$(dataBase + ":q:attrVals"))
         // Create i entry
@@ -126 +129 @@
 //
 // TODO:
-// -- This is a placeholder for the final NXcanSAS writer for VSANS data.
 // -- resolution is not generated here (and it shouldn't be) since resolution is not known yet.
 // -- The final writer will need to be aware of resolution, and there may be different forms
@@ -153 +155 @@
         if(!fileID)
                 abort "Unable to create file at " + saveName + "."
-        else
-                Variable sasentry = NumVarOrDefault("root:Packages:NIST:gSASEntryNumber", 1)
-                sPrintf parentBase,"%s:sasentry%d",base,sasentry // Igor memory base path for all
-                sPrintf nxcansasBase,"/sasentry%d/",sasentry // HDF5 base path for all
         EndIf
+                
+        Variable sasentry = NumVarOrDefault("root:Packages:NIST:gSASEntryNumber", 1)
+        sPrintf parentBase,"%s:sasentry%d",base,sasentry // Igor memory base path for all
+        sPrintf nxcansasBase,"/sasentry%d/",sasentry // HDF5 base path for all
         
         // declare, or make a fake protocol if needed (if the export type is RAW)
@@ -239 +241 @@
                 deltaLam = V_getWavelength_spread(type)
                 // TODO -- decipher which beamstop, if any is actually in place
-        // or -- V_getBeamStopC3_size(type)
+                // or -- V_getBeamStopC3_size(type)
                 bstop = V_getBeamStopC2_size(type)
 
@@ -250 +252 @@
                 WAVE data_err = V_getDetectorDataErrW(type,detStr)
                 
-                // TOOD - replace hard wired paths with Read functions
+                // TODO - replace hard wired paths with Read functions
                 // hard-wired
                 Wave qx_val = $("root:Packages:NIST:VSANS:"+type+":entry:instrument:detector_"+detStr+":qx_"+detStr)
@@ -778 +780 @@
         CreateVarNxCansas(fileID,sampleParent,"","transmission",$(sampleBase + ":transmission"),empty,empty)
         
+        // Create SASsample temperature entry
+        If(V_getSampleTemperature(folderStr) != -999999)
+                Make/O/N=1 $(sampleBase + ":temperature") = {V_getSampleTemperature(folderStr)}
+                CreateVarNxCansas(fileID,sampleParent,"","temperature",$(sampleBase + ":temperature"),empty,empty)
+        EndIf
+        
+        //
+        // TODO: Include other sample environment when they are available
+        
         // SASprocess
         SVAR samFiles = root:Packages:NIST:VSANS:Globals:Protocols:gSAM
@@ -791 +802 @@
                 protoStr8 = proto[8]
         endif
-        String processNote = ""
-        sPrintf processNote,"SAM: %s\r\n",samFiles
-        sPrintf processNote,"%sBGD: %s\r\n",processNote,proto[0]
-        sPrintf processNote,"%sEMP: %s\r\n",processNote,Proto[1]
-        sPrintf processNote,"%sDIV: %s\r\n",processNote,Proto[2]
-        sPrintf processNote,"%sMASK: %s\r\n",processNote,Proto[3]
-        sPrintf processNote,"%sABS Parameters (3-6): %s\r\n",processNote,Proto[4]
-        sPrintf processNote,"%sAverage Choices: %s\r\n",processNote,Proto[5]
-        sPrintf processNote,"%sBeginning Trim Points: %s\r\n",processNote,ProtoStr7
-        sPrintf processNote,"%sEnd Trim Points: %s\r\n",processNote,ProtoStr8
-        sPrintf processNote,"%sCOLLIMATION=%s\r\n",processNote,proto[9]
+        String processNote0,processNote1,processNote2,processNote3,processNote4
+        String processNote5,processNote6,processNote7,processNote8,processNote9
+        sPrintf processNote0,"SAM: %s",samFiles
+        sPrintf processNote1,"BGD: %s",Proto[0]
+        sPrintf processNote2,"EMP: %s",Proto[1]
+        sPrintf processNote3,"DIV: %s",Proto[2]
+        sPrintf processNote4,"MASK: %s",Proto[3]
+        sPrintf processNote5,"ABS Parameters (3-6): %s",Proto[4]
+        sPrintf processNote6,"Average Choices: %s",Proto[5]
+        sPrintf processNote7,"Beginning Trim Points: %s",ProtoStr7
+        sPrintf processNote8,"End Trim Points: %s",ProtoStr8
+        sPrintf processNote9,"COLLIMATION=%s",proto[9]
         // Create SASprocess entry
         String processParent = parentBase + "sasprocess/"
@@ -812 +824 @@
         Make/O/T/N=1 $(processBase + ":name") = {samFiles}
         CreateStrNxCansas(fileID,processParent,"","name",$(processBase + ":name"),empty,empty)
-        // Create SASprocess note entry
-        
-        //
-        // TODO: Reinstate SASprocess.note when I figure out why it won't save
-        //
-        
-        //Make/O/T/N=1 $(processBase + ":note") = {processNote}
-        //CreateStrNxCansas(fileID,processParent,"","note",$(processBase + ":note"),empty,empty)
+        // Create SASprocess note entries
+        Make/O/T/N=1 $(processBase + ":note0") = {processNote0}
+        CreateStrNxCansas(fileID,processParent,"","note0",$(processBase + ":note0"),empty,empty)
+        Make/O/T/N=1 $(processBase + ":note1") = {processNote1}
+        CreateStrNxCansas(fileID,processParent,"","note1",$(processBase + ":note1"),empty,empty)
+        Make/O/T/N=1 $(processBase + ":note2") = {processNote2}
+        CreateStrNxCansas(fileID,processParent,"","note2",$(processBase + ":note2"),empty,empty)
+        Make/O/T/N=1 $(processBase + ":note3") = {processNote3}
+        CreateStrNxCansas(fileID,processParent,"","note3",$(processBase + ":note3"),empty,empty)
+        Make/O/T/N=1 $(processBase + ":note4") = {processNote4}
+        CreateStrNxCansas(fileID,processParent,"","note4",$(processBase + ":note4"),empty,empty)
+        Make/O/T/N=1 $(processBase + ":note5") = {processNote5}
+        CreateStrNxCansas(fileID,processParent,"","note5",$(processBase + ":note5"),empty,empty)
+        Make/O/T/N=1 $(processBase + ":note6") = {processNote6}
+        CreateStrNxCansas(fileID,processParent,"","note6",$(processBase + ":note6"),empty,empty)
+        Make/O/T/N=1 $(processBase + ":note7") = {processNote7}
+        CreateStrNxCansas(fileID,processParent,"","note7",$(processBase + ":note7"),empty,empty)
+        Make/O/T/N=1 $(processBase + ":note8") = {processNote8}
+        CreateStrNxCansas(fileID,processParent,"","note8",$(processBase + ":note8"),empty,empty)
+        Make/O/T/N=1 $(processBase + ":note9") = {processNote9}
+        CreateStrNxCansas(fileID,processParent,"","note9",$(processBase + ":note9"),empty,empty)
         
 End