Ignore:
Timestamp:
Nov 16, 2017 10:57:32 AM (5 years ago)
Author:
srkline
Message:

lots of changes here:
many little fixes to clean up TODO items and marke them DONE

changed the handling of the panel "gap" to split the gap evenly. Q-calculations have been re-verified with this change.

re-named the list of "bin Type" values, and added a few more choices. Streamlined how the averaging and plotting works with this list so that it can be more easily modified as different combinations of binning are envisioned. This resulted in a lot of excess code being cut out and replaced with cleaner logic. This change has also been verified to work as intended.

Attenuation is now always calculated from the table. The table also by (NEW) definition has values for the white beam (one waelength) and graphite (multiple possible wavelengths) where the wavelengths are artificially scaled (*1000) or *1e6) so that the interpolations can be done internally without the need for multiple attenuator tables.

File:
1 edited

Legend:

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

    r1064 r1073  
    3131// this need never change from 1 
    3232Constant kBCTR_CM = 1                   //set to 1 to use beam center in cm. O to use pixels 
     33 
     34// // TODO: -- replace this constant with V_getDet_panel_gap(fname,detStr) 
    3335Constant kPanelTouchingGap = 10                 // TODO -- measure this gap when panels "touch", UNITS OF mm, not cm 
    3436 
     
    4648 
    4749// for defining which "bin type" corresponds to which set of extensions for I(q) data 
     50// !! see V_BinTypeStr2Num() for the numbering, not the order of the list 
     51// 
    4852////////////////// 
    49 Strconstant ksBinTypeStr = "One;Two;Four;Slit Mode;" 
    50 Strconstant ksBinType1 = "B;FT;FB;FL;FR;MT;MB;ML;MR;"           //these are the "active" extensions 
    51 Strconstant ksBinType2 = "B;FTB;FLR;MTB;MLR;" 
    52 Strconstant ksBinType3 = "B;FLRTB;MLRTB;" 
    53 Strconstant ksBinType4 = "B;FT;FB;FL;FR;MT;MB;ML;MR;" 
     53//Strconstant ksBinTypeStr = "One;Two;Four;Slit Mode;" 
     54Strconstant ksBinTypeStr = "F4-M4-B;F2-M2-B;F1-M1-B;F2-M1-B;F1-M2xTB-B;F2-M2xTB-B;SLIT-F2-M2-B;" 
     55Strconstant ksBinType1 = "FT;FB;FL;FR;MT;MB;ML;MR;B;"           //these are the "active" extensions 
     56Strconstant ksBinType2 = "FTB;FLR;MTB;MLR;B;" 
     57Strconstant ksBinType3 = "FLRTB;MLRTB;B;" 
     58//Strconstant ksBinType4 = "FT;FB;FL;FR;MT;MB;ML;MR;B;" 
     59Strconstant ksBinType4 = "FL;FR;ML;MR;B;"               //in SLIT mode 
     60Strconstant ksBinType5 = "FTB;FLR;MLRTB;B;" 
     61Strconstant ksBinType6 = "FLRTB;MLR;B;" 
     62Strconstant ksBinType7 = "FTB;FLR;MLR;B;" 
    5463/////////////////// 
    5564 
Note: See TracChangeset for help on using the changeset viewer.