Changeset 1173 for sans

Timestamp:

Jun 17, 2019 4:52:45 PM (4 years ago)

Author:

krzywon

Message:

Fixed most of the issues saving USANS data in NXcanSAS format.

File:

• sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/USANS/WriteUSANSNXcanSAS.ipf (modified) (17 diffs)

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/USANS/WriteUSANSNXcanSAS.ipf

@@ -10 +10 @@
 
 //************************
-// Vers 1.00 20190603
+// Vers 1.03 20190617
 //
 //************************
@@ -24 +24 @@
         
         Variable fileID
-        String destStr=""
-        destStr = USANSFolder+":"+type
+        String destStr=USANSFolder+":"+type
         String dateStr=date()+" "+time()
 
@@ -35 +34 @@
         sPrintf nxcansasBase,"/sasentry%d/",sasentry // HDF5 base path for all
         
-        KillDataFolder/Z $base
+        NewDataFolder/O/S $(base)
         
         // Define common attribute waves
-        Make/T/N=1 empty = {""}
-        Make/T/N=1 units = {"units"}
-        Make/T/N=1 m = {"m"}
-        Make/T/N=1 mm = {"mm"}
-        Make/T/N=1 cm = {"cm"}
-        Make/T/N=1 angstrom = {"A"}
-        Make/T/N=1 inv_cm = {"1/cm"}
-        Make/T/N=1 inv_angstrom = {"1/A"}
+        Make/O/T/N=1 empty = {""}
+        Make/O/T/N=1 units = {"units"}
+        Make/O/T/N=1 m = {"m"}
+        Make/O/T/N=1 mm = {"mm"}
+        Make/O/T/N=1 cm = {"cm"}
+        Make/O/T/N=1 angstrom = {"A"}
+        Make/O/T/N=1 inv_cm = {"1/cm"}
+        Make/O/T/N=1 inv_angstrom = {"1/A"}
         
         Variable refNum,integer,realval
-        
-        //*****these waves MUST EXIST, or IGOR Pro will crash, with a type 2 error****
-        WAVE qvals =$(destStr + ":Qvals")
-        WAVE inten=$(destStr + ":DetCts")
-        WAVE sig=$(destStr + ":ErrDetCts")
                 
         if(dialog || stringmatch(fullpath, ""))
@@ -60 +54 @@
         Endif
         
+        if(!fileID)
+                abort "Unable to create file at " + fullpath + "."
+        else
+                //*****these waves MUST EXIST, or IGOR Pro will crash, with a type 2 error****
+                WAVE qvals = $(destStr + ":Qvals")
+                WAVE inten = $(destStr + ":DetCts")
+                WAVE sig = $(destStr + ":ErrDetCts")
+        endif
+        
         //check each wave
         If(!(WaveExists(qvals)))
@@ -71 +74 @@
         Endif
         
+        //write out partial set?
+        Duplicate/O qvals,tq,ti,te
+        ti=inten
+        te=sig
+        if( (lo!=hi) && (lo<hi))
+                redimension/N=(hi-lo+1) tq,ti,te,dumWave                //lo to hi, inclusive
+                tq=qvals[p+lo]
+                ti=inten[p+lo]
+                te=sig[p+lo]
+        endif
+        
         //Use the evil extra column for the resolution "information". Should probably switch to using slit_length in collimation.
         Duplicate/O qvals,dumWave
         dumWave = dQv
         
-        Make/N= (numpnts(dumWave)) dQw = 0
+        Make/O/N= (numpnts(dumWave)) dQw = 0
         
         // Run Name and title
         NewDataFolder/O/S $(parentBase)
-        Make/T/N=1 $(parentBase + ":title") = {StringByKey("LABEL",note(inten),":",";")}
+        
+        //
+        // FIXME: Get useful title - For now, sending empty string
+        //
+        
+        Make/T/N=1 $(parentBase + ":title") = {""} //StringByKey("LABEL",note(inten),":",";")}
         CreateStrNxCansas(fileID,nxcansasBase,"","title",$(parentBase + ":title"),empty,empty)
+        
+        //
+        // TODO: Any way to programatically get the old filename?
+        //
+        
         Make/T/N=1 $(parentBase + ":run") = {""}
         CreateStrNxCansas(fileID,nxcansasBase,"","run",$(parentBase + ":run"),empty,empty)
@@ -107 +131 @@
         CreateVarNxCansas(fileID,dataParent,"sasdata","dQl",dumWave,units,inv_angstrom)
         CreateVarNxCansas(fileID,dataParent,"sasdata","dQw",dQw,units,inv_angstrom)
-        CreateVarNxCansas(fileID,dataParent,"sasdata","Qmean",res2,units,inv_angstrom)
-        
-        //////////////////////////////////////////////////////////////////////////////////////////////
+        
         // Write the meta data to the file
         WriteUSANSNXcanSASMetaData(fileID,type,parentBase,nxcansasBase,dateStr)
@@ -116 +138 @@
         Print "Averaged NXcanSAS File written: ", GetFileNameFromPathNoSemi(fullPath)
         KillWaves/Z dumWave
+        KillDataFolder/Z $base
         
         // Close the file
@@ -134 +157 @@
         Variable fileID
         String destStr=""
-        destStr = USANSFolder+":Smeared"
+        destStr = USANSFolder+":DSM"
         String dateStr=date()+" "+time()
 
@@ -225 +248 @@
         CreateVarNxCansas(fileID,dataParent,"sasdata","dQw",res1,units,inv_angstrom)
         CreateVarNxCansas(fileID,dataParent,"sasdata","Qmean",res2,units,inv_angstrom)
-        
-        //
-        //////////////////////////////////////////////////////////////////////////////////////////////
-        
-        //////////////////////////////////////////////////////////////////////////////////////////////
-        //
+
         // Write USANS meta data
-        
         WriteUSANSNXcanSASMetaData(fileID,"SMEARED",parentBase,nxcansasBase,dateStr)
         
@@ -238 +255 @@
         Print "Averaged NXcanSAS File written: ", GetFileNameFromPathNoSemi(fullPath)
         KillWaves/Z dumWave
+        KillDataFolder/Z $base
         
         // Close the file
@@ -303 +321 @@
         processNote += empLevStr + " ; "+bkglevStr+"\n"
         
+        Make/O/T/N=1 empty = {""}
+        Make/O/T/N=1 units = {"units"}
+        Make/O/T/N=1 m = {"m"}
+        Make/O/T/N=1 mm = {"mm"}
+        Make/O/T/N=1 cm = {"cm"}
+        Make/O/T/N=1 angstrom = {"A"}
+        Make/O/T/N=1 inv_cm = {"1/cm"}
+        Make/O/T/N=1 inv_angstrom = {"1/A"}
+        
         // SASinstrument
         String instrParent = nxcansasBase + "sasinstrument/"
@@ -320 +347 @@
         Make/O/T/N=5 $(apertureBase + ":attrVals") = {"SASaperture","NXaperture"}
         CreateStrNxCansas(fileID,apertureParent,"","",empty,$(apertureBase + ":attr"),$(apertureBase + ":attrVals"))
-        
         // Create SASaperture shape entry
         Make/O/T/N=1 $(apertureBase + ":shape") = {"slit"} 
@@ -336 +362 @@
         String detectorBase = instrumentBase + ":sasdetector"
         NewDataFolder/O/S $(detectorBase)
-        Make/O/T/N=5 $(detectorBase + ":attr") = {"canSAS_class","NX_class"}
-        Make/O/T/N=5 $(detectorBase + ":attrVals") = {"SASdetector","NXdetector"}
+        Make/O/T/N=2 $(detectorBase + ":attr") = {"canSAS_class","NX_class"}
+        Make/O/T/N=2 $(detectorBase + ":attrVals") = {"SASdetector","NXdetector"}
         CreateStrNxCansas(fileID,detectorParent,"","",empty,$(detectorBase + ":attr"),$(detectorBase + ":attrVals"))
         // Create SASdetector name entry
         Make/O/T/N=1 $(detectorBase + ":name") = {"BT5 DETECTOR ARRAY"}
         CreateStrNxCansas(fileID,detectorParent,"","name",$(detectorBase + ":name"),empty,empty)
-        
+
         // SASsource
         String sourceParent = instrParent + "sassource/"
@@ -348 +374 @@
         String sourceBase = instrumentBase + ":sassource"
         NewDataFolder/O/S $(sourceBase)
-        Make/O/T/N=5 $(sourceBase + ":attr") = {"canSAS_class","NX_class"}
-        Make/O/T/N=5 $(sourceBase + ":attrVals") = {"SASsource","NXsource"}
+        Make/O/T/N=2 $(sourceBase + ":attr") = {"canSAS_class","NX_class"}
+        Make/O/T/N=2 $(sourceBase + ":attrVals") = {"SASsource","NXsource"}
         CreateStrNxCansas(fileID,sourceParent,"","",empty,$(sourceBase + ":attr"),$(sourceBase + ":attrVals"))
         // Create SASsource radiation entry
@@ -370 +396 @@
         CreateStrNxCansas(fileID,sampleParent,"","",empty,$(sampleBase + ":attr"),$(sampleBase + ":attrVals"))
         // Create SASsample name entry
+        
+        //
+        // FIXME: reinstate sample name once format is correct (same as title)
+        //
+        
         Make/O/T/N=1 $(sampleBase + ":name") = {StringByKey("LABEL",note(inten),":",";")}
         CreateStrNxCansas(fileID,sampleParent,"","name",$(sampleBase + ":name"),empty,empty)
@@ -384 +415 @@
         String processBase = parentBase + ":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"}
+        Make/O/T/N=2 $(processBase + ":attr") = {"canSAS_class","NX_class"}
+        Make/O/T/N=2 $(processBase + ":attrVals") = {"SASprocess","NXprocess"}
         CreateStrNxCansas(fileID,processParent,"","",empty,$(processBase + ":attr"),$(processBase + ":attrVals"))
         // Create SASsample name entry
@@ -391 +422 @@
         CreateStrNxCansas(fileID,processParent,"","name",$(processBase + ":name"),empty,empty)
         // Create SASsample thickness entry
-        Make/O/T/N=1 $(sampleBase + ":note") = {processNote}
-        CreateVarNxCansas(fileID,processParent,"","note",$(processBase + ":note"),units,cm)
+        Make/O/T/N=1 $(processBase + ":processnote") = {processNote}
+        CreateStrNxCansas(fileID,processParent,"","note",$(processBase + ":processnote"),empty,empty)
 End