Changeset 777


Ignore:
Timestamp:
Dec 20, 2010 5:03:50 PM (11 years ago)
Author:
srkline
Message:

Un-doing the "fix" of DisplayUtils? since this caused more problems than I expected.

Fixed the ILL_DataReadWrite ReadHeaderAndWork?() to properly keep the data on linear scale upon loading, which is the default.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS
Files:
2 edited

Legend:

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

    r776 r777  
    271271        //check the waves for existence before operating on them 
    272272        String msg = "" 
    273         If(WaveExists($dest+":linear_data") == 0) 
    274                 msg = "linear_data not found in "+folder+" folder. Action aborted." 
     273        If(WaveExists($dest+":data") == 0) 
     274                msg = "data not found in "+folder+" folder. Action aborted." 
    275275                DoAlert 0, msg 
    276276                Return (1)      //error 
     
    278278 
    279279        WAVE data=$(dest + ":data") 
    280         WAVE linear_data=$(dest + ":linear_data") 
     280         
    281281        // works on a copy of the linear_data, so that the original data is always preserved 
    282282         
    283 //      Duplicate/O $(dest + ":data") $(dest + ":linear_data") 
    284         data = log(linear_data) 
     283        Duplicate/O $(dest + ":data") $(dest + ":linear_data")          //wrong way, linear_data not protected 
     284//              but if the folder is being coverted to log, then "data" is linear 
     285 
     286//      Duplicate/O $(dest + ":linear_data") $(dest + ":data")          // right way, but linear_data not always copied to the next step 
     287 
     288// if the folder is being coverted to log, then "data" is linear 
     289        data = log(data) 
    285290         
    286291        //Call the procedure that would normally be called if the threshold functions were activated 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_DataReadWrite.ipf

    r776 r777  
    319319         
    320320//      data loaded should be named "linear_data" (this is set in the DIV writer) 
    321  
    322 // so this will generate the log-scaled data wave        
    323 //      ConvertFolderToLogScale("DIV") 
    324         Duplicate/O linear_data,data 
    325         data = log(linear_data) 
     321        Duplicate/O linear_data,data                    // folder is in linear scale in its as-loaded state, so both are linear 
    326322 
    327323        //keep a string with the filename in the DIV folder 
Note: See TracChangeset for help on using the changeset viewer.