Changeset 1070


Ignore:
Timestamp:
Oct 6, 2017 12:45:51 PM (5 years ago)
Author:
srkline
Message:

minor changes, fast ways to patch mis-information in the headers has been added to the VSANS menu for easier access.

added comments here and there

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS
Files:
3 edited

Legend:

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

    r1064 r1070  
    773773// 
    774774// 
     775// TODO: 
     776// -- some of the input parameters for the resolution calcuation are either assumed (apOff) or are currently 
     777//    hard-wired. these need to be corrected before even the pinhole resolution is correct 
     778// x- resolution calculation is in the correct place. The calculation is done per-panel (specified by TYPE), 
     779//    and then the unwanted points can be discarded (all 6 columns) as the data is trimmed and concatenated 
     780//    is separate functions that are resolution-aware. 
     781// 
    775782// 
    776783// folderStr = WORK folder, type = the binning type (may include multiple detectors) 
     
    11701177// TODO: 
    11711178// -- the iErr (=2D) wave and accumulation of error is NOT CALCULATED CORRECTLY YET 
    1172 // -- the solid angle per pixel is not completely implemented. 
    1173 //    it will be present for WORK data other than RAW, but not for RAW 
    1174  
     1179// 
     1180// The 1D error does not use iErr, and IS CALCULATED CORRECTLY 
     1181// 
     1182// x- the solid angle per pixel will be present for WORK data other than RAW, but not for RAW 
     1183 
     1184// 
    11751185// if any of the masks don't exist, display the error, and proceed with the averaging, using all data 
    11761186        if(maskMissing == 1) 
     
    13941404         
    13951405// S2 = sample aperture diameter [mm] 
    1396         S2 = V_getSampleAp2_size(folderStr)*10          // sample ap 1 or 2? the "external" may not exist? 
     1406        S2 = V_getSampleAp2_size(folderStr)*10          // sample ap 1 or 2? 2 = the "external", but may not exist? 
    13971407         
    13981408// L1 = source to sample distance [m]  
     
    14001410 
    14011411// L2 = sample to detector distance [m] 
    1402         L2 = V_getDet_ActualDistance(folderStr,type[0]+"L")/100         //TODO "L" panel is hard wired and is WRONG 
     1412// take the first two characters of the "type" to get the correct distance. 
     1413// if the type is say, MLRTB, then the implicit assumption in combining all four panels is that the resolution 
     1414// is not an issue for the slightly different distances. 
     1415        L2 = V_getDet_ActualDistance(folderStr,type[0,1])/100           //convert cm to m 
    14031416         
    14041417// BS = beam stop diameter [mm] 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Menu.ipf

    r1057 r1070  
    4646//              "IgorOnly_Save_SANS_Struct" 
    4747                "Copy_VCALC_to_VSANSFile",Copy_VCALC_to_VSANSFile() 
     48                "Flip Lateral Offset",V_PatchDet_Offset() 
     49                "Patch GroupID using CatTable",V_Patch_GroupID_catTable() 
     50                "Patch Purpose using CatTable",V_Patch_Purpose_catTable() 
     51                "Patch Intent using CatTable",V_Patch_Intent_catTable() 
    4852                "-" 
    4953                "Setup_VSANS_DIV_Struct" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_PatchFiles.ipf

    r1064 r1070  
    23342334 
    23352335 
     2336Proc V_PatchDet_Offset(lo,hi) 
     2337        Variable lo,hi 
     2338         
     2339        V_fPatchDet_Offset(lo,hi) 
     2340End 
     2341 
     2342// V_fReadDet_Offset(lo,hi) 
     2343 
     2344Proc V_Patch_GroupID_catTable() 
     2345        V_fPatch_GroupID_catTable() 
     2346end 
     2347 
     2348Proc V_Patch_Purpose_catTable() 
     2349        V_fPatch_Purpose_catTable() 
     2350end 
     2351 
     2352Proc V_Patch_Intent_catTable() 
     2353        V_fPatch_Intent_catTable() 
     2354end 
     2355 
     2356 
    23362357// simple utility to patch the offset values in the file headers 
    23372358// 
     
    24352456End 
    24362457 
    2437 V_fPatch_GroupID_catTable() 
    2438 V_fPatch_Purpose_catTable() 
    2439 V_fPatch_Intent_catTable() 
    24402458 
    24412459// patches the Purpose, based on whatever is in the catTable 
Note: See TracChangeset for help on using the changeset viewer.