Ignore:
Timestamp:
Jul 14, 2017 3:14:20 PM (5 years ago)
Author:
srkline
Message:

a few quick bug fixes

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

Legend:

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

    r1044 r1053  
    482482         
    483483        //Attenuators 
    484         // TODO -- this is not really the number -- but rather the thickness 
     484        // TODO -- this is the "number" of the attenuator, but what is its relation to the 
     485        //   stack of 4 plates? binary representation? 
    485486        InsertPoints lastPoint,1,GNumAttens 
    486         GNumAttens[lastPoint]=V_getAttenThickness(fname) 
     487        GNumAttens[lastPoint]=V_getAtten_number(fname) 
    487488         
    488489        //Transmission 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

    r1051 r1053  
    516516        // save a global string with the file name to be picked up for the status on the display 
    517517        // this string can be carried around as the data is moved to other folders 
    518         Print curDF+"gFileList" 
     518//      Print curDF+"gFileList" 
    519519        String/G $(curDF+"gFileList") = fileName 
    520520 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_Read.ipf

    r1050 r1053  
    530530//End 
    531531 
    532 //// this is equivalent to "status" - if anything is dropped in the beam 
    533 //Function V_getAtten_number(fname) 
    534 //      String fname 
    535 //       
    536 //      String path = "entry:instrument:attenuator:num_atten_dropped"    
    537 //      return(V_getRealValueFromHDF5(fname,path)) 
    538 //end 
     532//// this is the "number" of attenuators dropped in the beam - and should be  
     533// what I can use to lookup the actual attenuator transmission 
     534Function V_getAtten_number(fname) 
     535        String fname 
     536         
     537        String path = "entry:instrument:attenuator:num_atten_dropped"    
     538        return(V_getRealValueFromHDF5(fname,path)) 
     539end 
    539540 
    540541// thickness of the attenuator (PMMA) - units?? 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Instrument_Resolution.ipf

    r1052 r1053  
    2828 
    2929 
     30// TODO: 
     31// -- some of the input geometry is hidden in other locations: 
     32// Sample Aperture to Gate Valve (cm)  == /instrument/sample_aperture/distance 
     33// Sample [position] to Gate Valve (cm) = /instrument/sample_table/offset_distance 
     34// 
     35// -- the dimensions and the units for the beam stops are very odd, and what is written to the 
     36//   file is not what is noted in the GUI - so verify the units that I'm actually reading. 
     37//  
    3038 
    3139 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_RAW_Data_Panel.ipf

    r1051 r1053  
    663663        endswitch 
    664664 
     665 
     666// update the status when the tab is clicked                     
     667        STRUCT WMButtonAction sa 
     668        sa.eventCode = 2 
     669        V_StatusButtonProc(sa) 
     670                         
     671                         
    665672        return 0 
    666673End 
     
    759766                        V_FakeTabClick(V_Value) 
    760767 
    761 // update the status when the tab is clicked                     
    762                         STRUCT WMButtonAction sa 
    763                         sa.eventCode = 2 
    764                         V_StatusButtonProc(sa) 
     768// now part of every tab click 
     769//// update the status when the tab is clicked                   
     770//                      STRUCT WMButtonAction sa 
     771//                      sa.eventCode = 2 
     772//                      V_StatusButtonProc(sa) 
    765773 
    766774                        break 
Note: See TracChangeset for help on using the changeset viewer.