Ignore:
Timestamp:
Apr 7, 2010 11:00:01 AM (13 years ago)
Author:
srkline
Message:

Made the preference panel fancier, with a tab control. this makes it much easier to add more things in the future. Added two more SANS items to turn off some detector corrections. good for testing, but maybe a bit dangerous.

removed the SANSPreferences procedure file from the general includes list for reduction. kept it in the very old versions of the includes (510 and older) for backwards comaptibility. new experiments start with 520 or higher.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/HFIR_Includes_v520.ipf

    r658 r668  
    6262//Add back Real Time for ICE 
    6363////#include "RealTimeUpdate_RT"                version>=5.0             
    64 #include "SANSPreferences"                              version>=5.0            //NEW 05MAY03 
    6564#include "Subtract_1D"                          version>=5.0                    //NEW 14MAY03 
    6665 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes.ipf

    r570 r668  
    44 
    55 
     6 
     7// SRK 7 APR 2012 
     8// as of version 5.1, this is now a pointer to the current version of the includes 
     9#include "Includes_v520" 
     10 
    611// SRK 12 FEB 08 
    712// as of version 5.1, this is now a pointer to the current version of the includes 
    8 #include "Includes_v510" 
     13//#include "Includes_v510" 
    914 
    1015// as of version 5, this is now a pointer to the current version of the includes 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_Facility.ipf

    r575 r668  
    55 
    66// be sure to add a definition for your facility so that 
    7 // minor chnages to the core code can be added through compiler directives 
    8 //#define SYMBOL 
     7// minor changes to the core code can be added through compiler directives 
     8// 
    99 
     10//Function FACILITY() 
     11//      //does nothing but define FACILITY() 
     12//      return(0) 
     13//End 
    1014 
    1115 
    … …  
    4852// removed RT ipf file in 29MAR07 branch (do not delete, but do not include or maintain) 
    4953//#include "RealTimeUpdate_RT"          version>=5.0             
    50 #include "SANSPreferences"                              version>=5.0            //NEW 05MAY03 
    5154#include "Subtract_1D"                          version>=5.0                    //NEW 14MAY03 
    5255 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_v520.ipf

    r658 r668  
    5959//Add back Real Time for ICE 
    6060#include "RealTimeUpdate_RT"            version>=5.0             
    61 #include "SANSPreferences"                              version>=5.0            //NEW 05MAY03 
    6261#include "Subtract_1D"                          version>=5.0                    //NEW 14MAY03 
    6362 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_v520_ILL.ipf

    r658 r668  
    6060// removed RT ipf file in 29MAR07 branch (do not delete, but do not include or maintain) 
    6161//#include "RealTimeUpdate_RT"          version>=5.0             
    62 #include "SANSPreferences"                              version>=5.0            //NEW 05MAY03 
    6362#include "Subtract_1D"                          version>=5.0                    //NEW 14MAY03 
    6463 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Initialize.ipf

    r665 r668  
    104104        //initializes preferences. this includes XML y/n, and SANS Reduction items.  
    105105        // if they already exist, they won't be overwritten 
    106         Execute "init_pref()"    
     106        Execute "Initialize_Preferences()"       
    107107 
    108108         
    109         // flags to turn detector corrections on/off for testing (you should leave these ON) 
    110         Variable/G root:myGlobals:gDoDetectorEffCorr = 1 
    111         Variable/G root:myGlobals:gDoTransmissionCorr = 1 
     109 
    112110 
    113111        //set flag if Demo Version is detected 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SANSPreferences.ipf

    r665 r668  
    44 
    55 
     6/////////////////////////// 
     7// user preferences 
     8//  
     9// globals are created in initialize.ipf 
     10// 
     11// this panel allows for user modification 
     12/////////////////////////// 
     13Proc Show_Preferences_Panel() 
     14 
     15        DoWindow/F Pref_Panel 
     16        if(V_flag==0) 
     17                Init_Pref() 
     18                Pref_Panel() 
     19        Endif 
     20//      Print "Preferences Panel stub" 
     21End 
     22 
     23Proc init_pref() 
     24        // all creation of global values for the pref panel 
     25        // should be done in the experiment initialization 
     26        // since all these globals will be in active use 
     27        // even if the preferences are never actively set 
     28end 
     29 
     30Function LogScalePrefCheck(ctrlName,checked) : CheckBoxControl 
     31        String ctrlName 
     32        Variable checked 
     33         
     34        NVAR gLog = root:myGlobals:gLogScalingAsDefault 
     35        glog=checked 
     36        //print "log pref checked = ",checked 
     37End 
     38 
     39Function DRKProtocolPref(ctrlName,checked) : CheckBoxControl 
     40        String ctrlName 
     41        Variable checked 
     42         
     43        NVAR gDRK = root:myGlobals:gAllowDRK 
     44        gDRK = checked 
     45        //Print "DRK preference = ",checked 
     46End 
     47 
     48Function UnityTransPref(ctrlName,checked) : CheckBoxControl 
     49        String ctrlName 
     50        Variable checked 
     51         
     52        NVAR gVal = root:myGlobals:gDoTransCheck 
     53        gVal = checked 
     54End 
     55 
     56Function XMLWritePref(ctrlName,checked) : CheckBoxControl 
     57        String ctrlName 
     58        Variable checked 
     59         
     60        NVAR gVal = root:Packages:NIST:gXML_Write 
     61        gVal = checked 
     62End 
     63 
     64Function PrefDoneButtonProc(ctrlName) : ButtonControl 
     65        String ctrlName 
     66         
     67        DoWindow/K pref_panel 
     68End 
     69 
     70// draws the panel 
     71// each checkbox should actively change a global value 
     72Proc Pref_Panel() 
     73        PauseUpdate; Silent 1           // building window... 
     74        NewPanel /K=2 /W=(607,158,899,360) as "SANS Preference Panel" 
     75        DoWindow/C pref_panel 
     76        ModifyPanel cbRGB=(49694,61514,27679) 
     77        CheckBox check0,pos={10,10},size={186,14},proc=LogScalePrefCheck,title="Use Log scaling for 2D data display" 
     78        CheckBox check0,help={"Checking this will display 2D SANS data with a logarithmic color scale of neutron counts. If not checked, the color mapping will be linear."} 
     79        CheckBox check0,value= root:myGlobals:gLogScalingAsDefault 
     80        CheckBox check1,pos={10,30},size={184,14},proc=DRKProtocolPref,title="Allow DRK correction in protocols" 
     81        CheckBox check1,help={"Checking this will allow DRK correction to be used in reduction protocols. You will need to re-draw the protocol panel for this change to be visible."} 
     82        CheckBox check1,value= root:myGlobals:gAllowDRK 
     83        CheckBox check2,pos={10,50},size={184,14},proc=UnityTransPref,title="Check for Transmission = 1" 
     84        CheckBox check2,help={"Checking this will check for SAM or EMP Trans = 1 during data correction"} 
     85        CheckBox check2,value= root:myGlobals:gDoTransCheck 
     86        Button button0,pos={226,168},size={50,20},proc=PrefDoneButtonProc,title="Done" 
     87        SetVariable setvar0,pos={10,80},size={200,15},title="Averaging Bin Width (pixels)" 
     88        SetVariable setvar0,limits={1,100,1},value= root:myGlobals:gBinWidth 
     89        SetVariable setvar1,pos={10,105},size={200,15},title="# Phi Steps (annular avg)" 
     90        SetVariable setvar1,limits={1,360,1},value= root:myGlobals:gNPhiSteps 
     91        CheckBox check3,pos={10,130},size={184,14},proc=XMLWritePref,title="Use canSAS XML Output" 
     92        CheckBox check3,help={"Checking this will set the default output format to be canSAS XML rather than NIST 6 column"} 
     93        CheckBox check3,value=root:Packages:NIST:gXML_Write 
     94        //keep these hidden for now so that nobody can accidentally change them from 
     95        //the default values set in Initialize.ipf (128x128) 
     96//      SetVariable setvar2,pos={10,125},size={200,15},title="Detector Pixels (X)" 
     97//      SetVariable setvar2,limits={1,2000,1},value= root:myGlobals:gNPixelsX 
     98//      SetVariable setvar3,pos={10,145},size={200,15},title="Detector Pixels (Y)" 
     99//      SetVariable setvar3,limits={1,2000,1},value= root:myGlobals:gNPixelsY 
     100 
     101End 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WorkFileUtils.ipf

    r609 r668  
    121121         
    122122        // switches to control what is done, don't do the transmission correction for the BGD measurement 
    123         NVAR doEfficiency = root:myGlobals:gDoDetectorEffCorr 
    124         NVAR gDoTrans = root:myGlobals:gDoTransmissionCorr 
     123        NVAR doEfficiency = root:Packages:NIST:gDoDetectorEffCorr 
     124        NVAR gDoTrans = root:Packages:NIST:gDoTransmissionCorr 
    125125        Variable doTrans = gDoTrans 
    126126        if(cmpstr("BGD",newtype) == 0) 
    … …  
    291291        //apply nonlinear, Jacobian corrections --- 
    292292        // switches to control what is done, don't do the transmission correction for the BGD measurement 
    293         NVAR doEfficiency = root:myGlobals:gDoDetectorEffCorr 
    294         NVAR gDoTrans = root:myGlobals:gDoTransmissionCorr 
     293        NVAR doEfficiency = root:Packages:NIST:gDoDetectorEffCorr 
     294        NVAR gDoTrans = root:Packages:NIST:gDoTransmissionCorr 
    295295        Variable doTrans = gDoTrans 
    296296        if(cmpstr("BGD",newtype) == 0) 
Note: See TracChangeset for help on using the changeset viewer.