Changeset 829 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Timestamp:

Sep 8, 2011 3:19:48 PM (12 years ago)

Author:

srkline

Message:

Lots of changes to the polarization routines, mostly to incorporate error propagation to the matrix inversion for the polarization correction to the data. Switched the big PolCor? panel to use listboxes to specify files to add together rather than individual popups. Right now 10 files can be added, but this could be expanded to an unlimited number.

Also some minor bug fixes and error handling.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• DisplayUtils.ipf (modified) (1 diff)
• RawWindowHook.ipf (modified) (1 diff)
• WriteQIS.ipf (modified) (1 diff)

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

@@ -281 +281 @@
         // works on a copy of the linear_data, so that the original data is always preserved
         
-        Duplicate/O $(dest + ":data") $(dest + ":linear_data")          //wrong way, linear_data not protected
+//      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
+        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

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

@@ -133 +133 @@
         WAVE NIHColors = $"root:myGlobals:NIHColors"
         AppendImage data
-        WaveStats/Q $(curPath + ":data")
-        if(cmpstr(cur_folder,"MSK")==0)
+   WaveStats/Q $(curPath + ":data")
+   if(cmpstr(cur_folder,"MSK")==0)
                 ModifyImage data ctab={0,1,BlueRedGreen,0}
    else
-                //Call the procedure that would normally be called if the sliders were moved
-//              MapSliderProc("both", 0, 1)
-                MapSliderProc("reset", 0, 1)
+        //Call the procedure that would normally be called if the sliders were moved
+//      MapSliderProc("both", 0, 1)
+        MapSliderProc("reset", 0, 1)
     //  ScaleColorsToData(V_min, V_max, NIHColors)
          //  ModifyImage data cindex=NIHColors

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

@@ -743 +743 @@
 //      labelWave[15] = "Data columns are Qx - Qy - I(Qx,Qy) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)"
         labelWave[15] = "Data columns are Qx - Qy - I(Qx,Qy) - err(I) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)"
-        labelWave[16] = "ERROR WAVE IS ONLY AN ESTIMATE  - 6/2010"
+        labelWave[16] = "Error wave is properly propagated through all reduction steps 8/2011"
         labelWave[17] = "ASCII data created " +date()+" "+time()
         //strings can be too long to print-- must trim to 255 chars