Ignore:
Timestamp:
Jul 5, 2019 3:06:39 PM (3 years ago)
Author:
srkline
Message:

fixed a bug where during a reduction using MRED - the beginning/end trim points could be incorrectly read from the global values if the protocol did not have explicit values set. Now, if nothing is set, the default values are set and written to the protocol.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Protocol_Reduction.ipf

    r1166 r1177  
    520520        //w[7] 
    521521        // beginning trim points 
     522        // if null, then write out the default trim string to the protocol so that it will be used if recalled 
    522523        SVAR gBegPtsStr=root:Packages:NIST:VSANS:Globals:Protocols:gBegPtsStr 
    523         w[7] = gBegPtsStr 
     524        if(strlen(gBegPtsStr)==0) 
     525                w[7] = ksBinTrimBegDefault 
     526        else 
     527                w[7] = gBegPtsStr 
     528        endif 
    524529         
    525530        //w[8] 
    526531        // End trim points 
     532        // if null, then write out the default trim string to the protocol so that it will be used if recalled 
    527533        SVAR gEndPtsStr=root:Packages:NIST:VSANS:Globals:Protocols:gEndPtsStr    
    528         w[8] = gEndPtsStr 
    529          
     534        if(strlen(gEndPtsStr)==0) 
     535                w[8] = ksBinTrimEndDefault 
     536        else 
     537                w[8] = gEndPtsStr 
     538        endif 
     539 
    530540        //w[9] 
    531541        //collimation type (filled in at averaging?) 
Note: See TracChangeset for help on using the changeset viewer.