Changeset 835 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf

Timestamp:

Feb 6, 2012 12:19:28 PM (11 years ago)

Author:

srkline

Message:

moving the Polarization routines to a temporary "beta" menu location on the macros menu, numbering the panels.

Created a loader for the polarization routines that will load the SANS reduction if needed.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf (modified) (7 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf

@@ -75 +75 @@
 
 // main entry to the PolCor Panel
-Macro ShowPolCorSetup()
+Proc ShowPolCorSetup()
 
         Variable restore=0
@@ -269 +269 @@
         Button button4,pos={620,18},size={30,20},proc=PolCorHelpParButtonProc,title="?"
         Button button12,pos={440,473},size={120,20},proc=Display4XSButton,title="Display 4 XS"
+        Button button13,pos={440,446},size={120,20},proc=ClearPolCorEntries,title="Clear Entries"
 
         PopupMenu popup1,pos={210,24},size={102,20},title="Condition"
@@ -1015 +1016 @@
         
         Variable row,Psm, PsmPf, PCell,err_Psm, err_PsmPf, err_PCell
-        Variable ii,jj,muPo,err_muPo,gam,err_gam,monCts,t1,num
+        Variable ii,jj,muPo,err_muPo,gam,err_gam,monCts,t1,num,fileCount
 
         Variable ea_uu, ea_ud, ea_dd, ea_du
@@ -1057 +1058 @@
 
         // loop over the (10) rows in the listWave
+        fileCount=0
         for(ii=0;ii<num;ii+=1)
                 runStr =        lb[ii][0]               //the run number
                 if(cmpstr(runStr, "" ) != 0)
-                        
+                
+                        fileCount += 1          //one more file is added
                         // get run number (str)
                         // get file name
@@ -1085 +1088 @@
                         // get file info (monitor counts)
                         monCts = getMonitorCount(fname)
-                        monCts /= 1e8           //just to get reasonable values
+                        monCts /= 1e8           //to get a normalized value to add proportionally
                         
                         Variable err_monCts
@@ -1209 +1212 @@
 // can't take the SQRT here, since the matrix won't necessarily be full yet, 
         
-        
+// but now need to re-normalize the row based on the number of files that were added
+// pType has only one value as passed in, so the row has already been set. It would be more correct
+// to switch based on pType...
+        
+        matA[row][0] /= fileCount
+        matA[row][1] /= fileCount
+        matA[row][2] /= fileCount
+        matA[row][3] /= fileCount       
+        
+        matA_err[row][0] /= fileCount
+        matA_err[row][1] /= fileCount
+        matA_err[row][2] /= fileCount
+        matA_err[row][3] /= fileCount   
+                                
         SetDataFolder root:
         return(0)
@@ -2449 +2465 @@
 End
 
+// clear the entries for all 4 XS for the currently selected Tab only
+// clears both the run numbers and the cell assignments
+//
+Function ClearPolCorEntries(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        //
+//                      String type
+                        Variable tabNum
+                        ControlInfo/W=PolCor_Panel PolCorTab
+//                      type = S_value
+//                      Print "selected data type = ",type,V_Value
+                        tabNum = V_Value
+                        
+                        WAVE/T twDD = $("root:Packages:NIST:Polarization:ListWave_"+num2str(tabNum)+"_DD")
+                        WAVE/T twUU = $("root:Packages:NIST:Polarization:ListWave_"+num2str(tabNum)+"_UU")
+                        WAVE/T twUD = $("root:Packages:NIST:Polarization:ListWave_"+num2str(tabNum)+"_UD")
+                        WAVE/T twDU = $("root:Packages:NIST:Polarization:ListWave_"+num2str(tabNum)+"_DU")
+                        
+                        twDD = ""
+                        twUU = ""
+                        twUD = ""
+                        twDU = ""
+                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End