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

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.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization

Files:

• Pol_FlipperPanel.ipf (modified) (3 diffs)
• Pol_PolarizationCorrection.ipf (modified) (7 diffs)
• Pol_PolarizationPanels.ipf (modified) (13 diffs)

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

@@ -22 +22 @@
 // two waves per condition "Cond_Name_Cell" and "CondCalc_Name_Cell"
 //
-Macro ShowFlipperPanel()
+Proc ShowFlipperPanel()
         
         // init folders
@@ -180 +180 @@
                         SetDataFolder root:
                         
+                        // update the globals that are displayed from the wave note
+                        String nStr=Note(cond)
+                        SVAR gPsmPf = root:Packages:NIST:Polarization:Cells:gPsmPf
+                        SVAR gPsm = root:Packages:NIST:Polarization:Cells:gPsm
+                        sprintf gPsmPf, "%g +/- %g",NumberByKey("P_sm_f", nStr, "=",","),NumberByKey("err_P_sm_f", nStr, "=",",")
+                        sprintf gPsm, "%g +/- %g",NumberByKey("P_sm", nStr, "=",","),NumberByKey("err_P_sm", nStr, "=",",")
+                        
+                        
                         break
                 case -1: // control being killed
@@ -215 +223 @@
         // generate the dummy wave note now, change as needed
         String cellStr = StringFromList(1, popStr,"_")
-        String testStr = "P_sm_f=2,err_P_sm_f=0,P_sm=0.6,err_P_sm=0,T0=asdf,"
+        String testStr = "P_sm_f=0,err_P_sm_f=0,P_sm=0,err_P_sm=0,T0=undefined,"
 //      testStr = ReplaceStringByKey("Cell", testStr, cellStr ,"=", ",", 0)
         Note cond, testStr

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
 
 

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

@@ -3 +3 @@
 
 // TODO:
-// - on the decay panel. need to be able to manually enter a date that is to or an offset
+// x- on the decay panel. need to be able to manually enter a date that is to or an offset
 //              number of hours. currently it takes the first file as t=0, which is often not correct
 //
@@ -16 +16 @@
 // -1- Fundamental Cell Parameters -- these are constants, generally not editable. (this file)
 // -2- Decay Parameters -- these are fitted values based on transmission mearurements (this file)
-// -3- Flipper Panel is in its own procedure (FlipperPanel.ipf)
-// -4- PolCor_Panel is in PolarizationCorrection.ipf
-
+// -3- Flipper Panel is in its own procedure (Pol_FlipperPanel.ipf)
+// -4- PolCor_Panel is in Pol_PolarizationCorrection.ipf
+//
 //
 // Driven by 4 panels to get the necessary information from the users
@@ -71 +71 @@
 //              - Polarization correction is done with one click (one per tab). "_pc" tags are added to the resulting names,
 //                      and copies of all of the associated waves are again copied (wasteful), but makes switching display very easy
-//              - Once all of the polariztion correction is done, then the UU_pc (etc.) data can be reduced as usual (xx_pc = 4 passes)
+//              - Once all of the polarization correction is done, then the UU_pc (etc.) data can be reduced as usual (xx_pc = 4 passes)
 //              - protocol is built as ususal, from this panel only (since the SAM, EMP, and BGD need to be switched, rather than loaded
 //              - protocols can be saved/recalled.
@@ -84 +84 @@
 
 
+// for the menu
+Menu "Macros"
+        "1 Fundamental Cell Parameters",ShowCellParamPanel()
+        "2 Cell Decay",ShowCellDecayPanel()
+        "3 Flipper States",ShowFlipperPanel()
+        "4 Polarization Correction",ShowPolCorSetup()
+End
+
 
 //
@@ -96 +104 @@
 // Te=num
 // err_Te=num
-// mu=nnum
+// mu=num
 // err_mu=num
 //
@@ -103 +111 @@
 // all of the strings start w/ "gCell_"
 //
-Macro ShowCellParamPanel()
+Proc ShowCellParamPanel()
         
         // init folders
@@ -359 +367 @@
 // all of the strings start w/ "gDecay_"
 //
-Macro ShowCellDecayPanel()
+Proc ShowCellDecayPanel()
         
         // init folders
@@ -426 +434 @@
         Button button_6,pos={620,620},size={100,20},proc=WindowSnapshotButton,title="Snapshot"
         Button button_7,pos={620,580},size={130,20},proc=ManualEnterDecayButton,title="Manual Entry"
-
+        CheckBox check0,mode=0,pos={600,550},title="Overrride T0?",value=0
 
 
@@ -561 +569 @@
                         SetDataFolder root:
                         
+                        //
+                        // now show the fit results, if any, from the wave note
+                        //
+                        SVAR gMuPo = root:Packages:NIST:Polarization:Cells:gMuPo
+                        SVAR gPo  = root:Packages:NIST:Polarization:Cells:gPo
+                        SVAR gGamma  = root:Packages:NIST:Polarization:Cells:gGamma
+                        SVAR gT0  = root:Packages:NIST:Polarization:Cells:gT0
+                        String nStr=note(decay)
+                        
+
+                        // for the panel display
+                        sprintf gMuPo, "%g +/- %g",NumberByKey("muP", nStr, "=",","),NumberByKey("err_muP", nStr, "=",",")
+                        sprintf gPo, "%g +/- %g",NumberByKey("P0", nStr, "=",","),NumberByKey("err_P0", nStr, "=",",")
+                        sprintf gGamma, "%g +/- %g",NumberByKey("gamma", nStr, "=",","),NumberByKey("err_gamma", nStr, "=",",")
+                        gT0 = StringByKey("T0", nStr, "=",",")
+                
+                        
+                        // clear the graph - force the user to update it manually
+                        // clear old data, and plot the new
+                        //
+                        SetDataFolder root:Packages:NIST:Polarization:Cells:
+
+                        CheckDisplayed/W=DecayPanel#G0 tmp_muP,tmp_muP2,fit_tmp_muP
+                        // if both present, bit 0 + bit 1 = 3
+                        if(V_flag & 2^0)                        //check bit 0
+                                RemoveFromGraph/W=DecayPanel#G0 tmp_muP
+                        endif
+                        if(V_flag & 2^1)
+                                RemoveFromGraph/W=DecayPanel#G0 tmp_muP2
+                        endif
+                        if(V_flag & 2^2)
+                                RemoveFromGraph/W=DecayPanel#G0 fit_tmp_muP
+                        endif
+                        
+                        // kill the text box (name is hard-wired)
+                        TextBox/W=DecayPanel#G0/K/N=CF_tmp_muP
+                        
+                        setDataFolder root:
+                        
                         break
                 case -1: // control being killed
@@ -588 +635 @@
         
         // generate the dummy wave note now, change as needed
-        Note decay, "muP=2,err_muP=0,P0=0.6,err_P0=0,T0=asdf,gamma=200,err_gamma=0,"
+        Note decay, "muP=0,err_muP=0,P0=0,err_P0=0,T0=undefined,gamma=0,err_gamma=0,"
         
         // to hold the results of the calculation
@@ -657 +704 @@
 //                      selRow = V_startRow
 
-                        Variable sum_muP, err_avg_muP, sum_Po, err_avg_Po, avg_muP, avg_Po
+                        Variable sum_muP, err_avg_muP, sum_Po, err_avg_Po, avg_muP, avg_Po, overrideT0
                         sum_muP = 0
                         sum_Po = 0
@@ -663 +710 @@
                         err_avg_Po = 0
                         
+                        ControlInfo/W=DecayPanel check0
+                        overrideT0 = V_Value
+                        
                         for(selRow=0;selRow<numRows;selRow+=1)
                                 Print "calculate the row ",selRow
 
-                                if(selRow == 0)
+                                if(selRow == 0 && !overrideT0)
                                         //find T0
                                         fname = FindFileFromRunNumber(w[0][%Trans_He_In])
@@ -677 +727 @@
                                         Note w, noteStr
                                         Print t0str
-                                        w[selRow][%elapsed_hr] = 0                      //by definition
+                                else
+                                        // manually entered on the panel to override the 
+                                        SVAR gT0 = root:Packages:NIST:Polarization:Cells:gT0
+                                        t0Str = gT0
+                                        noteStr = note(w)
+                                        noteStr = ReplaceStringByKey("T0", noteStr, gT0  ,"=", ",", 0)
+                                        Note/K w
+                                        Note w, noteStr
+                                        Print t0str
                                 endif