Ignore:
Timestamp:
Jun 8, 2017 1:27:07 PM (5 years ago)
Author:
srkline
Message:

Significant changes to the base READ of individual data fields from data files. Now, if the field requested is from a WORK file, and it does not exist, an error condition is returned (or a null wave). Calling procedures are responsible for handling errors. This prevents a string of open file dialogs if fields are missing from a file if they were never in the file to begin with (like sensor logs, polarization hardware, etc.)

New get/write calls were added for the updated temperature sensor fields.

group_ID is now only in the sample block, not the duplicated in the reduction block, and is correctly a number not a string.

File:
1 edited

Legend:

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

    r1035 r1044  
    124124// NOTE -- use V_CleanupData_w_Progress(0,1) to get a progress bar - since this will take more than 
    125125//     a few seconds to complete, especially if a file catalog was done, or a "batch" patching, etc. 
     126// 
     127// *** this appears to be unused, in favor of V_CleanupData_w_Progress(0,1)  ********** 
    126128// 
    127129Function V_CleanOutRawVSANS() 
     
    493495 
    494496        // TODO 
    495         // -- update the 1D plotting as needed. these are SANS calls (OK for now, but will need to be better) 
     497        // x- update the 1D plotting as needed. these are SANS calls (OK for now, but will need to be better) 
    496498        //do the average and plot (either the default, or what is on the panel currently) 
    497499        SVAR type = root:Packages:NIST:VSANS:Globals:gCurDispType 
     
    642644End 
    643645 
    644 // TODO -- need to fill in correctly by determining this from the INTENT field 
     646// TODO x- need to fill in correctly by determining this from the INTENT field 
    645647// 
    646648Function V_isTransFile(fname) 
     
    650652        String testStr="" 
    651653         
    652 //      testStr = V_getInstrumentName(fname) 
    653  
    654         if(cmpstr(testStr,"NG3-VSANS") == 0)            //wrong test 
    655                 //testStr exists, ASSUMING it's a raw VSANS data file 
     654        testStr = V_getReduction_intent(fname) 
     655 
     656        if(cmpstr(testStr,"TRANSMISSION") == 0)         // 
     657                //yes, a transmission file 
    656658                Return(1) 
    657659        else 
    658                 //some other file 
     660                //some other file intent 
    659661                Return(0) 
    660662        Endif 
Note: See TracChangeset for help on using the changeset viewer.