Ignore:
Timestamp:
Oct 22, 2009 11:04:32 AM (13 years ago)
Author:
srkline
Message:

Fixed logic error in writing the XY box count values to the empty beam header that could result in INF transmission.

Updated critera for "RAW" data files to include "SIM" as well.

Added NCNR_Utils to the includes list for Analysis.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Transmission.ipf

    r570 r577  
    397397                        // 
    398398                        temp = temp+selectedFiles[0]            //take just the first file 
     399                         
    399400                        UpdateBoxCoordinates() 
     401                         
     402                        //check to make sure that if the box is set, that the count value in the box is set too... 
     403                        // if the box is set by a protocol, then the counts are not set -> and the transmission will be INF 
     404                        String tempName = FindValidFilename(temp) 
     405                        if(cmpstr(tempName,"")==0) 
     406                                //file not found, get out 
     407                                Abort "Empty beam file not found UpdateBoxCoordinates(ctrlName)" 
     408                        Endif 
     409                        //name is ok, prepend path to tempName for read routine  
     410                        PathInfo catPathName 
     411                        String filename = S_path + tempName 
     412                        Variable boxCounts = getBoxCounts(filename) 
     413                         
     414                        variable x1,x2,y1,y2 
     415                        getXYBoxFromFile(filename,x1,x2,y1,y2) 
     416                         
     417                        if( (boxCounts == 0) && (x1!=0) && (x2!=0) && (y1!=0) && (y2!=0) ) 
     418                                DoAlert 0,"Box Counts were not recorded. Please re-select the box using SetXYBox" 
     419                        endif 
     420                         
     421                         
    400422                Else 
    401423                        DoWindow/F TransFileTable 
     
    13581380        Variable refnum,x1,x2,y1,y2,err 
    13591381        GetXYBoxFromFile(filename,x1,x2,y1,y2) 
    1360                  
     1382         
    13611383        //and update the global string 
    13621384        String msgStr="" 
Note: See TracChangeset for help on using the changeset viewer.