Changeset 983 for sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

Timestamp:

Mar 7, 2016 11:55:46 AM (7 years ago)

Author:

srkline

Message:

CHANGES to SANS:
Now allow 4 files to be combined in one step. This required modification of one routine in NIST_XML to allow an extra file name, and significant addition to the NSORT panel to allow an (optional) 4th data file. behaviors are still the same as before with 2, 3, or 4 sets being allowed. The "combine table" also allows up to 4 files to be combined (can be mixed, 2, 3, 4 all allowed).

More addtions to VSANS present as well, not specific changes, but in-progress changes to the beam center handling and ciombining data to 1D.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

@@ -825 +825 @@
 End
 
-Function WriteNSORTedXMLFile(qw,iw,sw,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23,[res])
+Function WriteNSORTedXMLFile(qw,iw,sw,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,[res])
         Wave qw,iw,sw,res
-        String firstFileName,secondFileName,thirdFileName,normTo
-        Variable norm12,norm23
+        String firstFileName,secondFileName,thirdFileName,fourthFileName,normTo
+        Variable norm12,norm23,norm34
 
         Variable err=0,refNum,numCols,dialog=1
@@ -904 +904 @@
         
         nf.sasProcessNote = "COMBINED FILE CREATED: "+date()+"\n"
-        nf.sasProcessNote += "NSORT-ed : " +firstFileName+";"+secondFileName+";"+thirdFileName+"\n"
+        nf.sasProcessNote += "NSORT-ed : " +firstFileName+";"+secondFileName+";"+thirdFileName+";"+fourthFileName+"\n"
         nf.sasProcessNote += "normalized to  "+normTo+"\n"
-        fprintf refNum, "multiplicative factor 1-2 = "+num2str(norm12)+" multiplicative factor 2-3 = "+num2str(norm23)+"\n"
+        fprintf refNum, "multiplicative factor 1-2 = "+num2str(norm12)+" multiplicative factor 2-3 = "+num2str(norm23)+" multiplicative factor 3-4 = "+num2str(norm34)+"\n"
 
         if (numCols == 3)