Ignore:
Timestamp:
Jan 28, 2020 3:45:22 PM (3 years ago)
Author:
srkline
Message:

corrected the naming of the new preference for tube efficiency+shadowing

removed old prefrence for detector efficiency since it is now combined with shadowing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_VSANS_Preferences.ipf

    r1236 r1237  
    5959        Variable/G root:Packages:NIST:VSANS:Globals:gDoTransCheck=val 
    6060         
    61         val = NumVarOrDefault("root:Packages:NIST:VSANS:Globals:gBinWidth", 1 ) 
     61        val = NumVarOrDefault("root:Packages:NIST:VSANS:Globals:gBinWidth", 1.2 ) 
    6262        Variable/G root:Packages:NIST:VSANS:Globals:gBinWidth=val 
    6363         
     
    9292        val = NumVarOrDefault("root:Packages:NIST:VSANS:Globals:gDoDownstreamWindowCorPref", 1 ) 
    9393        Variable/G root:Packages:NIST:VSANS:Globals:gDoDownstreamWindowCorPref = 0 
    94          
    9594 
    9695        // Special global to prevent fake data from "B" detector from being written out 
     
    170169End 
    171170 
     171// this is efficiency + shadowing 
    172172Function V_DoEfficiencyCorrPref(ctrlName,checked) : CheckBoxControl 
    173173        String ctrlName 
    174174        Variable checked 
    175175         
    176         NVAR gVal = root:Packages:NIST:VSANS:Globals:gDoDetectorEffCor 
     176        NVAR gVal = root:Packages:NIST:VSANS:Globals:gDoTubeShadowCor 
    177177        gVal = checked 
    178178End 
     
    218218End 
    219219 
    220 Function V_DoTubeShadowCorPref(ctrlName,checked) : CheckBoxControl 
    221         String ctrlName 
    222         Variable checked 
    223          
    224         NVAR gVal = root:Packages:NIST:VSANS:Globals:gDoTubeShadowCor 
    225         gVal = checked 
    226 End 
     220// not needed-- efficiency and shadowing are done together 
     221//Function V_DoTubeShadowCorPref(ctrlName,checked) : CheckBoxControl 
     222//      String ctrlName 
     223//      Variable checked 
     224//       
     225//      NVAR gVal = root:Packages:NIST:VSANS:Globals:gDoTubeShadowCor 
     226//      gVal = checked 
     227//End 
    227228 
    228229Function V_DoMonitorNormPref(ctrlName,checked) : CheckBoxControl 
     
    300301        CheckBox PrefCtrl_1f pos={255,80},help={"TURN OFF ONLY FOR DEBUGGING. This corrects the data for angle dependent transmssion."} 
    301302        CheckBox PrefCtrl_1g title="Do Tube Efficiency+Shadowing?",size={140,14},proc=V_DoEfficiencyCorrPref 
    302         CheckBox PrefCtrl_1g value=root:Packages:NIST:VSANS:Globals:gDoDetectorEffCor,pos={255,100},help={"TURN OFF ONLY FOR DEBUGGING. This corrects the data for angle dependent detector efficiency."} 
     303        CheckBox PrefCtrl_1g value=root:Packages:NIST:VSANS:Globals:gDoTubeShadowCor,pos={255,100},help={"TURN OFF ONLY FOR DEBUGGING. This corrects the data for angle dependent detector efficiency."} 
    303304//      CheckBox PrefCtrl_1h title="Adjust RAW attenuation?",size={140,14},proc=V_DoRawAttenAdjPref 
    304305//      CheckBox PrefCtrl_1h value=root:Packages:NIST:VSANS:Globals:gDoAdjustRAW_Atten,pos={255,140},help={"This is normally not done"} 
     
    313314        CheckBox PrefCtrl_1l value=root:Packages:NIST:VSANS:Globals:gDoNonLinearCor,pos={255,180},help={"Non-linear correction can't be turned off"} 
    314315        CheckBox PrefCtrl_1m title="Do Downstream Window Corr?",size={140,14},proc=V_DoDownstreamWindowCorPref 
    315         CheckBox PrefCtrl_1m value=root:Packages:NIST:VSANS:Globals:gDoTubeShadowCor,pos={255,200},help={"TURN OFF ONLY FOR DEBUGGING."} 
     316        CheckBox PrefCtrl_1m value=root:Packages:NIST:VSANS:Globals:gDoDownstreamWindowCorPref,pos={255,200},help={"TURN OFF ONLY FOR DEBUGGING."} 
    316317//      CheckBox PrefCtrl_1n title="Do Monitor Normalization?",size={140,14},proc=V_DoMonitorNormPref 
    317318//      CheckBox PrefCtrl_1n value=root:Packages:NIST:VSANS:Globals:gDoMonitorNormalization,pos={255,220},help={"TURN OFF ONLY FOR DEBUGGING."} 
Note: See TracChangeset for help on using the changeset viewer.