Changeset 777 for sans/Dev/trunk/NCNR_User_Procedures/Reduction

Timestamp:

Dec 20, 2010 5:03:50 PM (12 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:

• DisplayUtils.ipf (modified) (2 diffs)
• ILL_DataReadWrite.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/DisplayUtils.ipf

@@ -271 +271 @@
         //check the waves for existence before operating on them
         String msg = ""
-        If(WaveExists($dest+":linear_data") == 0)
-                msg = "linear_data not found in "+folder+" folder. Action aborted."
+        If(WaveExists($dest+":data") == 0)
+                msg = "data not found in "+folder+" folder. Action aborted."
                 DoAlert 0, msg
                 Return (1)      //error
@@ -278 +278 @@
 
         WAVE data=$(dest + ":data")
-        WAVE linear_data=$(dest + ":linear_data")
+        
         // works on a copy of the linear_data, so that the original data is always preserved
         
-//      Duplicate/O $(dest + ":data") $(dest + ":linear_data")
-        data = log(linear_data)
+        Duplicate/O $(dest + ":data") $(dest + ":linear_data")          //wrong way, linear_data not protected
+//              but if the folder is being coverted to log, then "data" is linear
+
+//      Duplicate/O $(dest + ":linear_data") $(dest + ":data")          // right way, but linear_data not always copied to the next step
+
+// if the folder is being coverted to log, then "data" is linear
+        data = log(data)
         
         //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

@@ -319 +319 @@
         
 //      data loaded should be named "linear_data" (this is set in the DIV writer)
-
-// so this will generate the log-scaled data wave       
-//      ConvertFolderToLogScale("DIV")
-        Duplicate/O linear_data,data
-        data = log(linear_data)
+        Duplicate/O linear_data,data                    // folder is in linear scale in its as-loaded state, so both are linear
 
         //keep a string with the filename in the DIV folder