Changeset 867


Ignore:
Timestamp:
Oct 5, 2012 10:27:15 AM (10 years ago)
Author:
srkline
Message:

Updated the PolCor? panel to have separate conditions for the SAM files and EMP files. previously they used the same condition. No condtion is used for BGD files. (it pretends to read the EMP condition). Help file has been updated.

Location:
sans/Dev/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_FlipperPanel.ipf

    r865 r867  
    11#pragma rtGlobals=1             // Use modern global access method. 
     2#pragma IgorVersion=6.1 
     3 
    24 
    35// input panels to set and calculate polarization parameters necessary for the  
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf

    r865 r867  
    11#pragma rtGlobals=1             // Use modern global access method. 
     2#pragma IgorVersion=6.1 
    23 
    34 
     
    1920// and keep the notation as close as possible. 
    2021// 
    21 // error propagation was written up elsewhere, and will be implemented as well 
    22 // - each of the calculations based on transmissions will need to have errors 
    23 // brought in, and carried through the calculations. Some will be simple, some 
    24 // will probably be easiest written as expansions. 
    25 // 
    26  
    27  
    28  
    29 // This is a first pass at the input panel (step 3) 
    30 // to gather all of the files and conditions necessary to do the polarization correction 
    31 // 
    32 // 
     22// error propagation is written up elsewhere 
     23 
    3324 
    3425// I'll need space for 4 input files in, say SAM 
     
    5546 
    5647// **** search for TODO to find items still to be fixed in other procedures  ********** 
    57  
     48// 
    5849// 
    5950// TODO: 
    60 // - Overall, I need a better way of flowing through the whole process, to be sure that values are set 
    61 // as needed and that one step won't fail because a previous step wasn't done yet. Combining the 
    62 // first three panels into one w/ tabs would help a lot, but that is rather complex to implement. 
    63 // and is still not a fool-proof situation 
    6451// 
    6552// X- mathod to save and restore the panel state - especially the popup selections 
    6653// 
    67 // -- should I force the Polarization correction to be re-done just before the protocol is 
     54// X- should I force the Polarization correction to be re-done just before the protocol is 
    6855//                      executed? Then I'm sure that the PC is done. Must do for each tab (only if part of the protocol) 
    69 //                      Except that the procedures work on the "active" tab... 
     56//                      Except that the procedures work on the "active" tab... (YES, and this has been done) 
    7057// 
    7158// -- When multiple files are added together, there are changes made to the RealsRead (monCts, etc.). Are these 
     
    7562// -- still not sure what is needed for absolute scaling 
    7663// 
    77 // -- what is the sample transmission, and exactly what +/- states are the proper measurements to use for thransmission? 
     64// -- what is the sample transmission, and exactly what +/- states are the proper measurements to use for transmission? 
    7865// 
    7966// -- generate some sort of report of what was set up, and what was used in the calculation 
     
    204191         
    205192        SetDataFolder root: 
     193         
     194        RestorePolCorPanel()            // put the condition popups in the proper state 
     195         
    206196        return(0) 
    207197End 
     
    356346        Button button13,pos={440,446},size={120,20},proc=ClearPolCorEntries,title="Clear Entries" 
    357347 
    358         PopupMenu popup1,pos={210,20},size={102,20},title="Condition" 
    359         PopupMenu popup1, mode=1,popvalue="none",value= #"P_GetConditionNameList()" 
     348 
    360349 
    361350        TitleBox title0,pos={100,66},size={24,24},title="\\f01UU or + +",fSize=12 
     
    419408 
    420409// SAM Tab       
     410        PopupMenu popup_0_1,pos={230,60},size={102,20},title="Condition" 
     411        PopupMenu popup_0_1, mode=1,popvalue="none",value= #"P_GetConditionNameList()" 
    421412        // UU 
    422413        ListBox ListBox_0_UU,pos={34,102},size={200,130},proc=PolCor_FileListBoxProc,frame=2 
     
    520511 
    521512 
    522 // EMP Tab       
     513// EMP Tab 
     514        PopupMenu popup_1_1,pos={230,60},size={102,20},title="Condition" 
     515        PopupMenu popup_1_1, mode=1,popvalue="none",value= #"P_GetConditionNameList()"   
    523516        // UU 
    524517        ListBox ListBox_1_UU,pos={34,102},size={200,130},proc=PolCor_FileListBoxProc,frame=2 
     
    10521045        num = DimSize(lb,0)             //should be 10, as initialized 
    10531046         
    1054         // if the condition (for all of the sets) is "none", get out 
    1055         ControlInfo/W=PolCor_Panel popup1 
     1047        // pick the condition, based on the tabNum 
     1048        // == 0 = sam 
     1049        // == 1 = emp 
     1050        // == 2 = bgd, which requires no condition, so use the emp condition... 
     1051        // 
     1052        if(tabNum==0 || tabNum==1) 
     1053                ControlInfo/W=PolCor_Panel $("popup_"+num2str(tabNum)+"_1") 
     1054        else 
     1055                ControlInfo/W=PolCor_Panel $("popup_"+num2str(1)+"_1")          //use the condition of the empty tab 
     1056        endif 
    10561057        condStr = S_Value 
     1058        Print "Using condition ",condStr," for ",type 
    10571059        if(cmpstr(condStr, "none" ) == 0) 
    10581060                DoAlert 0,"Condition is not set." 
     
    11761178         
    11771179        // if the condition (for all of the sets) is "none", get out 
    1178         ControlInfo/W=PolCor_Panel popup1 
     1180        if(tabNum==0 || tabNum==1) 
     1181                ControlInfo/W=PolCor_Panel $("popup_"+num2str(tabNum)+"_1") 
     1182        else 
     1183                ControlInfo/W=PolCor_Panel $("popup_"+num2str(1)+"_1")          //use the condition of the empty tab 
     1184        endif 
    11791185        condStr = S_Value 
     1186//      Print "Using condition ",condStr," for ",type 
     1187 
    11801188        if(cmpstr(condStr, "none" ) == 0) 
    11811189                DoAlert 0,"Condition is not set." 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationPanels.ipf

    r865 r867  
    11#pragma rtGlobals=1             // Use modern global access method. 
     2#pragma IgorVersion=6.1 
    23 
    34 
     
    178179        //rebuild the list 
    179180        // cell constants 
    180         String/G gCell_Maverick = "cell=Maverick,lambda=5.0,Te=0.87,err_Te=0.01,mu=3.184,err_mu=0.2," 
    181         String/G gCell_Burgundy = "cell=Burgundy,lambda=5.0,Te=0.86,err_Te=0.01,mu=3.138,err_mu=0.15," 
    182         String/G gCell_Olaf = "cell=Olaf,lambda=7.5,Te=0.86,err_Te=0.005,mu=2.97,err_mu=0.18," 
     181        String/G gCell_Maverick = "cell=Maverick,lambda=5.0,Te=0.87,err_Te=0.01,mu=3.184,err_mu=0.02," 
     182        String/G gCell_Burgundy = "cell=Burgundy,lambda=5.0,Te=0.86,err_Te=0.01,mu=3.138,err_mu=0.015," 
     183        String/G gCell_Olaf = "cell=Olaf,lambda=7.5,Te=0.86,err_Te=0.005,mu=2.97,err_mu=0.018," 
    183184         
    184185         
Note: See TracChangeset for help on using the changeset viewer.