Ignore:
Timestamp:
Jun 14, 2018 12:18:24 PM (4 years ago)
Author:
srkline
Message:

Added functions to check that files in a protocol, including the sample data are all from the same configuration. In SANS, the only flag was a beam center mismatch. In VSANS, a more complete check of the configuration in necessary.

Changed all instances of calls to the read and normalize the monitor count to use the "norm"al monitor, not the value listed in the Control block.

File:
1 edited

Legend:

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

    r1055 r1106  
    291291        //get relative monitor counts (should all be 10^8, since normalized in add step) 
    292292        // get transmission and trans error for SAM, EMP 
    293         // TODO -- verify that the  call to V_getMonitorCount() is really rescaled to 10^8, and saved is the "true" count 
    294  
    295         tmonsam = V_getMonitorCount("SAM")              //monitor count in SAM 
     293        // TODO -- verify that the  call to V_getBeamMonNormData() is really rescaled to 10^8, and saved is the "true" count 
     294 
     295        tmonsam = V_getBeamMonNormData("SAM")           //monitor count in SAM 
    296296        tsam = V_getSampleTransmission("SAM")           //SAM transmission 
    297297        sam_trans_err = V_getSampleTransError("SAM") 
    298298         
    299         tmonemp = V_getMonitorCount("EMP")              //monitor count in EMP 
     299        tmonemp = V_getBeamMonNormData("EMP")           //monitor count in EMP 
    300300        temp = V_getSampleTransmission("EMP")                   //trans emp 
    301301        emp_trans_err = V_getSampleTransError("EMP") 
    302302         
    303         tmonbgd = V_getMonitorCount("BGD")              //monitor count in BGD 
     303        tmonbgd = V_getBeamMonNormData("BGD")           //monitor count in BGD 
    304304 
    305305 
     
    437437        //get relative monitor counts (should all be 10^8, since normalized in add step) 
    438438        // get transmission and trans error for SAM, EMP 
    439         // TODO -- verify that the  call to V_getMonitorCount() is really rescaled to 10^8, and saved is the "true" count 
    440  
    441         tmonsam = V_getMonitorCount("SAM")              //monitor count in SAM 
     439        // TODO -- verify that the  call to V_getBeamMonNormData() is really rescaled to 10^8, and saved is the "true" count 
     440 
     441        tmonsam = V_getBeamMonNormData("SAM")           //monitor count in SAM 
    442442        tsam = V_getSampleTransmission("SAM")           //SAM transmission 
    443443        sam_trans_err = V_getSampleTransError("SAM") 
    444444         
    445         tmonbgd = V_getMonitorCount("BGD")              //monitor count in BGD 
     445        tmonbgd = V_getBeamMonNormData("BGD")           //monitor count in BGD 
    446446 
    447447 
     
    548548        //get relative monitor counts (should all be 10^8, since normalized in add step) 
    549549        // get transmission and trans error for SAM, EMP 
    550         // TODO -- verify that the  call to V_getMonitorCount() is really rescaled to 10^8, and saved is the "true" count 
    551  
    552         tmonsam = V_getMonitorCount("SAM")              //monitor count in SAM 
     550        // TODO -- verify that the  call to V_getBeamMonNormData() is really rescaled to 10^8, and saved is the "true" count 
     551 
     552        tmonsam = V_getBeamMonNormData("SAM")           //monitor count in SAM 
    553553        tsam = V_getSampleTransmission("SAM")           //SAM transmission 
    554554        sam_trans_err = V_getSampleTransError("SAM") 
    555555         
    556         tmonemp = V_getMonitorCount("EMP")              //monitor count in EMP 
     556        tmonemp = V_getBeamMonNormData("EMP")           //monitor count in EMP 
    557557        temp = V_getSampleTransmission("EMP")                   //trans emp 
    558558        emp_trans_err = V_getSampleTransError("EMP") 
     
    707707        //get relative monitor counts (should all be 10^8, since normalized in add step) 
    708708        // get transmission and trans error for SAM, EMP 
    709         // TODO -- verify that the  call to V_getMonitorCount() is really rescaled to 10^8, and saved is the "true" count 
    710          
    711         tmonsam = V_getMonitorCount("SAM")              //monitor count in SAM 
     709        // TODO -- verify that the  call to V_getBeamMonNormData() is really rescaled to 10^8, and saved is the "true" count 
     710         
     711        tmonsam = V_getBeamMonNormData("SAM")           //monitor count in SAM 
    712712        tsam = V_getSampleTransmission("SAM")           //SAM transmission 
    713713        sam_trans_err = V_getSampleTransError("SAM") 
    714714         
    715         tmonemp = V_getMonitorCount("EMP")              //monitor count in EMP 
     715        tmonemp = V_getBeamMonNormData("EMP")           //monitor count in EMP 
    716716        temp = V_getSampleTransmission("EMP")                   //trans emp 
    717717        emp_trans_err = V_getSampleTransError("EMP") 
    718718         
    719         tmonbgd = V_getMonitorCount("BGD")              //monitor count in BGD 
     719        tmonbgd = V_getBeamMonNormData("BGD")           //monitor count in BGD 
    720720 
    721721        // for proper scaling, get the time and actual monitor counts 
     
    870870        //get relative monitor counts (should all be 10^8, since normalized in add step) 
    871871        // get transmission and trans error for SAM, EMP 
    872         // TODO -- verify that the  call to V_getMonitorCount() is really rescaled to 10^8, and saved is the "true" count 
    873          
    874         tmonsam = V_getMonitorCount("SAM")              //monitor count in SAM 
     872        // TODO -- verify that the  call to V_getBeamMonNormData() is really rescaled to 10^8, and saved is the "true" count 
     873         
     874        tmonsam = V_getBeamMonNormData("SAM")           //monitor count in SAM 
    875875        tsam = V_getSampleTransmission("SAM")           //SAM transmission 
    876876        sam_trans_err = V_getSampleTransError("SAM") 
    877877         
    878         tmonbgd = V_getMonitorCount("BGD")              //monitor count in BGD 
     878        tmonbgd = V_getBeamMonNormData("BGD")           //monitor count in BGD 
    879879 
    880880        // for proper scaling, get the time and actual monitor counts 
     
    10011001        //get relative monitor counts (should all be 10^8, since normalized in add step) 
    10021002        // get transmission and trans error for SAM, EMP 
    1003         // TODO -- verify that the  call to V_getMonitorCount() is really rescaled to 10^8, and saved is the "true" count 
    1004          
    1005         tmonsam = V_getMonitorCount("SAM")              //monitor count in SAM 
     1003        // TODO -- verify that the  call to V_getBeamMonNormData() is really rescaled to 10^8, and saved is the "true" count 
     1004         
     1005        tmonsam = V_getBeamMonNormData("SAM")           //monitor count in SAM 
    10061006        tsam = V_getSampleTransmission("SAM")           //SAM transmission 
    10071007        sam_trans_err = V_getSampleTransError("SAM") 
    10081008         
    1009         tmonemp = V_getMonitorCount("EMP")              //monitor count in EMP 
     1009        tmonemp = V_getBeamMonNormData("EMP")           //monitor count in EMP 
    10101010        temp = V_getSampleTransmission("EMP")                   //trans emp 
    10111011        emp_trans_err = V_getSampleTransError("EMP") 
     
    11321132        //get relative monitor counts (should all be 10^8, since normalized in add step) 
    11331133        // get transmission and trans error for SAM, EMP 
    1134         // TODO -- verify that the  call to V_getMonitorCount() is really rescaled to 10^8, and saved is the "true" count 
    1135          
    1136         tmonsam = V_getMonitorCount("SAM")              //monitor count in SAM 
     1134        // TODO -- verify that the  call to V_getBeamMonNormData() is really rescaled to 10^8, and saved is the "true" count 
     1135         
     1136        tmonsam = V_getBeamMonNormData("SAM")           //monitor count in SAM 
    11371137        tsam = V_getSampleTransmission("SAM")           //SAM transmission 
    11381138        sam_trans_err = V_getSampleTransError("SAM") 
Note: See TracChangeset for help on using the changeset viewer.