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

Timestamp:

Feb 17, 2012 12:04:13 PM (11 years ago)

Author:

srkline

Message:

changes to FFT routines to clean things up for a beta release at the next startup. No functionality changes, just cleaning up the operation, interface, and menu items.

Some important changes to the polarization routines. New equations for calculating the coefficient matrix. Now appears to be correct. Also, proper proportions are used when adding multiple files together to the matrix.

Change to the Model Docs is an updated reference.

WorkFileUtils? was broken when I changed to use linear_data exclusively. This has now been fixed and it operates as expected.

PackageLoader? now has menu items (under Macros) for the Polarization routines. These may later be moved to the SANS menu.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• RawWindowHook.ipf (modified) (5 diffs)
• WorkFileUtils.ipf (modified) (5 diffs)

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

@@ -112 +112 @@
                 //show the "next" buttons
                 //these buttons should only be available in RAW data type
-                Button backOne size={20,20},pos={350,23},proc=BackOneFileButtonProc,title="<"
+                Button backOne win=SANS_Data,size={20,20},pos={350,23},proc=BackOneFileButtonProc,title="<"
                 Button backOne help={"Display the previous RAW data file run number"}
-                Button forwardOne size={20,20},pos={375,23},proc=ForwardOneFileButtonProc,title=">"
+                Button forwardOne win=SANS_Data,size={20,20},pos={375,23},proc=ForwardOneFileButtonProc,title=">"
                 Button forwardOne help={"Display the next RAW data file run number"}
                 //
         else
                 //kill them
-                KillControl backOne
-                KillControl forwardOne
+                KillControl/W=SANS_Data backOne
+                KillControl/W=SANS_Data forwardOne
         Endif
         
         //reset the slider values to 0,1
-        Slider loSlide,value=0
-        Slider hiSlide,value=1
+        Slider loSlide win=SANS_Data,value=0
+        Slider hiSlide win=SANS_Data,value=1
         
         //remove old data and add new data to it
@@ -132 +132 @@
         WAVE data = $(curPath + ":data")
         WAVE NIHColors = $"root:myGlobals:NIHColors"
-        AppendImage data
+        AppendImage/W=SANS_Data data
    WaveStats/Q $(curPath + ":data")
    if(cmpstr(cur_folder,"MSK")==0)
-                ModifyImage data ctab={0,1,BlueRedGreen,0}
+                ModifyImage/W=SANS_Data data ctab={0,1,BlueRedGreen,0}
    else
         //Call the procedure that would normally be called if the sliders were moved
@@ -144 +144 @@
         endif
         //make the pixels square, color the backgrounds
-        ModifyGraph width={plan,1,bottom,left},mirror=0
-        ModifyGraph axisenab(bottom)={0,0.7}
-        ModifyGraph axOffset(left)=-3
-        ModifyGraph standoff=0
-        ModifyGraph wbRGB=(65535,54611,49151),gbRGB=(65535,54611,49151),cbRGB=(1,52428,52428)
+        ModifyGraph/W=SANS_Data width={plan,1,bottom,left},mirror=0
+        ModifyGraph/W=SANS_Data axisenab(bottom)={0,0.7}
+        ModifyGraph/W=SANS_Data axOffset(left)=-3
+        ModifyGraph/W=SANS_Data standoff=0
+        ModifyGraph/W=SANS_Data wbRGB=(65535,54611,49151),gbRGB=(65535,54611,49151),cbRGB=(1,52428,52428)
         
         //add the qx and qy axes
@@ -155 +155 @@
         Set_Q_Axes(q_x_axis,q_y_axis,curPath)
         RemoveFromGraph/Z q_x_axis,q_y_axis
-        AppendToGraph/T q_x_axis
-        AppendToGraph/R=Right_Q q_y_axis                                //plot on a free axis, crossing at x=127 (pixelsX)
-        ModifyGraph freePos(Right_q)={pixelsX-1,bottom}
-        ModifyGraph minor(top)=1,minor(Right_Q)=1,lowTrip(top)=1e-05,lowTrip(Right_Q)=1e-05
-        ModifyGraph mode(q_x_axis)=2,mode(q_y_axis)=2           //dots
-        ModifyGraph axisEnab(top)={0,0.7}
+        AppendToGraph/W=SANS_Data/T q_x_axis
+        AppendToGraph/W=SANS_Data/R=Right_Q q_y_axis                            //plot on a free axis, crossing at x=127 (pixelsX)
+        ModifyGraph/W=SANS_Data freePos(Right_q)={pixelsX-1,bottom}
+        ModifyGraph/W=SANS_Data minor(top)=1,minor(Right_Q)=1,lowTrip(top)=1e-05,lowTrip(Right_Q)=1e-05
+        ModifyGraph/W=SANS_Data mode(q_x_axis)=2,mode(q_y_axis)=2               //dots
+        ModifyGraph/W=SANS_Data axisEnab(top)={0,0.7}
 
         //add the color bar
-        ColorScale/N=colBar/A=RT/X=-3/Y=-1.5/Z=1 image=data, heightPct=100, widthPct=4,notation=1
-        ColorScale/C/N=colBar/B=(65535,60076,49151)
+        ColorScale/W=SANS_Data/N=colBar/A=RT/X=-3/Y=-1.5/Z=1 image=data, heightPct=100, widthPct=4,notation=1
+        ColorScale/W=SANS_Data/C/N=colBar/B=(65535,60076,49151)
         
         //update the displayed filename, using FileList in the current data folder
@@ -176 +176 @@
         //always set to linear
         //re-draw the data on the graph to make sure "data" from the current folder is being used
-        ControlInfo bisLog
+        ControlInfo/W=SANS_Data bisLog
         if(V_flag ==1)  //if bisLog exists, this will return true
-                Button bisLog,title="isLin",rename=bisLin
+                Button bisLog,win=SANS_Data,title="isLin",rename=bisLin
         endif
         //now that button state and data are sure to match (both are linear)

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

@@ -1217 +1217 @@
         NVAR pixelsY = root:myGlobals:gNPixelsY
         
-        WAVE/Z data1=$("root:Packages:NIST:"+workMathStr+"File_1:data")
+        WAVE/Z data1=$("root:Packages:NIST:"+workMathStr+"File_1:linear_data")
         WAVE/Z err1=$("root:Packages:NIST:"+workMathStr+"File_1:linear_data_error")
         
@@ -1230 +1230 @@
                 //Load set #2
                 Load_NamedASC_File(pathStr+str2,workMathStr+"File_2")
-                WAVE/Z data2=$("root:Packages:NIST:"+workMathStr+"File_2:data")
+                WAVE/Z data2=$("root:Packages:NIST:"+workMathStr+"File_2:linear_data")
                 WAVE/Z err2=$("root:Packages:NIST:"+workMathStr+"File_2:linear_data_error")
         Endif
@@ -1237 +1237 @@
         
         //now that we know that data exists, convert each of the operands to linear scale
-        ConvertFolderToLinearScale(workMathStr+"File_1")
-        If(cmpstr(str2,"UNIT MATRIX")!=0)
-                ConvertFolderToLinearScale(workMathStr+"File_2")                //don't need to convert unit matrix to linear
-        endif
+//      ConvertFolderToLinearScale(workMathStr+"File_1")
+//      If(cmpstr(str2,"UNIT MATRIX")!=0)
+//              ConvertFolderToLinearScale(workMathStr+"File_2")                //don't need to convert unit matrix to linear
+//      endif
+
         //copy contents of str1 folder to dest and create the wave ref (it will exist)
         CopyWorkContents(workMathStr+"File_1",workMathStr+dest)
-        WAVE/Z destData=$("root:Packages:NIST:"+workMathStr+dest+":data")
+        WAVE/Z destData=$("root:Packages:NIST:"+workMathStr+dest+":linear_data")
+        WAVE/Z destData_log=$("root:Packages:NIST:"+workMathStr+dest+":data")
         WAVE/Z destErr=$("root:Packages:NIST:"+workMathStr+dest+":linear_data_error")
         
@@ -1270 +1272 @@
         endswitch
         
+        destData_log = log(destData)            //for display
         //show the result
         WorkMath_Display_PopMenuProc("",0,"Result")
+        
+        PopupMenu popup4 win=WorkFileMath,mode=3                //3rd item selected == Result
 End
 
@@ -1338 +1343 @@
         // if file1 or file2, load in the data and display
         if(cmpstr(popStr,"File_1")==0)
-                ControlInfo popup0
+                ControlInfo/W=WorkFileMath popup0
                 str1 = S_Value
         Endif
         if(cmpstr(popStr,"File_2")==0)
-                ControlInfo popup1
+                ControlInfo/W=WorkFileMath popup1
                 str1 = S_Value
         Endif