Ignore:
Timestamp:
Mar 22, 2019 2:52:55 PM (4 years ago)
Author:
srkline
Message:

many changes to the VCALC procedures to add in the hard/soft shadowing to the calculation, visualization of the shadowed regions, and the actual q-values. Added a separate panel to view the shadowed regions.

simpe fix to the real time routine to allow easy updating of both the raw 2D data and 1-D average

update to the USANS package to handle the new NICE generated data where the data is collected in terms of q-values rather than angle. On startup asks user which style of data they have. Sets a preference that can be un-checked if you have old-style ICP data. (there is nothing in the data file that I can key on).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r1124 r1133  
    14281428         
    14291429        /// items for USANS Reduction 
    1430         // now keys on date in the file -- see LoadBT5File() 
    1431 //      val = NumVarOrDefault("root:Packages:NIST:gUseNICEDataFormat", 1 ) 
    1432 //      Variable/G root:Packages:NIST:gUseNICEDataFormat=val     
     1430// is the data file from NICE and in terms of QValues rather than angle 
     1431        val = NumVarOrDefault("root:Packages:NIST:gRawUSANSisQvalues", 1 ) 
     1432        Variable/G root:Packages:NIST:gRawUSANSisQvalues=val     
    14331433         
    14341434        /// items for everyone 
     
    14971497End 
    14981498 
    1499 Function UseNICEDataFormat(ctrlName,checked) : CheckBoxControl 
     1499//set the angle->Q conversion factor 
     1500// or set the Q->Q "conversion" factor 
     1501// this is the same value that is set in Init_USANS_Facility() 
     1502// Mar 2019 
     1503Function RawUSANSisQPref(ctrlName,checked) : CheckBoxControl 
    15001504        String ctrlName 
    15011505        Variable checked 
    15021506         
    1503         NVAR gVal = root:Packages:NIST:gUseNICEDataFormat 
     1507        NVAR gVal = root:Packages:NIST:gRawUSANSisQvalues 
    15041508        gVal = checked 
     1509         
     1510        if(checked == 1) 
     1511                Variable/G root:Packages:NIST:USANS:Globals:MainPanel:deg2QConv = 1             //so that the q-values are unchanged 
     1512        else 
     1513                Variable/G root:Packages:NIST:USANS:Globals:MainPanel:deg2QConv=5.55e-5         //JGB -- 2/24/01 
     1514        endif 
    15051515End 
    15061516 
     
    15671577//      GroupBox PrefCtrl_2a pos={21,100},size={1,1},title="nothing to set",fSize=12 
    15681578//      GroupBox PrefCtrl_2a,disable=1 
    1569         CheckBox PrefCtrl_2a,pos={21,100},size={171,14},proc=UseNICEDataFormat,title="Read New NICE data format" 
    1570         CheckBox PrefCtrl_2a,help={"Check this if raw data was collected using NICE. If data was collected using ICP, leave this unchecked."} 
    1571         CheckBox PrefCtrl_2a,value= root:Packages:NIST:gUseNICEDataFormat 
     1579        CheckBox PrefCtrl_2a,pos={21,100},size={171,14},proc=RawUSANSisQPref,title="Raw USANS Data is Q-values" 
     1580        CheckBox PrefCtrl_2a,help={"Check this if raw data was collected using NICE (q-values). If data was collected using ICP (angle), leave this unchecked."} 
     1581        CheckBox PrefCtrl_2a,value= root:Packages:NIST:gRawUSANSisQvalues 
    15721582 
    15731583 
Note: See TracChangeset for help on using the changeset viewer.