Changeset 1194

Timestamp:

Aug 15, 2019 2:33:23 PM (3 years ago)

Author:

krzywon

Message:

Output NSORT data as NXcanSAS. Mostly tested, but a couple TODOs and FIXMEs left.

Location:

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures

Files:

• Common/NIST_NXcanSAS_v709.ipf (modified) (7 diffs)
• Reduction/SANS/NSORT.ipf (modified) (2 diffs)
• Reduction/SANS/Write_SANS_NXcanSAS.ipf (modified) (4 diffs)

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

@@ -88 +88 @@
         Variable fileID
         String base
-        String parent,nxParent
+        String location,nxParent
         Variable sasentry = NumVarOrDefault("root:Packages:NIST:gSASEntryNumber", 1)
-        String location = base + parent
+        sPrintf location,"%s:sasentry%d",base,sasentry // Igor memory base path for all
+        sPrintf nxParent,"/sasentry%d/",sasentry // HDF5 base path for all
         NewDataFolder/O/S $(location)
         Make/O/T/N=1 $(location + ":vals") = {""}
@@ -145 +146 @@
                 Make/O/T/N=1 vals_i_wave
                 vals_i_wave[0] = vals_i
-                if(!stringmatch(name_i,""))
+                if(!CmpStr(name_i,"") == 0)
                         HDF5SaveData /A=name_i vals_i_wave, fileID, path
                 endif
@@ -217 +218 @@
         
         groupID = NxCansas_CreateGroup(fileID,parent)
-
+        
         // Save data to disk
         if(!stringmatch(var,""))
@@ -226 +227 @@
                 endif
         endif
-                
+        
         NxCansas_writeAttributes(fileID,parent+var,attr,attrValues)
         
@@ -318 +319 @@
                                         Wave q = $(baseStr + "_q")
                                         Wave dq = $(baseStr + "_dq")
+                                        
+                                        //
+                                        // FIXME: All points set to the same value - need to loop
+                                        //
+                                        
                                         Make/O/N=(xdim,ydim) $(baseStr + "_qx") = q[0]
                                         Make/O/N=(xdim,ydim) $(baseStr + "_qy") = q[1]
@@ -410 +416 @@
         Wave rw = $(loadDir + ":realsRead")
         Wave/T textw = $(loadDir + ":textRead")
-        print rw
         int isMultiDetector = 0, ii = 0
         
@@ -536 +541 @@
 //
 ///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////
+//
+// Methods related to NSORT
+
+Function WriteNSORTedNXcanSASFile(qw,iw,sw,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,[res])
+        Wave qw,iw,sw,res
+        String firstFileName,secondFileName,thirdFileName,fourthFileName,normTo
+        Variable norm12,norm23,norm34
+        
+        Variable err=0,refNum,numCols,dialog=1,useRes=0
+        String fullPath="",formatStr="",process
+        
+        //check each wave - else REALLY FATAL error when writing file
+        If(!(WaveExists(qw)))
+                err = 1
+                return err
+        Endif
+        If(!(WaveExists(iw)))
+                err = 1
+                return err
+        Endif
+        If(!(WaveExists(sw)))
+                err = 1
+                return err
+        Endif
+        if(WaveExists(res))
+                useRes = 1
+        endif
+        
+        NVAR/Z useTable = root:myGlobals:CombineTable:useTable
+        if(NVAR_Exists(useTable) && useTable==1)
+                SVAR str=root:myGlobals:CombineTable:SaveNameStr        //messy, but pass in as a global
+                fullPath = str
+                dialog=0
+        endif
+        
+        process = CreateNSORTProcess(firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34)
+        
+        NewDataFolder/O/S root:Packages:NIST:NSORT
+        SetDataFolder root:Packages:NIST:NSORT
+        
+        Variable pts = numpnts(qw)
+        Make/O/N=(pts) qval = qw
+        Make/O/N=(pts) aveint = iw
+        Make/O/N=(pts) sigave = sw
+        if (useRes)
+                Make/O/N=(dimsize(res,0)) SigmaQ = res[p][0]
+                Make/O/N=(dimsize(res,0)) QBar = res[p][1]
+                Make/O/N=(dimsize(res,0)) fSubS = res[p][2]
+        Else
+                Make/O/N=(pts) SigmaQ = 0
+                Make/O/N=(pts) QBar = 0
+                Make/O/N=(pts) fSubS = 0
+        EndIf
+        
+        Make/O/T/N=11 textRead
+        textRead[6] = firstfileName
+        textRead[0] = "Combined data"
+        
+        Make/O/N=52 realsRead = 0
+        
+        WriteNxCanSAS1D("NSORT",fullpath,dialog)
+        
+End
+
+Function/T CreateNSORTProcess(firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34)
+        String firstFileName,secondFileName,thirdFileName,fourthFileName,normTo
+        Variable norm12,norm23,norm34
+        String process
+        String processFormat = "COMBINED FILE CREATED: %s - NSORT-ed %s\t+ %s\t+ %s\t+%s, normalized to %s, multiplicative factor 1-2 = %12.8g\t multiplicative factor 2-3 = %12.8g\t multiplicative factor 3-4 = %12.8g"
+        
+        sprintf process,processFormat,date(),firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34
+        return process
+End
+
+//
+///////////////////////////////////////////////////////////////////////////

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

@@ -202 +202 @@
         NVAR useXMLOutput = root:Packages:NIST:gXML_Write
         NVAR useNXcanSASOutput = root:Packages:NIST:gNXcanSAS_Write
-        
-        //
-        // TODO: create WriteNSORTedNXcanSASFile
-        //
 
         if (useXMLOutput == 1)
@@ -212 +208 @@
                 else
                         WriteNSORTedXMLFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34)
+                endif
+        elseif (useNXcanSASOutput == 1)
+                if(WaveExists(res))
+                        WriteNSORTedNXcanSASFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,res=res)
+                else
+                        WriteNSORTedNXcanSASFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34)
                 endif
         else

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

@@ -34 +34 @@
         
         // Check fullpath and dialog
-        print "fullpath: ",fullpath
         fileID = NXcanSAS_OpenOrCreate(dialog,fullpath,base)
         
@@ -94 +93 @@
         
         // Write all meta data
-        WriteMetaData(fileID,parentBase,nxcansasBase,rw,textw)
+        if (CmpStr(type,"NSORT") == 0)
+                Wave process = $(destStr + ":process")
+                // TODO: Write to file
+        Else
+                WriteMetaData(fileID,parentBase,nxcansasBase,rw,textw)
+        EndIf
         
         //
@@ -278 +282 @@
         // TODO: Reinstate Qdev/resolutions when I can fix the reader issue
         //
-        
 
         // Create qx and qy entry
@@ -344 +347 @@
         Make/O/T/N=5 $(apertureBase + ":attrVals") = {"SASaperture","NXaperture"}
         CreateStrNxCansas(fileID,apertureParent,"","",empty,$(apertureBase + ":attr"),$(apertureBase + ":attrVals"))
-        
-        //
-        // TODO: Where do I get rectangular dimensions from?
-        //
-        
         // Create SASaperture shape entry
         Make/O/T/N=1 $(apertureBase + ":shape") = {"pinhole"}