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/Reduction/USANS/BT5_Loader.ipf

    r1124 r1133  
    9696        endif 
    9797 
    98 // or use the global 
    99 //      NVAR gVal = root:Packages:NIST:gUseNICEDataFormat        
    100 //      useNewDataFormat = gVal 
    101          
    10298         
    10399        USANS_DetectorDeadtime(filedt,MainDeadTime,TransDeadTime) 
     
    188184// !can't return -1,0,1, since these may be the peak angle! 
    189185// 
     186// MAR 2019 
     187// if the data is colleced with NICE, the "angle" is really q-values. 
     188// in this case the returned value is a q-value, and when this shift is applied to the 
     189// nominal (raw) q-values, the peak value is not converted from angle to q 
     190// 
     191// 
    190192Function FindZeroAngle(type) 
    191193        String type 
     
    211213        Endif 
    212214        pkAngle = Angle[pkPt] 
    213         //Print "Peak Angle = ",pkAngle 
     215         
     216        Print "Peak Angle = ",pkAngle 
    214217        //update the note 
    215218        String str="" 
     
    228231// Uses a conversion constant supplied by John Barker, and is hard-wired in 
    229232// 
     233//      Mar 2019 
     234// if the data is collected from NICE, the data is in terms of Q, not angle since the 
     235// conversion factor has already been applied. In this case, the "angle" and pkAngle 
     236// are actually in terms of Q, and the deg2QConv value is set to == 1 
     237// -- then nothing needs to be changed 
     238// 
    230239Function ConvertAngle2Qvals(type,pkAngle) 
    231240        String type 
     
    277286         
    278287        FindLevel/Q/P Qvals,1e-4                //use angles greater than 2 deg = 2*5.55e-5 = 1e-4 (1/A) 
    279         Print "Using Qval, pt = ",V_levelX 
     288//      Print "Using Qval, pt = ",V_levelX 
    280289 
    281290        levNotFound=V_Flag              //V_Flag==1 if no pk found 
Note: See TracChangeset for help on using the changeset viewer.