Ignore:
Timestamp:
Jul 12, 2017 2:44:26 PM (5 years ago)
Author:
srkline
Message:

a lot of little changes:

changed the name of the Raw Data display procedure file (removed test)

lots of bug fixes, moving items from the macros menu to proper locations, getting the file status to display properly, some error checking, and cleaning up a few TODO items.

File:
1 edited

Legend:

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

    r1044 r1051  
    7070Proc V_InitProtocolPanel() 
    7171 
     72        if(exists("     root:Packages:NIST:VSANS:CatVSHeaderInfo:Filenames") == 0) 
     73                Abort "You must generate a file catalog before building protocols" 
     74        endif 
     75         
    7276        //set up the global variables needed for the protocol panel 
    7377        //global strings to put in a temporary protocol textwave 
     
    642646                Variable np = numpnts(intentW)          //fileNameW is LONGER - so don't use numpnts(fileWave) 
    643647                for(ii=0;ii<np;ii+=1) 
    644                         if(cmpstr(intentW[ii],testStr)==0) 
     648                        if(cmpstr(intentW[ii],testStr)==0)              //this is case-INSENSITIVE (necessary, since the case is unknown) 
    645649                                list += fileNameW[ii] + ";" 
    646650                        endif            
     
    20082012                        V_LoadHDF5Data(junkStr,"DIV") 
    20092013                Endif 
    2010  
     2014         
     2015        else 
     2016        // DIV step is being skipped 
     2017                NVAR gDoDIVCor = root:Packages:NIST:VSANS:Globals:gDoDIVCor 
     2018                Variable saved_gDoDIVCor = gDoDIVCor 
     2019                gDoDIVCor = 0                   // protocol says to turn it off for now (reset later) 
    20112020        Endif 
    20122021 
     
    20142023// TODO: 
    20152024// -- currently does not allow adding RAW data files together, so no parsing is done 
    2016 //       
     2025//       -- NOTE detector corrections (including DIV) are done at the V_Raw_to_Work() step 
     2026//   So if the DIV is not part of the protocol, be sure to set/reset the global preference 
    20172027// 
    20182028        //prompt for sam data => read raw data, add to sam folder 
     
    25432553         
    25442554        //done with everything in protocol list 
     2555         
     2556         
     2557        // reset any global preferences that I had changed 
     2558        gDoDIVCor = saved_gDoDIVCor 
     2559         
     2560         
    25452561        Return(0) 
    25462562End 
Note: See TracChangeset for help on using the changeset viewer.