Changeset 817 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization

Timestamp:

Jul 14, 2011 4:55:08 PM (12 years ago)

Author:

srkline

Message:

more changes and addtions to the polarization reduction. basic functionality is now present, with a really large panel to gather all of the input. Lots of testing is needed.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization

Files:

• Pol_FlipperPanel.ipf (modified) (1 diff)
• Pol_PolarizationCorrection.ipf (modified) (20 diffs)
• Pol_PolarizationPanels.ipf (modified) (5 diffs)

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

@@ -10 +10 @@
 //
 // TODO: 
-// -- add a way to manually enter the P values into a "blank" condition, in case that the users
+// X- add a way to manually enter the P values into a "blank" condition, in case that the users
 // calculate the values in a different way. This should be as simple as a dialog to enter values and 
 // change the wave note (and displayed strings).

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

@@ -62 +62 @@
 // first three panels into one w/ tabs would help a lot, but that is rather complex to implement.
 //
+// X- mathod to save and restore the panel state - especially the popup selections
 
 Macro ShowPolCorSetup()
 
+        Variable restore=0
         DoWindow/F PolCor_Panel
         if(V_flag==0)
-                Initialize_PolCorPanel()
+        
+                InitProtocolPanel()             //this will reset the strings.
+                
+                restore=Initialize_PolCorPanel()
                 PolCor_Panel()
+                SetWindow PolCor_Panel hook(kill)=PolCorPanelHook               //to save the state when panel is killed
+                //disable the controls on other tabs
+                ToggleSelControls("_1_",1)
+                ToggleSelControls("_2_",1)
+                
+                //restore the entries
+                if(restore)
+                        RestorePolCorPanel()
+                endif
+                
+
         endif
 End
 
+
+Function RestorePolCorPanel()
+        //restore the popup state
+        Wave/T/Z w=root:Packages:NIST:Polarization:PolCor_popState
+
+        Variable ii,num
+        String name,popStr,list
+        
+        list = P_GetConditionNameList()         //list of conditions
+        if(WaveExists(w))
+                num = DimSize(w,0)
+                for(ii=0;ii<num;ii+=1)
+                        name = w[ii][0]
+                        popStr = w[ii][1]
+                        if(cmpstr("none",popStr) !=0 )
+                                PopupMenu $name,win=PolCor_Panel,mode=WhichListItem(popStr, list,";",0,0),popvalue=popStr
+                        endif
+                endfor
+        endif
+        return(0)
+End
+
+
 //
 // TODO:
@@ -78 +117 @@
 Function Initialize_PolCorPanel()
 
+
+        Variable ii,num
+        String name,popStr
+                
         DoAlert 1,"Do you want to initialize, wiping out all of your entries?"
-        if(V_flag != 1)         //1== yes, everything else, get out
-                return(0)
+        if(V_flag != 1)         //1== yes initialize, so everything else, restore the entries
+                return(1)
         endif
         
         //initialize all of the strings for the input
-        Variable ii
         SetDataFolder root:Packages:NIST:Polarization
         
@@ -108 +150 @@
         endfor
         
-        // blank matrix of coefficients
-        Make/O/D/N=(4,4) PolMatrix = 0
+        // blank matrix of coefficients is not generated here, but as each set is loaded
+//      Print " *** PolMatrix is not being generated in the correct folder(s)"
+//      Make/O/D/N=(4,4) PolMatrix = 0
 
         SetDataFolder root:
@@ -119 +162 @@
 
 end
+
+
 
 
@@ -127 +172 @@
 // 
 // TODO:
-// - tabs for SAM, EMP, and BGD
-// - input fields for the other protocol items, like the Protocol Panel
-// - need a way of saving the "protocol" since the setup is so complex.
+// X- tabs for SAM, EMP, and BGD
+// X- input fields for the other protocol items, like the Protocol Panel
+// X- save the popup state
+// X- need a way of saving the "protocol" since the setup is so complex.
 // - generate a report of the setup.
 // - 4-panel display (maybe a layout with labels?) Maybe a panel with 4 subwindows. Can I use color bars in them?
@@ -136 +182 @@
 Window PolCor_Panel()
         PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(554,44,1265,770)
+        NewPanel /W=(925,44,1662,800) /K=1
+        ModifyPanel cbRGB=(64349,63913,44660)
 //      ShowTools/A
-        ModifyPanel cbRGB=(64349,63913,44660)
-        TitleBox title_0,pos={116,21},size={24,24},title="\\f01UU",fSize=12
-
-        SetVariable setvar_0_UU_0,pos={34,57},size={70,16},title="File",fSize=10
+        SetDrawEnv linethick= 2.00
+        DrawLine 10,510,600,510
+
+        TabControl PolCorTab,pos={15,27},size={708,401},proc=PolCorTabProc
+        TabControl PolCorTab,tabLabel(0)="SAM",tabLabel(1)="EMP",tabLabel(2)="BGD"
+        TabControl PolCorTab,value= 0
+        
+        // always visible
+        Button button0,pos={26,445},size={80,20},proc=LoadRawPolarizedButton,title="Load ..."
+        Button button1,pos={26,473},size={130,20},proc=PolCorButton,title="Pol Correct Data"
+        Button button2,pos={222,445},size={130,20},proc=ShowPolMatrixButton,title="Show Coef Matrix"
+        Button button3,pos={222,473},size={160,20},proc=ChangeDisplayedPolData,title="Change Displayed Data"
+        Button button4,pos={620,18},size={30,20},proc=PolCorHelpParButtonProc,title="?"
+
+        TitleBox title0,pos={116,66},size={24,24},title="\\f01UU",fSize=12
+        TitleBox title1,pos={450,66},size={24,24},title="\\f01DU",fSize=12
+        TitleBox title2,pos={115,250},size={25,24},title="\\f01DD",fSize=12
+        TitleBox title3,pos={450,250},size={24,24},title="\\f01UD",fSize=12
+        
+        // bits to set up reduction protocol
+        Button button5,pos={126,560},size={100,20},proc=PickDIVButton,title="set DIV file"
+        Button button5,help={"This button will set the file selected in the File Catalog table to be the sensitivity file."}
+        Button button6,pos={126,590},size={100,20},proc=PickMASKButton,title="set MASK file"
+        Button button6,help={"This button will set the file selected in the File Catalog table to be the mask file."}
+        Button button7,pos={126,620},size={110,20},proc=SetABSParamsButton,title="set ABS params"
+        Button button7,help={"This button will prompt the user for absolute scaling parameters"}
+        Button button8,pos={126,650},size={150,20},proc=SetAverageParamsButtonProc,title="set AVERAGE params"
+        Button button8,help={"Prompts the user for the type of 1-D averaging to perform, as well as saving options"}
+        Button button9,pos={80,690},size={120,20},proc=ReducePolCorDataButton,title="Reduce Data"
+        Button button9,help={"Reduce PolCor data"}
+        Button button10,pos={226,690},size={120,20},proc=SavePolCorProtocolButton,title="Save Protocol"
+        Button button10,help={"Save the PolCor protocol"}
+        Button button11,pos={370,690},size={120,20},proc=RecallPolCorProtocolButton,title="Recall Protocol"
+        Button button11,help={"Recall the PolCor protocol"}             
+        
+        SetVariable setvar0,pos={322,560},size={250,15},title="file:"
+        SetVariable setvar0,help={"Filename of the detector sensitivity file to be used in the data reduction"}
+        SetVariable setvar0,limits={-Inf,Inf,0},value= root:myGlobals:Protocols:gDIV
+        SetVariable setvar1,pos={322,590},size={250,15},title="file:"
+        SetVariable setvar1,help={"Filename of the mask file to be used in the data reduction"}
+        SetVariable setvar1,limits={-Inf,Inf,0},value= root:myGlobals:Protocols:gMASK
+        SetVariable setvar2,pos={322,620},size={250,15},title="parameters:"
+        SetVariable setvar2,help={"Keyword-string of values necessary for absolute scaling of data. Remaining parameters are taken from the sample file."}
+        SetVariable setvar2,limits={-Inf,Inf,0},value= root:myGlobals:Protocols:gAbsStr 
+        SetVariable setvar3,pos={322,650},size={250,15},title="parameters:"
+        SetVariable setvar3,help={"Keyword-string of choices used for averaging and saving the 1-D data files"}
+        SetVariable setvar3,limits={-Inf,Inf,0},value= root:myGlobals:Protocols:gAVE    
+        
+        CheckBox check0,pos={10,560},size={72,14},title="Sensitivity"
+        CheckBox check0,help={"If checked, the specified detector sensitivity file will be included in the data reduction. If the file name is \"ask\", then the user will be prompted for the file"}
+        CheckBox check0,value= 1
+        CheckBox check1,pos={10,590},size={72,14},title="Mask"
+        CheckBox check1,help={""}
+        CheckBox check1,value= 1
+        CheckBox check2,pos={10,620},size={72,14},title="Absolute Scale"
+        CheckBox check2,help={""}
+        CheckBox check2,value= 1
+        CheckBox check3,pos={10,650},size={72,14},title="Average and Save"
+        CheckBox check3,help={""}
+        CheckBox check3,value= 1                
+        CheckBox check4,pos={10,530},size={72,14},title="Use EMP?"
+        CheckBox check4,help={""}
+        CheckBox check4,value= 1        
+        CheckBox check5,pos={100,530},size={72,14},title="Use BGD?"
+        CheckBox check5,help={""}
+        CheckBox check5,value= 1        
+
+        
+
+// SAM Tab      
+        // UU
+        SetVariable setvar_0_UU_0,pos={34,102},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UU_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UU_0
-        SetVariable setvar_0_UU_1,pos={34,80},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_UU_1,pos={34,125},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UU_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UU_1
-        SetVariable setvar_0_UU_2,pos={34,104},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_UU_2,pos={34,149},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UU_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UU_2
-        SetVariable setvar_0_UU_3,pos={34,128},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_UU_3,pos={34,173},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UU_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UU_3
-        SetVariable setvar_0_UU_4,pos={34,152},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_UU_4,pos={34,197},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UU_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UU_4
-        PopupMenu popup_0_UU_0,pos={142,54},size={102,20},title="Condition"
-        PopupMenu popup_0_UU_0,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_UU_1,pos={142,77},size={102,20},title="Condition"
+        PopupMenu popup_0_UU_0,pos={142,99},size={210,20},title="Condition"
+        PopupMenu popup_0_UU_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_0_UU_1,pos={142,122},size={102,20},title="Condition"
         PopupMenu popup_0_UU_1,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_UU_2,pos={142,101},size={102,20},title="Condition"
+        PopupMenu popup_0_UU_2,pos={142,146},size={102,20},title="Condition"
         PopupMenu popup_0_UU_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_UU_3,pos={142,125},size={102,20},title="Condition"
+        PopupMenu popup_0_UU_3,pos={142,170},size={102,20},title="Condition"
         PopupMenu popup_0_UU_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_UU_4,pos={142,149},size={102,20},title="Condition"
+        PopupMenu popup_0_UU_4,pos={142,194},size={102,20},title="Condition"
         PopupMenu popup_0_UU_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-
-        
-        TitleBox title_1,pos={450,21},size={24,24},title="\\f01DU",fSize=12
-        SetVariable setvar_0_DU_0,pos={368,57},size={70,16},title="File",fSize=10
+        // DU
+        SetVariable setvar_0_DU_0,pos={368,102},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DU_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DU_0
-        SetVariable setvar_0_DU_1,pos={368,80},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_DU_1,pos={368,125},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DU_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DU_1
-        SetVariable setvar_0_DU_2,pos={368,104},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_DU_2,pos={368,149},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DU_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DU_2
-        SetVariable setvar_0_DU_3,pos={368,128},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_DU_3,pos={368,173},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DU_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DU_3
-        SetVariable setvar_0_DU_4,pos={368,152},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_DU_4,pos={368,197},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DU_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DU_4
-        PopupMenu popup_0_DU_0,pos={476,54},size={102,20},title="Condition"
-        PopupMenu popup_0_DU_0,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_DU_1,pos={476,77},size={102,20},title="Condition"
-        PopupMenu popup_0_DU_1,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_DU_2,pos={476,101},size={102,20},title="Condition"
+        PopupMenu popup_0_DU_0,pos={476,99},size={210,20},title="Condition"
+        PopupMenu popup_0_DU_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_0_DU_1,pos={476,122},size={210,20},title="Condition"
+        PopupMenu popup_0_DU_1,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_0_DU_2,pos={476,146},size={102,20},title="Condition"
         PopupMenu popup_0_DU_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_DU_3,pos={476,125},size={102,20},title="Condition"
+        PopupMenu popup_0_DU_3,pos={476,170},size={102,20},title="Condition"
         PopupMenu popup_0_DU_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_DU_4,pos={476,149},size={102,20},title="Condition"
+        PopupMenu popup_0_DU_4,pos={476,194},size={102,20},title="Condition"
         PopupMenu popup_0_DU_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-
-        TitleBox title_2,pos={115,205},size={25,24},title="\\f01DD",fSize=12
-        SetVariable setvar_0_DD_0,pos={33,241},size={70,16},title="File",fSize=10
+// DD
+        SetVariable setvar_0_DD_0,pos={33,286},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DD_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DD_0
-        SetVariable setvar_0_DD_1,pos={33,264},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_DD_1,pos={33,309},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DD_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DD_1
-        SetVariable setvar_0_DD_2,pos={33,288},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_DD_2,pos={33,333},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DD_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DD_2
-        SetVariable setvar_0_DD_3,pos={33,312},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_DD_3,pos={33,357},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DD_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DD_3
-        SetVariable setvar_0_DD_4,pos={33,336},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_DD_4,pos={33,381},size={70,16},title="File",fSize=10
         SetVariable setvar_0_DD_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_DD_4
-        PopupMenu popup_0_DD_0,pos={141,238},size={102,20},title="Condition"
-        PopupMenu popup_0_DD_0,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_DD_1,pos={141,261},size={102,20},title="Condition"
+        PopupMenu popup_0_DD_0,pos={141,283},size={210,20},title="Condition"
+        PopupMenu popup_0_DD_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_0_DD_1,pos={141,306},size={102,20},title="Condition"
         PopupMenu popup_0_DD_1,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_DD_2,pos={141,285},size={102,20},title="Condition"
+        PopupMenu popup_0_DD_2,pos={141,330},size={102,20},title="Condition"
         PopupMenu popup_0_DD_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_DD_3,pos={141,309},size={102,20},title="Condition"
+        PopupMenu popup_0_DD_3,pos={141,354},size={102,20},title="Condition"
         PopupMenu popup_0_DD_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_DD_4,pos={141,333},size={102,20},title="Condition"
+        PopupMenu popup_0_DD_4,pos={141,378},size={102,20},title="Condition"
         PopupMenu popup_0_DD_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-
-        TitleBox title_3,pos={450,205},size={24,24},title="\\f01UD",fSize=12
-        SetVariable setvar_0_UD_0,pos={368,241},size={70,16},title="File",fSize=10
+// UD
+        SetVariable setvar_0_UD_0,pos={368,286},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UD_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UD_0
-        SetVariable setvar_0_UD_1,pos={368,264},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_UD_1,pos={368,309},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UD_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UD_1
-        SetVariable setvar_0_UD_2,pos={368,288},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_UD_2,pos={368,333},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UD_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UD_2
-        SetVariable setvar_0_UD_3,pos={368,312},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_UD_3,pos={368,357},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UD_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UD_3
-        SetVariable setvar_0_UD_4,pos={368,336},size={70,16},title="File",fSize=10
+        SetVariable setvar_0_UD_4,pos={368,381},size={70,16},title="File",fSize=10
         SetVariable setvar_0_UD_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_0_UD_4
-        PopupMenu popup_0_UD_0,pos={476,238},size={102,20},title="Condition"
-        PopupMenu popup_0_UD_0,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_UD_1,pos={476,261},size={102,20},title="Condition"
-        PopupMenu popup_0_UD_1,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_UD_2,pos={476,285},size={102,20},title="Condition"
+        PopupMenu popup_0_UD_0,pos={476,283},size={210,20},title="Condition"
+        PopupMenu popup_0_UD_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_0_UD_1,pos={476,306},size={210,20},title="Condition"
+        PopupMenu popup_0_UD_1,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_0_UD_2,pos={476,330},size={102,20},title="Condition"
         PopupMenu popup_0_UD_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_UD_3,pos={476,309},size={102,20},title="Condition"
+        PopupMenu popup_0_UD_3,pos={476,354},size={102,20},title="Condition"
         PopupMenu popup_0_UD_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
-        PopupMenu popup_0_UD_4,pos={476,333},size={102,20},title="Condition"
+        PopupMenu popup_0_UD_4,pos={476,378},size={102,20},title="Condition"
         PopupMenu popup_0_UD_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
 
-        
-// always visible
-        Button button0,pos={26,485},size={80,20},proc=LoadRawPolarizedButton,title="Load ..."
-        Button button1,pos={26,513},size={130,20},proc=PolCorButton,title="Pol Correct Data"
-        Button button2,pos={222,488},size={130,20},proc=ShowPolMatrixButton,title="Show Coef Matrix"
-        Button button3,pos={222,518},size={160,20},proc=ChangeDisplayedPolData,title="Change Displayed Data"
-        
-        
+
+// EMP Tab      
+        // UU
+        SetVariable setvar_1_UU_0,pos={34,102},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UU_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UU_0
+        SetVariable setvar_1_UU_1,pos={34,125},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UU_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UU_1
+        SetVariable setvar_1_UU_2,pos={34,149},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UU_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UU_2
+        SetVariable setvar_1_UU_3,pos={34,173},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UU_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UU_3
+        SetVariable setvar_1_UU_4,pos={34,197},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UU_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UU_4
+        PopupMenu popup_1_UU_0,pos={142,99},size={210,20},title="Condition"
+        PopupMenu popup_1_UU_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_UU_1,pos={142,122},size={102,20},title="Condition"
+        PopupMenu popup_1_UU_1,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_UU_2,pos={142,146},size={102,20},title="Condition"
+        PopupMenu popup_1_UU_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_UU_3,pos={142,170},size={102,20},title="Condition"
+        PopupMenu popup_1_UU_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_UU_4,pos={142,194},size={102,20},title="Condition"
+        PopupMenu popup_1_UU_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        // DU
+        SetVariable setvar_1_DU_0,pos={368,102},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DU_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DU_0
+        SetVariable setvar_1_DU_1,pos={368,125},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DU_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DU_1
+        SetVariable setvar_1_DU_2,pos={368,149},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DU_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DU_2
+        SetVariable setvar_1_DU_3,pos={368,173},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DU_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DU_3
+        SetVariable setvar_1_DU_4,pos={368,197},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DU_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DU_4
+        PopupMenu popup_1_DU_0,pos={476,99},size={210,20},title="Condition"
+        PopupMenu popup_1_DU_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_DU_1,pos={476,122},size={210,20},title="Condition"
+        PopupMenu popup_1_DU_1,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_DU_2,pos={476,146},size={102,20},title="Condition"
+        PopupMenu popup_1_DU_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_DU_3,pos={476,170},size={102,20},title="Condition"
+        PopupMenu popup_1_DU_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_DU_4,pos={476,194},size={102,20},title="Condition"
+        PopupMenu popup_1_DU_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+// DD
+        SetVariable setvar_1_DD_0,pos={33,286},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DD_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DD_0
+        SetVariable setvar_1_DD_1,pos={33,309},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DD_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DD_1
+        SetVariable setvar_1_DD_2,pos={33,333},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DD_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DD_2
+        SetVariable setvar_1_DD_3,pos={33,357},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DD_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DD_3
+        SetVariable setvar_1_DD_4,pos={33,381},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_DD_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_DD_4
+        PopupMenu popup_1_DD_0,pos={141,283},size={210,20},title="Condition"
+        PopupMenu popup_1_DD_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_DD_1,pos={141,306},size={102,20},title="Condition"
+        PopupMenu popup_1_DD_1,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_DD_2,pos={141,330},size={102,20},title="Condition"
+        PopupMenu popup_1_DD_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_DD_3,pos={141,354},size={102,20},title="Condition"
+        PopupMenu popup_1_DD_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_DD_4,pos={141,378},size={102,20},title="Condition"
+        PopupMenu popup_1_DD_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+// UD
+        SetVariable setvar_1_UD_0,pos={368,286},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UD_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UD_0
+        SetVariable setvar_1_UD_1,pos={368,309},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UD_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UD_1
+        SetVariable setvar_1_UD_2,pos={368,333},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UD_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UD_2
+        SetVariable setvar_1_UD_3,pos={368,357},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UD_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UD_3
+        SetVariable setvar_1_UD_4,pos={368,381},size={70,16},title="File",fSize=10
+        SetVariable setvar_1_UD_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_1_UD_4
+        PopupMenu popup_1_UD_0,pos={476,283},size={210,20},title="Condition"
+        PopupMenu popup_1_UD_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_UD_1,pos={476,306},size={210,20},title="Condition"
+        PopupMenu popup_1_UD_1,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_UD_2,pos={476,330},size={102,20},title="Condition"
+        PopupMenu popup_1_UD_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_UD_3,pos={476,354},size={102,20},title="Condition"
+        PopupMenu popup_1_UD_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_1_UD_4,pos={476,378},size={102,20},title="Condition"
+        PopupMenu popup_1_UD_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+
+
+// BKG Tab      
+        // UU
+        SetVariable setvar_2_UU_0,pos={34,102},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UU_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UU_0
+        SetVariable setvar_2_UU_1,pos={34,125},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UU_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UU_1
+        SetVariable setvar_2_UU_2,pos={34,149},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UU_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UU_2
+        SetVariable setvar_2_UU_3,pos={34,173},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UU_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UU_3
+        SetVariable setvar_2_UU_4,pos={34,197},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UU_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UU_4
+        PopupMenu popup_2_UU_0,pos={142,99},size={210,20},title="Condition"
+        PopupMenu popup_2_UU_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_UU_1,pos={142,122},size={102,20},title="Condition"
+        PopupMenu popup_2_UU_1,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_UU_2,pos={142,146},size={102,20},title="Condition"
+        PopupMenu popup_2_UU_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_UU_3,pos={142,170},size={102,20},title="Condition"
+        PopupMenu popup_2_UU_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_UU_4,pos={142,194},size={102,20},title="Condition"
+        PopupMenu popup_2_UU_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        // DU
+        SetVariable setvar_2_DU_0,pos={368,102},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DU_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DU_0
+        SetVariable setvar_2_DU_1,pos={368,125},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DU_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DU_1
+        SetVariable setvar_2_DU_2,pos={368,149},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DU_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DU_2
+        SetVariable setvar_2_DU_3,pos={368,173},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DU_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DU_3
+        SetVariable setvar_2_DU_4,pos={368,197},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DU_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DU_4
+        PopupMenu popup_2_DU_0,pos={476,99},size={210,20},title="Condition"
+        PopupMenu popup_2_DU_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_DU_1,pos={476,122},size={210,20},title="Condition"
+        PopupMenu popup_2_DU_1,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_DU_2,pos={476,146},size={102,20},title="Condition"
+        PopupMenu popup_2_DU_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_DU_3,pos={476,170},size={102,20},title="Condition"
+        PopupMenu popup_2_DU_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_DU_4,pos={476,194},size={102,20},title="Condition"
+        PopupMenu popup_2_DU_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+// DD
+        SetVariable setvar_2_DD_0,pos={33,286},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DD_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DD_0
+        SetVariable setvar_2_DD_1,pos={33,309},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DD_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DD_1
+        SetVariable setvar_2_DD_2,pos={33,333},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DD_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DD_2
+        SetVariable setvar_2_DD_3,pos={33,357},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DD_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DD_3
+        SetVariable setvar_2_DD_4,pos={33,381},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_DD_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_DD_4
+        PopupMenu popup_2_DD_0,pos={141,283},size={210,20},title="Condition"
+        PopupMenu popup_2_DD_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_DD_1,pos={141,306},size={102,20},title="Condition"
+        PopupMenu popup_2_DD_1,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_DD_2,pos={141,330},size={102,20},title="Condition"
+        PopupMenu popup_2_DD_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_DD_3,pos={141,354},size={102,20},title="Condition"
+        PopupMenu popup_2_DD_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_DD_4,pos={141,378},size={102,20},title="Condition"
+        PopupMenu popup_2_DD_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+// UD
+        SetVariable setvar_2_UD_0,pos={368,286},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UD_0,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UD_0
+        SetVariable setvar_2_UD_1,pos={368,309},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UD_1,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UD_1
+        SetVariable setvar_2_UD_2,pos={368,333},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UD_2,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UD_2
+        SetVariable setvar_2_UD_3,pos={368,357},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UD_3,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UD_3
+        SetVariable setvar_2_UD_4,pos={368,381},size={70,16},title="File",fSize=10
+        SetVariable setvar_2_UD_4,limits={-inf,inf,0},value= root:Packages:NIST:Polarization:gStr_PolCor_2_UD_4
+        PopupMenu popup_2_UD_0,pos={476,283},size={210,20},title="Condition"
+        PopupMenu popup_2_UD_0,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_UD_1,pos={476,306},size={210,20},title="Condition"
+        PopupMenu popup_2_UD_1,mode=3,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_UD_2,pos={476,330},size={102,20},title="Condition"
+        PopupMenu popup_2_UD_2,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_UD_3,pos={476,354},size={102,20},title="Condition"
+        PopupMenu popup_2_UD_3,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+        PopupMenu popup_2_UD_4,pos={476,378},size={102,20},title="Condition"
+        PopupMenu popup_2_UD_4,mode=1,popvalue="none",value= #"P_GetConditionNameList()"
+
 EndMacro
 
-// Loading of the polarized scattering data
-//
-// with the file numbers set
-// and the conditions specified
-//
-// -- For the specified pType of data (=UU, DU, DD, UD)
-//
-// -the time midpoint is found from the list of runs (needed for PCell(t) later)
-// -raw data is loaded (from a list of run numbers)
-// -data and loaded waves are tagged with a suffix (_UU, _DU, etc.)
-// -the PolMatrix of coefficients is filled (the specified row)
-//
-// TODO:
-// X- pre-parsing is not done to check for valid file numbers. This should be done gracefully.
-// -- SAM folder is currently hard-wired
-// X- if all of the conditions are "none" - stop and report the error
-//
-Function LoadRawPolarizedButton(ba) : ButtonControl
+
+Function PolCorPanelHook(s)
+        STRUCT WMWinHookStruct &s
+
+        Variable hookResult = 0
+
+        switch(s.eventCode)
+//              case 0:                         // Activate
+//                      // Handle activate
+//                      break
+//
+//              case 1:                         // Deactivate
+//                      // Handle deactivate
+//                      break
+                case 2:                         // kill
+                        // Handle kill
+                        
+                        // the variables with the run numbers are automatically saved and restored if not re-initialized
+                        // get a list of all of the popups
+                        String popList="",item
+                        Variable num,ii
+                        popList=ControlNameList("PolCor_Panel",";","popup_*")
+                        num=ItemsInList(popList,";")
+                        Make/O/T/N=(num,2) root:Packages:NIST:Polarization:PolCor_popState
+                        Wave/T w=root:Packages:NIST:Polarization:PolCor_popState
+                        for(ii=0;ii<num;ii+=1)
+                                item=StringFromList(ii, popList,";")
+                                ControlInfo/W=PolCor_Panel $item
+                                w[ii][0] = item
+                                w[ii][1] = S_Value
+                        endfor
+
+                        break
+
+        endswitch
+
+        return hookResult               // 0 if nothing done, else 1
+End
+
+// val = 1 to disable
+// val = 0 to show
+Function ToggleSelControls(str,val)
+        String str
+        Variable val
+        
+        String listStr
+        listStr = ControlNameList("PolCor_Panel", ";", "*"+str+"*")
+//      print listStr
+        
+        ModifyControlList/Z listStr  , disable=(val)
+        return(0)
+end
+
+
+Function PolCorTabProc(tca) : TabControl
+        STRUCT WMTabControlAction &tca
+
+        switch( tca.eventCode )
+                case 2: // mouse up
+                        Variable tab = tca.tab          
+                        Variable val
+//                      Print "Selected tab = ",tab
+                        
+                        val = (tab != 0)
+//                      Print "tab 0 val = ",val
+                        ToggleSelControls("_0_",val)
+                        
+                        val = (tab != 1)
+//                      Print "tab 1 val = ",val
+                        ToggleSelControls("_1_",val)
+                        
+                        val = (tab != 2)
+//                      Print "tab 2 val = ",val
+                        ToggleSelControls("_2_",val)
+                                                
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
+
+Function PolCorHelpParButtonProc(ba) : ButtonControl
         STRUCT WMButtonAction &ba
 
@@ -262 +607 @@
                 case 2: // mouse up
                         // click code here
-                        
-                        String listStr="",runList="",parsedRuns,condStr
-                        Variable ii,num,err
-
+                        DoAlert 0,"Help for PolCor Panel not written yet"
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
+
+Function LoadRawPolarizedButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        
                         // depends on which tab you're on
                         // (maybe) select UD type
                         String pType
-                        Prompt pType,"Pol Type",popup,"UU;DU;DD;UD;"
+                        Prompt pType,"Pol Type",popup,"UU;DU;DD;UD;All;"
                         DoPrompt "Type to load",pType
                         if (V_Flag)
@@ -276 +635 @@
 //                      Print pType
                         
-                        // get a list of the file numbers to load, must be in proper data folder
-                        SetDataFolder root:Packages:NIST:Polarization
-                        listStr = StringList("gStr_PolCor*"+pType+"*", ";" )
-
-//                      print listStr
-                        for(ii=0;ii<itemsinlist(listStr);ii+=1)
-                                SVAR str=$StringFromList(ii, listStr ,";")
-                                if(cmpstr(str, "none" ) != 0)
-                                        runList += str + ","
-                                        
-                                        // and check that the condition is not "none"
-                                        Print "ControlInfo call is hard-wired for tab=0 = SAM"
-                        
-                                        ControlInfo/W=PolCor_Panel $("popup_0_"+pType+"_"+num2str(ii))
-                                        condStr = S_Value
-                                        if(cmpstr(condStr, "none" ) == 0)
-                                                DoAlert 0,"Condition for file index "+num2str(ii)+" is not set."
-                                                SetDataFolder root:
-                                                return(0)
-                                        endif
-                                endif
-                        endfor
-
-//                      Print runList
-                        // check for errors
-                        parsedRuns =ParseRunNumberList(runlist)
-                        if(strlen(parsedRuns) == 0)
-                                Print "enter a valid file number before proceeding"
-                                SetDataFolder root:
-                                return(0)
+                        if(cmpstr(pType,"All") == 0)
+                                LoadPolarizedData("UU")
+                                LoadPolarizedData("DU")
+                                LoadPolarizedData("DD")
+                                LoadPolarizedData("UD")
+                        else
+                                LoadPolarizedData(pType)
                         endif
-                        SetDataFolder root:
-
-                        
-                        // find time midpoint for the files to load
-                        Variable tMid
-                        tMid = getTimeMidpoint(runList)
-                        Print/D "time midpoint",tmid
-                        
-                        // this adds multiple raw data files, as specified by the list
-                        err = AddFilesInList("SAM",ParseRunNumberList(runlist))         // adds to a work file, not RAW
-                        UpdateDisplayInformation("SAM")
-                        
-                        TagLoadedData("SAM",pType)              //see also DisplayTaggedData()
-                        
-                        // now add the appropriate bits to the matrix
-                        
-                        WAVE matA = root:Packages:NIST:Polarization:PolMatrix
-//                      listStr = ControlNameList("PolCor_Panel",";","*"+pType+"*")
-
-                        // the PolMatrix rows are cleared on pass 0 as each pType data is loaded.
-                        // this way repeated loading will always result in the correct fill                     
-                        AddToPolMatrix(matA,pType,tMid)
-
                         
                         break
@@ -339 +652 @@
 End
 
+// Loading of the polarized scattering data
+//
+// with the file numbers set
+// and the conditions specified
+//
+// -- For the specified pType of data (=UU, DU, DD, UD)
+//
+// -the time midpoint is found from the list of runs (needed for PCell(t) later)
+// -raw data is loaded (from a list of run numbers)
+// -data and loaded waves are tagged with a suffix (_UU, _DU, etc.)
+// -the PolMatrix of coefficients is filled (the specified row)
+//
+// TODO:
+// X- pre-parsing is not done to check for valid file numbers. This should be done gracefully.
+// X- SAM folder is currently hard-wired
+// X- if all of the conditions are "none" - stop and report the error
+//
+Function LoadPolarizedData(pType)
+        String pType
+
+
+        String listStr="",runList="",parsedRuns,condStr
+        Variable ii,num,err
+                        
+        // get the current tab
+        String type
+        Variable tabNum
+        ControlInfo/W=PolCor_Panel PolCorTab
+        type = S_value
+        Print "selected data type = ",type
+        tabNum = V_Value
+        
+        
+        // get a list of the file numbers to load, must be in proper data folder
+        SetDataFolder root:Packages:NIST:Polarization
+//                      Print "Searching  "+"gStr_PolCor_"+num2str(tabNum)+"_*"+pType+"*"
+        listStr = StringList("gStr_PolCor_"+num2str(tabNum)+"_*"+pType+"*", ";" )
+
+//                      print listStr
+        for(ii=0;ii<itemsinlist(listStr);ii+=1)
+                SVAR str=$StringFromList(ii, listStr ,";")
+                if(cmpstr(str, "none" ) != 0)
+                        runList += str + ","
+                        
+                        // and check that the condition is not "none"
+                        Print "ControlInfo call is for  "+"popup_"+num2str(tabNum)+"_"+pType+"_"+num2str(ii)
+        
+                        ControlInfo/W=PolCor_Panel $("popup_"+num2str(tabNum)+"_"+pType+"_"+num2str(ii))
+                        
+                        condStr = S_Value
+                        if(cmpstr(condStr, "none" ) == 0)
+                                DoAlert 0,"Condition for file index "+num2str(ii)+" is not set."
+                                SetDataFolder root:
+                                return(0)
+                        endif
+                endif
+        endfor
+
+        Print runList
+        // check for errors
+        parsedRuns =ParseRunNumberList(runlist)
+        if(strlen(parsedRuns) == 0)
+                Print "enter a valid file number before proceeding"
+                SetDataFolder root:
+                return(0)
+        endif
+        SetDataFolder root:
+
+        
+        // find time midpoint for the files to load
+        Variable tMid
+        tMid = getTimeMidpoint(runList)
+        Print/D "time midpoint",tmid
+        
+        // this adds multiple raw data files, as specified by the list
+        err = AddFilesInList(type,parsedRuns)           // adds to a work file = type, not RAW
+        UpdateDisplayInformation(type)
+        
+        TagLoadedData(type,pType)               //see also DisplayTaggedData()
+        
+        // now add the appropriate bits to the matrix
+        if(!WaveExists($("root:Packages:NIST:"+type+":PolMatrix")))
+                Make/O/D/N=(4,4) $("root:Packages:NIST:"+type+":PolMatrix")
+        endif
+        WAVE matA = $("root:Packages:NIST:"+type+":PolMatrix")
+
+//                      listStr = ControlNameList("PolCor_Panel",";","*"+pType+"*")
+
+        // the PolMatrix rows are cleared on pass 0 as each pType data is loaded.
+        // this way repeated loading will always result in the correct fill                     
+        AddToPolMatrix(matA,pType,tMid)
+
+
+End
 // by definition-- the rows are:
 //
@@ -362 +769 @@
         
         String listStr,fname="",condStr,condNote,decayNote,cellStr,t0Str,t1Str
-        
+
+        // get the current tab
+        String type
+        Variable tabNum
+        ControlInfo/W=PolCor_Panel PolCorTab
+        type = S_value
+        Print "selected data type = ",type
+        tabNum = V_Value
         
         SetDataFolder root:Packages:NIST:Polarization
-        listStr = StringList("gStr_PolCor*"+pType+"*", ";" )
-
-        
+        listStr = StringList("gStr_PolCor_"+num2str(tabNum)+"_*"+pType+"*", ";" )
+
+
         // loop over the (5) fields
         for(ii=0;ii<itemsinlist(listStr);ii+=1)
@@ -377 +791 @@
                         // get condition from popup
                         //
-                        Print "ControlInfo call is hard-wired for tab=0 = SAM"
-                        
-                        ControlInfo/W=PolCor_Panel $("popup_0_"+pType+"_"+num2str(ii))
+//                      Print "ControlInfo call is for  " + "popup_"+num2str(tabNum)+"_"+pType+"_"+num2str(ii)
+                        
+                        ControlInfo/W=PolCor_Panel $("popup_"+num2str(tabNum)+"_"+pType+"_"+num2str(ii))
                         condStr = S_Value
                         Wave condition = $("root:Packages:NIST:Polarization:Cells:"+condStr)
@@ -392 +806 @@
                         // get the cell string to get the Decay wave
                         cellStr = StringFromList(2, condStr ,"_")               // treat the name as a list
-                        print "Cell = ",cellStr
+//                      print "Cell = ",cellStr
                         // get info to calc Pcell (from the Decay wave)
                         Wave decay = $("root:Packages:NIST:Polarization:Cells:Decay_"+cellStr)  
@@ -490 +904 @@
         
 
-        
-        
-        
-        
         SetDataFolder root:
         return(0)
@@ -524 +934 @@
         String type,pType
 
+        ConvertFolderToLinearScale(type)
+
         ptype = "_" + pType                     // add an extra underscore
         String destPath = "root:Packages:NIST:" + type
@@ -541 +953 @@
         String type="SAM",pType="UU"
 
+        String/G root:myGlobals:gDataDisplayType=type
+        ConvertFolderToLinearScale(type)
+        
         ptype = "_" + pType                     // add an extra underscore
         String destPath = "root:Packages:NIST:" + type
-        $(destPath + ":data") = $(destPath + ":data"+pType)
         $(destPath + ":linear_data") = $(destPath + ":linear_data"+pType)
         $(destPath + ":linear_data_error") = $(destPath + ":linear_data_error"+pType)
@@ -550 +964 @@
         $(destPath + ":realsread") = $(destPath + ":realsread"+pType)
 
-        UpdateDisplayInformation("SAM")
+// make the data equal to linear data
+        $(destPath + ":data") = $(destPath + ":linear_data"+pType)
+
+        UpdateDisplayInformation(type)
+// using fRawWindowHook() gets the log/lin correct
+//      fRawWindowHook()
+
 
 End
@@ -571 +991 @@
                         Variable ii,jj,numRows,numCols
                         
+                        // get the current tab
+                        String type
+                        Variable tabNum
+                        ControlInfo/W=PolCor_Panel PolCorTab
+                        type = S_value
+                        Print "selected data type = ",type
+                        tabNum = V_Value
+                        
                         // make waves for the result
-                        Print "@@ PolCor is hard-wired for SAM --- this must be fixed"
+//                      Print "@@ PolCor is hard-wired for SAM --- this must be fixed"
                         // these duplicate the data and add "_pc" for later use
-                        MakePCResultWaves("SAM","UU")
-                        MakePCResultWaves("SAM","DU")
-                        MakePCResultWaves("SAM","DD")
-                        MakePCResultWaves("SAM","UD")
-                        
-                        
-                        SetDataFolder root:Packages:NIST:SAM
+                        MakePCResultWaves(type,"UU")
+                        MakePCResultWaves(type,"DU")
+                        MakePCResultWaves(type,"DD")
+                        MakePCResultWaves(type,"UD")
+                        
+                        
+                        SetDataFolder $("root:Packages:NIST:"+type)
+                        
                         WAVE linear_data_UU_pc = linear_data_UU_pc
                         WAVE linear_data_DU_pc = linear_data_DU_pc
@@ -596 +1025 @@
                         
                         // the coefficient matrix and the experimental data
-                        WAVE matA = root:Packages:NIST:Polarization:PolMatrix
+                        WAVE matA = $("root:Packages:NIST:"+type+":PolMatrix")
                         WAVE linear_data_UU = linear_data_UU
                         WAVE linear_data_DU = linear_data_DU
@@ -683 +1112 @@
                 case 2: // mouse up
                         // click code here
-                        Edit root:Packages:NIST:Polarization:PolMatrix
+                        
+                        // get the current tab
+                        String type
+                        Variable tabNum
+                        ControlInfo/W=PolCor_Panel PolCorTab
+                        type = S_value
+                        Print "selected data type = ",type
+                        tabNum = V_Value
+                        
+                        Edit $("root:Packages:NIST:"+type+":PolMatrix")
+                        
                         break
                 case -1: // control being killed
@@ -736 +1175 @@
         tMid = t_first + elap/2
         return(tMid)
+End
+
+// options to reduce one or all types, in the same manner as the load.
+//
+// largely copied from ReduceAFile()
+//
+Function ReducePolCorDataButton(ctrlName) : ButtonControl
+        String ctrlName
+
+        // depends on which tab you're on
+        // (maybe) select UD type
+        String pType
+        Prompt pType,"Pol Type",popup,"UU;DU;DD;UD;All;"
+        DoPrompt "Type to load",pType
+        if (V_Flag)
+                return 0                                                                        // user canceled
+        endif
+//      Print pType
+
+
+// get the protocol to use
+// this is pulled from ReduceAFile()
+        Variable err
+        String waveStr
+        
+        //pick a protocol wave from the Protocols folder
+        //must switch to protocols folder to get wavelist (missing parameter)
+        SetDataFolder root:myGlobals:Protocols
+        Execute "PickAProtocol()"
+        
+        //get the selected protocol wave choice through a global string variable
+        SVAR protocolName = root:myGlobals:Protocols:gProtoStr
+        
+        //If "CreateNew" was selected, go to the questionnare, to make a new set
+        //and put the name of the new Protocol wave in gProtoStr
+        if(cmpstr("CreateNew",protocolName) == 0)
+                return(0)
+        Endif
+        
+        //give the full path:name to the executeProtocol function
+        waveStr = "root:myGlobals:Protocols:"+protocolName
+        //samStr is set at top to "ask", since this is the action always desired from "ReduceAFile"
+                
+        //return data folder to root before Macro is done
+        SetDataFolder root:
+        
+        if(cmpstr(pType,"All") == 0)
+                ExecutePolarizedProtocol(waveStr,"UU")
+                ExecutePolarizedProtocol(waveStr,"DU")
+                ExecutePolarizedProtocol(waveStr,"DD")
+                ExecutePolarizedProtocol(waveStr,"UD")
+        else
+                ExecutePolarizedProtocol(waveStr,pType)
+        endif   
+        
+        
+        return(0)
+End
+
+// very similar to ExecuteProtocol
+//
+// -- SAM, EMP, and BGD do not need to be loaded
+// -- but they do need to be "moved" into the regular data positions
+//    rather then their tagged locations.
+//
+Function ExecutePolarizedProtocol(protStr,pType)
+        String protStr,pType
+
+        //protStr is the full path to the selected protocol wave
+        WAVE/T prot = $protStr
+        SetDataFolder root:myGlobals:Protocols
+        
+        Variable filesOK,err,notDone
+        String activeType, msgStr, junkStr, pathStr="", samStr=""
+        PathInfo catPathName                    //this is where the files are
+        pathStr=S_path
+        
+        NVAR useXMLOutput = root:Packages:NIST:gXML_Write
+        
+        //Parse the instructions in the prot wave
+        //0 - bkg
+        //1 - emp
+        //2 - div
+        //3 - mask
+        //4 - abs params c2-c5
+        //5 - average params
+        //6 = DRK file (**out of sequence)
+
+// don't load the SAM data, just re-tag it      
+// the Polarization corrected data is UU_pc, DU_pc, etc.
+// this tags it for display, and puts it in the correctly named waves
+        String dataType,str
+        
+        dataType="SAM"
+        sprintf str,"DisplayTaggedData(\"%s\",\"%s\")",dataType,pType+"_pc"
+        Execute str
+        
+// don't load the EMP data, just re-tag it      
+        dataType="EMP"
+        sprintf str,"DisplayTaggedData(\"%s\",\"%s\")",dataType,pType+"_pc"
+        Execute str
+
+// don't load the BGD data, just re-tag it      
+        dataType="BGD"
+        sprintf str,"DisplayTaggedData(\"%s\",\"%s\")",dataType,pType+"_pc"
+        Execute str
+        
+//
+// from here down, the steps are identical
+//
+// - with the exceptions of:
+// - file naming. Names are additionally tagged with pType
+// - if the protocol[0] or [1] are "" <null>, then the step  will be used
+//   the step is only skipped if the protocol is "none"
+//
+
+        
+        //do the CORRECT step based on the answers to emp and bkg subtraction
+        //by setting the proper"mode"
+        //1 = both emp and bgd subtraction
+        //2 = only bgd subtraction
+        //3 = only emp subtraction
+        //4 = no subtraction 
+        //additional modes 091301
+        // ------currently, for polarized reduction, DRK mode is not allowed or recognized at all...
+        //11 = emp, bgd, drk
+        //12 = bgd and drk
+        //13 = emp and drk
+        //14 = no subtractions
+        //work.drk is from proto[6]
+        //
+        //subtracting just the DRK data is NOT an option - it doesnt' really make any physical sense
+        // - in this case, DRK is skipped (equivalent to mode==4)
+        // automatically accounts for attenuators given the lookup tables and the 
+        //desired subtractions
+        //Attenuator lookup tables are alredy implemented (NG1 = NG7)
+        //
+                
+        //dispatch to the proper "mode" of Correct()
+        Variable mode=4,val
+        do
+                if( (cmpstr("none",prot[0]) == 0)       && (cmpstr("none",prot[1]) == 0) )
+                        //no subtraction (mode = 4),
+                        mode = 4
+                Endif
+                If((cmpstr(prot[0],"none") != 0) && (cmpstr(prot[1],"none") == 0))
+                        //subtract BGD only
+                        mode=2
+                Endif
+                If((cmpstr(prot[0],"none") == 0) && (cmpstr(prot[1],"none") != 0))
+                        //subtract EMP only
+                        mode=3
+                Endif
+                If((cmpstr(prot[0],"none") != 0) && (cmpstr(prot[1],"none") != 0))
+                        // bkg and emp subtraction are to be done (BOTH not "none")
+                        mode=1
+                Endif
+                activeType = "COR"
+//              //add in DRK mode (0= no used, 10 = used)
+//              val = NumberByKey("DRKMODE",prot[6],"=","," )
+//              mode += val
+//              print "Correct mode = ",mode
+                err = Correct(mode)
+                if(err)
+                        SetDataFolder root:
+                        Abort "error in Correct, called from executeprotocol, normal cor"
+                endif
+                UpdateDisplayInformation(ActiveType)            //update before breaking from loop
+        While(0)
+        
+        //check for work.div file (prot[2])
+        //add if needed
+        // can't properly check the filename - so for now add and divide, if anything other than "none"
+        //do/skip divide step based on div answer
+        If(cmpstr("none",prot[2])!=0)           // if !0, then there's a file requested
+                If(cmpstr("ask",prot[2]) == 0)
+                        //ask user for file
+                         junkStr = PromptForPath("Select the detector sensitivity file")
+                        If(strlen(junkStr)==0)
+                                SetDataFolder root:
+                                Abort "No file selected, data reduction aborted"
+                        Endif
+                         ReadHeaderAndWork("DIV", junkStr)
+                else
+                        //assume it's a path, and that the first (and only) item is the path:file
+                        //list processing is necessary to remove any final comma
+                        junkStr = pathStr + StringFromList(0, prot[2],"," )
+                        ReadHeaderAndWork("DIV",junkStr)
+                Endif
+                //got a DIV file, select the proper type of work data to DIV (= activeType)
+                err = Divide_work(activeType)           //returns err = 1 if data doesn't exist in specified folders
+                If(err)
+                        SetDataFolder root:
+                        Abort "data missing in DIV step, call from executeProtocol"
+                Endif
+                activeType = "CAL"
+                UpdateDisplayInformation(ActiveType)            //update before breaking from loop
+        Endif
+        
+        Variable c2,c3,c4,c5,kappa_err
+        //do absolute scaling if desired
+        if(cmpstr("none",prot[4])!=0)
+                if(cmpstr("ask",prot[4])==0)
+                        //get the params from the user
+                        Execute "AskForAbsoluteParams_Quest()"
+                        //then from the list
+                        SVAR junkAbsStr = root:myGlobals:Protocols:gAbsStr
+                        c2 = NumberByKey("TSTAND", junkAbsStr, "=", ";")        //parse the list of values
+                        c3 = NumberByKey("DSTAND", junkAbsStr, "=", ";")
+                        c4 = NumberByKey("IZERO", junkAbsStr, "=", ";")
+                        c5 = NumberByKey("XSECT", junkAbsStr, "=", ";")
+                        kappa_err = NumberByKey("SDEV", junkAbsStr, "=", ";")
+                else
+                        //get the parames from the list
+                        c2 = NumberByKey("TSTAND", prot[4], "=", ";")   //parse the list of values
+                        c3 = NumberByKey("DSTAND", prot[4], "=", ";")
+                        c4 = NumberByKey("IZERO", prot[4], "=", ";")
+                        c5 = NumberByKey("XSECT", prot[4], "=", ";")
+                        kappa_err = NumberByKey("SDEV", prot[4], "=", ";")
+                Endif
+                //get the sample trans and thickness from the activeType folder
+                String destStr = "root:Packages:NIST:"+activeType+":realsread"
+                Wave dest = $destStr
+                Variable c0 = dest[4]           //sample transmission
+                Variable c1 = dest[5]           //sample thickness
+                
+                err = Absolute_Scale(activeType,c0,c1,c2,c3,c4,c5,kappa_err)
+                if(err)
+                        SetDataFolder root:
+                        Abort "Error in Absolute_Scale(), called from executeProtocol"
+                endif
+                activeType = "ABS"
+                UpdateDisplayInformation(ActiveType)            //update before breaking from loop
+        Endif
+        
+        //check for mask
+        //add mask if needed
+        // can't properly check the filename - so for now always add
+        //doesn't change the activeType
+        if(cmpstr("none",prot[3])!=0)
+                If(cmpstr("ask",prot[3])==0)
+                        //get file from user
+                        junkStr = PromptForPath("Select Mask file")
+                        If(strlen(junkStr)==0)
+                                //no selection of mask file is not a fatal error, keep going, and let cirave()
+                                //make a "null" mask 
+                                //if none desired, make sure that the old mask is deleted
+                                //junkStr = GetDataFolder(1)
+                                //SetDataFolder root:Packages:NIST:MSK
+                                KillWaves/Z root:Packages:NIST:MSK:data
+                                //SetDataFolder junkStr
+                                DoAlert 0,"No Mask file selected, data not masked"
+                        else
+                                //read in the file from the dialog
+                                ReadMCID_MASK(junkStr)
+                        Endif
+                else
+                        //just read it in from the protocol
+                        //list processing is necessary to remove any final comma
+                        junkStr = pathStr + StringFromList(0, prot[3],"," )
+                        ReadMCID_MASK(junkStr)
+                Endif
+        else
+                //if none desired, make sure that the old mask is deleted
+                //junkStr = GetDataFolder(1)
+                //SetDataFolder root:Packages:NIST:MSK
+                KillWaves/Z root:Packages:NIST:MSK:data
+                //SetDataFolder junkStr
+        Endif
+        
+        //mask data if desired (this is done automatically  in the average step) and is
+        //not done explicitly here (if no mask in MSK folder, a null mask is created and "used")
+        
+        // average/save data as specified
+        
+        //Parse the keyword=<Value> string as needed, based on AVTYPE
+        
+        //average/plot first 
+        String av_type = StringByKey("AVTYPE",prot[5],"=",";")
+        If(cmpstr(av_type,"none") != 0)
+                If (cmpstr(av_type,"")==0)              //if the key could not be found... (if "ask" the string)
+                        //get the averaging parameters from the user, as if the set button was hit
+                        //in the panel
+                        SetAverageParamsButtonProc("dummy")             //from "ProtocolAsPanel"
+                        SVAR tempAveStr = root:myGlobals:Protocols:gAvgInfoStr
+                        av_type = StringByKey("AVTYPE",tempAveStr,"=",";")
+                else
+                        //there is info in the string, use the protocol
+                        //set the global keyword-string to prot[5]
+                        String/G root:myGlobals:Protocols:gAvgInfoStr = prot[5]
+                Endif
+        Endif
+        
+        //convert the folder to linear scale before averaging, then revert by calling the window hook
+        ConvertFolderToLinearScale(activeType)
+        
+        strswitch(av_type)      //dispatch to the proper routine to average to 1D data
+                case "none":            
+                        //still do nothing
+                        break                   
+                case "2D_ASCII":        
+                        //do nothing
+                        break
+                case "QxQy_ASCII":
+                        //do nothing
+                        break
+                case "PNG_Graphic":
+                        //do nothing
+                        break
+                case "Rectangular":
+                        RectangularAverageTo1D(activeType)
+                        break
+                case "Annular":
+                        AnnularAverageTo1D(activeType)
+                        break
+                case "Circular":
+                        CircularAverageTo1D(activeType)
+                        break
+                case "Sector":
+                        CircularAverageTo1D(activeType)
+                        break
+                case "Sector_PlusMinus":
+                        Sector_PlusMinus1D(activeType)
+                        break
+                default:        
+                        //do nothing
+        endswitch
+///// end of averaging dispatch
+        // put data back on log or lin scale as set by default
+        fRawWindowHook()
+        
+        //save data if desired
+        String fullpath = "", newfileName=""
+        String item = StringByKey("SAVE",prot[5],"=",";")               //does user want to save data?
+        If( (cmpstr(item,"Yes")==0) && (cmpstr(av_type,"none") != 0) )          
+                //then save
+                //get name from textwave of the activeType dataset
+                String textStr = "root:Packages:NIST:"+activeType+":textread"
+                Wave/T textPath = $textStr
+                String tempFilename = samStr
+                If(WaveExists(textPath) == 1)
+#if (exists("QUOKKA")==6)
+                        newFileName = ReplaceString(".nx.hdf", tempFilename, "")
+#elif (exists("HFIR")==6)
+//                      newFileName = ReplaceString(".xml",textPath[0],"")              //removes 4 chars
+//                      newFileName = ReplaceString("SANS",newFileName,"")              //removes 4 more chars = 8
+//                      newFileName = ReplaceString("exp",newFileName,"")                       //removes 3 more chars = 11
+//                      newFileName = ReplaceString("scan",newFileName,"")              //removes 4 more chars = 15, should be enough?
+                        newFileName = GetPrefixStrFromFile(textPath[0])+GetRunNumStrFromFile(textPath[0])
+#else
+                        newFileName = UpperStr(GetNameFromHeader(textPath[0]))          //NCNR data drops here, trims to 8 chars
+#endif
+                else
+                        newFileName = ""                        //if the header is missing?
+                        //Print "can't read the header - newfilename is null"
+                Endif
+                
+                //pick ABS or AVE extension
+                String exten = activeType
+                if(cmpstr(exten,"ABS") != 0)
+                        exten = "AVE"
+                endif
+                if(cmpstr(av_type,"2D_ASCII") == 0)
+                        exten = "ASC"
+                endif
+                if(cmpstr(av_type,"QxQy_ASCII") == 0)
+                        exten = "DAT"
+                endif
+                
+                // add an "x" to the file extension if the output is XML
+                // currently (2010), only for ABS and AVE (1D) output
+                if( cmpstr(exten,"ABS") == 0 || cmpstr(exten,"AVE") == 0 )
+                        if(useXMLOutput == 1)
+                                exten += "x"
+                        endif
+                endif
+                                
+                //Path is catPathName, symbolic path
+                //if this doesn't exist, a dialog will be presented by setting dialog = 1
+                //
+                // -- add in pType tag to the name
+                //
+                Variable dialog = 0
+                PathInfo/S catPathName
+                item = StringByKey("NAME",prot[5],"=",";")              //Auto or Manual naming
+                String autoname = StringByKey("AUTONAME",prot[5],"=",";")               //autoname -  will get empty string if not present
+                If((cmpstr(item,"Manual")==0) || (cmpstr(newFileName,"") == 0))
+                        //manual name if requested or if no name can be derived from header
+                        fullPath = newfileName + pType + "."+ exten //puts possible new name or null string in dialog
+                        dialog = 1              //force dialog for user to enter name
+                else
+                        //auto-generate name and prepend path - won't put up any dialogs since it has all it needs
+                        //use autoname if present
+                        if (cmpstr(autoname,"") != 0)
+                                fullPath = S_Path + autoname + pType + "." +exten
+                        else
+                                fullPath = S_Path + newFileName + pType + "." + exten
+                        endif   
+                Endif
+                //
+                strswitch(av_type)      
+                        case "Annular":
+                                WritePhiave_W_Protocol(activeType,fullPath,dialog)
+                                break
+                        case "2D_ASCII":
+                                Fast2DExport(activeType,fullPath,dialog)
+                                break
+                        case "QxQy_ASCII":
+                                QxQy_Export(activeType,fullPath,dialog)
+                                break
+                        case "PNG_Graphic":
+                                SaveAsPNG(activeType,fullpath,dialog)
+                                break
+                        default:
+                                if (useXMLOutput == 1)
+                                        WriteXMLWaves_W_Protocol(activeType,fullPath,dialog)
+                                else
+                                        WriteWaves_W_Protocol(activeType,fullpath,dialog)
+                                endif
+                endswitch
+                
+                //Print "data written to:  "+ fullpath
+        Endif
+        
+        //done with everything in protocol list
+        return(0)
+End
+
+
+// just like the RecallProtocolButton
+// - the reset function is different
+//
+Function RecallPolCorProtocolButton(ctrlName) : ButtonControl
+        String ctrlName
+        
+        //will reset panel values based on a previously saved protocol
+        //pick a protocol wave from the Protocols folder
+        //MUST move to Protocols folder to get wavelist
+        SetDataFolder root:myGlobals:Protocols
+        Execute "PickAProtocol()"
+        
+        //get the selected protocol wave choice through a global string variable
+        SVAR protocolName = root:myGlobals:Protocols:gProtoStr
+
+        //If "CreateNew" was selected, ask user to try again
+        if(cmpstr("CreateNew",protocolName) == 0)
+                Abort "CreateNew is for making a new Protocol. Select a previously saved Protocol"
+        Endif
+        
+        //reset the panel based on the protocol textwave (currently a string)
+        ResetToSavedPolProtocol(protocolName)
+        
+        SetDataFolder root:
+        return(0)
+end
+
+//function that actually parses the protocol specified by nameStr
+//which is just the name of the wave, without a datafolder path
+//
+Function ResetToSavedPolProtocol(nameStr)
+        String nameStr
+        
+        //allow special cases of Base and DoAll Protocols to be recalled to panel - since they "ask"
+        //and don't need paths
+        
+        String catPathStr
+        PathInfo catPathName
+        catPathStr=S_path
+        
+        //SetDataFolder root:myGlobals:Protocols                //on windows, data folder seems to get reset (erratically) to root: 
+        Wave/T w=$("root:myGlobals:Protocols:" + nameStr)
+        
+        String fullPath="",comma=",",list="",nameList="",PathStr="",item=""
+        Variable ii=0,numItems,checked,specialProtocol=0
+        
+        if((cmpstr(nameStr,"Base")==0) || (cmpstr(nameStr,"DoAll")==0))
+                return(0)               //don't allow these
+        Endif
+
+        //background = check5
+        checked = 1
+        nameList = w[0]
+        If(cmpstr(nameList,"none") ==0)
+                checked = 0
+        Endif
+
+        //set the global string to display and checkbox
+        CheckBox check5 win=PolCor_Panel,value=checked
+
+        //EMP = check4
+        checked = 1
+        nameList = w[1]
+        If(cmpstr(nameList,"none") ==0)
+                checked = 0
+        Endif
+
+        //set the global string to display and checkbox
+        CheckBox check4 win=PolCor_Panel,value=checked
+        
+        
+        //DIV file
+        checked = 1
+        nameList = w[2]
+        If(cmpstr(nameList,"none") ==0)
+                checked = 0
+        Endif
+
+        //set the global string to display and checkbox
+        String/G root:myGlobals:Protocols:gDIV = nameList
+        CheckBox check0 win=PolCor_Panel,value=checked
+        
+        //Mask file
+        checked = 1
+        nameList = w[3]
+        If(cmpstr(nameList,"none") ==0)
+                checked = 0
+        Endif
+
+        //set the global string to display and checkbox
+        String/G root:myGlobals:Protocols:gMASK = nameList
+        CheckBox check1 win=PolCor_Panel,value=checked
+        
+        //4 = abs parameters
+        list = w[4]
+        numItems = ItemsInList(list,";")
+        checked = 1
+        if(numitems == 4 || numitems == 5)              //allow for protocols with no SDEV list item
+                //correct number of parameters, assume ok
+                String/G root:myGlobals:Protocols:gAbsStr = list
+                CheckBox check2 win=PolCor_Panel,value=checked
+        else
+                item = StringFromList(0,list,";")
+                if(cmpstr(item,"none")==0)
+                        checked = 0
+                        list = "none"
+                        String/G root:myGlobals:Protocols:gAbsStr = list
+                        CheckBox check2 win=PolCor_Panel,value=checked
+                else
+                        //force to "ask"
+                        checked = 1
+                        String/G root:myGlobals:Protocols:gAbsStr = "ask"
+                        CheckBox check2 win=PolCor_Panel,value=checked
+                Endif
+        Endif
+        
+        //5 = averaging choices
+        list = w[5]
+        item = StringByKey("AVTYPE",list,"=",";")
+        if(cmpstr(item,"none") == 0)
+                checked = 0
+                String/G root:myGlobals:Protocols:gAVE = "none"
+                CheckBox check3 win=PolCor_Panel,value=checked
+        else
+                checked = 1
+                String/G root:myGlobals:Protocols:gAVE = list
+                CheckBox check3 win=PolCor_Panel,value=checked
+        Endif
+        
+        //6 = DRK choice
+
+        //7 = unused
+        
+        //all has been reset, get out
+        Return (0)
+End
+
+// at a first pass, uses the regular reduction protocol         SaveProtocolButton(ctrlName)
+//
+// -- won't work, as it uses the MakeProtocolFromPanel function... so replace this
+//
+Function SavePolCorProtocolButton(ctrlName) : ButtonControl
+        String ctrlName
+        
+        
+        Variable notDone=1, newProto=1
+        //will prompt for protocol name, and save the protocol as a text wave
+        //prompt for name of new protocol wave to save
+        do
+                Execute "AskForName()"
+                SVAR newProtocol = root:myGlobals:Protocols:gNewStr
+                
+                //make sure it's a valid IGOR name
+                newProtocol = CleanupName(newProtocol,0)        //strict naming convention
+                String/G root:myGlobals:Protocols:gNewStr=newProtocol           //reassign, if changed
+                Print "newProtocol = ",newProtocol
+                
+                SetDataFolder root:myGlobals:Protocols
+                if(WaveExists( $("root:myGlobals:Protocols:" + newProtocol) ) == 1)
+                        //wave already exists
+                        DoAlert 1,"That name is already in use. Do you wish to overwrite the existing protocol?"
+                        if(V_Flag==1)
+                                notDone = 0
+                                newProto = 0
+                        else
+                                notDone = 1
+                        endif
+                else
+                        //name is good
+                        notDone = 0
+                Endif
+        while(notDone)
+        
+        //current data folder is  root:myGlobals:Protocols
+        if(newProto)
+                Make/O/T/N=8 $("root:myGlobals:Protocols:" + newProtocol)
+        Endif
+        
+//      MakeProtocolFromPanel( $("root:myGlobals:Protocols:" + newProtocol) )
+        MakePolProtocolFromPanel( $("root:myGlobals:Protocols:" + newProtocol) )
+        String/G  root:myGlobals:Protocols:gProtoStr = newProtocol
+        
+        //the data folder WAS changed above, this must be reset to root:
+        SetDatafolder root:     
+                
+        return(0)
+End
+
+//function that does the guts of reading the panel controls and globals
+//to create the necessary text fields for a protocol
+//Wave/T w (input) is an empty text wave of 8 elements for the protocol
+//on output, w[] is filled with the protocol strings as needed from the panel 
+//
+Function MakePolProtocolFromPanel(w)
+        Wave/T w
+        
+        //construct the protocol text wave form the panel
+        //it is to be parsed by ExecuteProtocol() for the actual data reduction
+        PathInfo catPathName                    //this is where the files came from
+        String pathstr=S_path,tempStr,curList
+        Variable checked,ii,numItems
+        
+        //look for checkboxes, then take each item in list and prepend the path
+        //w[0] = background
+        ControlInfo/W=PolCor_Panel check5
+        checked = V_Value
+        if(checked)
+                w[0] = ""               // BKG will be used
+        else
+                w[0] = "none"           // BKG will not be used
+        endif
+        
+        //w[1] = empty
+        ControlInfo/W=PolCor_Panel check4
+        checked = V_Value
+        if(checked)
+                w[1] = ""               // EMP will be used
+        else
+                w[1] = "none"           // EMP will not be used
+        endif
+
+        
+        //w[2] = div file
+        ControlInfo/W=PolCor_Panel check0
+        checked = V_value
+        if(checked)
+                //build the list
+                //just read the global
+                SVAR str=root:myGlobals:Protocols:gDIV
+                if(cmpstr(str,"ask")==0)
+                        w[2] = str
+                else
+                        tempStr = ParseRunNumberList(str)
+                        if(strlen(tempStr)==0)
+                                return(1)
+                        else
+                                w[2] = tempstr
+                                str=tempstr
+                        endif
+                endif
+        else
+                //none used - set textwave (and global?)
+                w[2] = "none"
+                String/G root:myGlobals:Protocols:gDIV = "none"
+        endif
+        
+        //w[3] = mask file
+        ControlInfo/W=PolCor_Panel check1
+        checked = V_value
+        if(checked)
+                //build the list
+                //just read the global
+                SVAR str=root:myGlobals:Protocols:gMASK
+                if(cmpstr(str,"ask")==0)
+                        w[3] = str
+                else
+                        tempstr = ParseRunNumberList(str)
+                        if(strlen(tempstr)==0)
+                                return(1)
+                        else
+                                w[3] = tempstr
+                                str = tempstr
+                        endif
+                endif
+        else
+                //none used - set textwave (and global?)
+                w[3] = "none"
+                String/G root:myGlobals:Protocols:gMASK = "none"
+        endif
+        
+        //w[4] = abs parameters
+        ControlInfo/W=PolCor_Panel check2
+        checked = V_value
+        if(checked)
+                //build the list
+                //just read the global
+                SVAR str=root:myGlobals:Protocols:gAbsStr
+                w[4] = str
+        else
+                //none used - set textwave (and global?)
+                w[4] = "none"
+                String/G root:myGlobals:Protocols:gAbsStr = "none"
+        endif
+        
+        //w[5] = averaging choices
+        ControlInfo/W=PolCor_Panel check3
+        checked = V_value
+        if(checked)
+                //just read the global
+                SVAR avestr=root:myGlobals:Protocols:gAVE
+                w[5] = avestr
+        else
+                //none used - set textwave
+                w[5] = "AVTYPE=none;"
+        endif
+        
+        //w[6]
+        //work.DRK information
+        SVAR drkStr=root:myGlobals:Protocols:gDRK
+        w[6] = ""
+        
+        //w[7]
+        //currently unused
+        w[7] = ""
+        
+        return(0)
 End
 

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

@@ -279 +279 @@
 
 
-//
-// TODO: 
-//                      - parsing routines
-//                      - write the results to a waveNote
-//                      --- where to store the intermediate results of trans values?
-//                              make a wave behind the scenes to
-//
-//
+
 // Decay parameters for each cell. Results are stored in a wave note for each cell
 //
@@ -410 +403 @@
                 case 2: // mouse up
                         // click code here
-                        Variable gamma_val,err_gamma,muPo, err_muPo, Po, err_Po
+                        Variable gamma_val,err_gamma,muPo, err_muPo, Po, err_Po, runNum
 
                         ControlInfo/W=DecayPanel popup_0
@@ -426 +419 @@
                         Prompt err_muPo, "Enter err_muPo: "             
                         Prompt gamma_val, "Enter gamma: "               
-                        Prompt err_gamma, "Enter err_gamma: "           
-                        DoPrompt "Enter Cell Decay Parameters", Po, err_Po, muPo, err_muPo, gamma_val, err_gamma
+                        Prompt err_gamma, "Enter err_gamma: "
+                        Prompt runNum,"Run number for time=0 of decay"  
+                        DoPrompt "Enter Cell Decay Parameters", Po, err_Po, muPo, err_muPo, gamma_val, err_gamma, runNum
                         if (V_Flag)
                                 return -1                                                               // User canceled
                         endif
                         
+                        fname = FindFileFromRunNumber(runNum)
+                        t0str = getFileCreationDate(fname)
+                                        
 //              for the wave note
                         noteStr = note(decay)
@@ -440 +437 @@
                         noteStr = ReplaceNumberByKey("gamma", noteStr, gamma_val ,"=", ",", 0)
                         noteStr = ReplaceNumberByKey("err_gamma", noteStr, err_gamma ,"=", ",", 0)
-
+                        noteStr = ReplaceStringByKey("T0", noteStr, t0Str  ,"=", ",", 0)
                         // replace the string
                         Note/K decay
@@ -448 +445 @@
                         SVAR gGamma  = root:Packages:NIST:Polarization:Cells:gGamma
                         SVAR gMuPo = root:Packages:NIST:Polarization:Cells:gMuPo
-                        SVAR gPo  = root:Packages:NIST:Polarization:Cells:gPo                   
+                        SVAR gPo  = root:Packages:NIST:Polarization:Cells:gPo           
+                        SVAR gT0 = root:Packages:NIST:Polarization:Cells:gT0
+                        
+                        gT0 = t0Str             //for display
                         sprintf gMuPo, "%g +/- %g",muPo, err_muPo
                         sprintf gPo, "%g +/- %g",Po,err_Po