Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

    r971 r983  
    825825End 
    826826 
    827 Function WriteNSORTedXMLFile(qw,iw,sw,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23,[res]) 
     827Function WriteNSORTedXMLFile(qw,iw,sw,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,[res]) 
    828828        Wave qw,iw,sw,res 
    829         String firstFileName,secondFileName,thirdFileName,normTo 
    830         Variable norm12,norm23 
     829        String firstFileName,secondFileName,thirdFileName,fourthFileName,normTo 
     830        Variable norm12,norm23,norm34 
    831831 
    832832        Variable err=0,refNum,numCols,dialog=1 
     
    904904         
    905905        nf.sasProcessNote = "COMBINED FILE CREATED: "+date()+"\n" 
    906         nf.sasProcessNote += "NSORT-ed : " +firstFileName+";"+secondFileName+";"+thirdFileName+"\n" 
     906        nf.sasProcessNote += "NSORT-ed : " +firstFileName+";"+secondFileName+";"+thirdFileName+";"+fourthFileName+"\n" 
    907907        nf.sasProcessNote += "normalized to  "+normTo+"\n" 
    908         fprintf refNum, "multiplicative factor 1-2 = "+num2str(norm12)+" multiplicative factor 2-3 = "+num2str(norm23)+"\n" 
     908        fprintf refNum, "multiplicative factor 1-2 = "+num2str(norm12)+" multiplicative factor 2-3 = "+num2str(norm23)+" multiplicative factor 3-4 = "+num2str(norm34)+"\n" 
    909909 
    910910        if (numCols == 3) 
Note: See TracChangeset for help on using the changeset viewer.