Ignore:
Timestamp:
Feb 19, 2016 4:37:30 PM (7 years ago)
Author:
srkline
Message:

more changes, filling in functionality of the initial data correction

File:
1 edited

Legend:

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

    r980 r981  
    2323 
    2424// passing null file string presents a dialog 
    25 Proc LoadFakeDIVData() 
     25Macro LoadFakeDIVData() 
    2626        V_LoadHDF5Data("","DIV") 
    2727End 
     
    7171// TODO -- once I get "real" data, get rid of this call to force the data to be proper dimensions. 
    7272                V_RedimFakeData() 
    73                  
     73// 
     74// TODO -- for the "real" data, may need a step in here to convert integer detector data to DP, or I'll 
     75//          get really odd results from the calculations, and may not even notice. 
     76 
     77// TODO 
     78//  -- get rid of these fake calibration waves as "real" ones are filled in 
     79                Execute "MakeFakeCalibrationWaves()" 
     80//              fMakeFakeCalibrationWaves()             //skips the alert 
     81                 
     82                                 
    7483/// END FAKE DATA CORRECTIONS            
    7584                 
     
    91100                Wave det_B=data 
    92101                Redimension/N=(320,320)/E=1 det_B 
     102                det_B = p+q+2 
    93103                 
    94104                Variable ctr=20,npix=128 
     
    151161                SetScale/I y -npix/2,npix/2,"",det_FR 
    152162 
     163// get rid of zeros 
     164                det_FL += 2 
     165                det_FR += 2 
     166                det_FT += 2 
     167                det_FB += 2 
    153168 
    154169        return(0) 
     
    161176// Attributes are NOT loaded at all. 
    162177// 
    163 // TODO: remove the P=home restriction top make this more generic 
     178// TODO:  
     179// -x remove the P=home restriction top make this more generic (replaced with catPathName from PickPath) 
    164180// -- get rid of bits leftover here that I don't need 
    165181// -- be sure I'm using all of the correct flags in the HDF5LoadGroup operation 
     
    179195 
    180196        Variable fileID = 0 
    181         HDF5OpenFile/R/P=home/Z fileID as fileName              //read file from home directory? 
    182 //      HDF5OpenFile/R/P=catPathName/Z fileID as fileName 
     197//      HDF5OpenFile/R/P=home/Z fileID as fileName              //read file from home directory? 
     198        HDF5OpenFile/R/P=catPathName/Z fileID as fileName 
    183199        if (V_Flag != 0) 
    184200                return 0 
     
    432448// -- do I need to write separate functions for real, integer, etc.? 
    433449//       
    434 // -- change the /P=home to the user-defined data path (which may be home)               
     450// -x change the /P=home to the user-defined data path (catPathName)             
    435451// 
    436452Function V_WriteWaveToHDF(fname, groupName, varName, wav) 
     
    443459         
    444460        try      
    445                 HDF5OpenFile/P=home /Z fileID  as fname  //open file read-write 
     461                HDF5OpenFile/P=catPathName /Z fileID  as fname  //open file read-write 
    446462                if(!fileID) 
    447463                        err = 1 
     
    518534// TODO 
    519535// 
    520 // -- change the /P=home to the user-defined data path (which may be home)               
     536// -x change the /P=home to the user-defined data path (catPathName)             
    521537// 
    522538Function V_WriteTextWaveToHDF(fname, groupName, varName, wav) 
     
    529545         
    530546        try      
    531                 HDF5OpenFile/P=home /Z fileID  as fname  //open file read-write 
     547                HDF5OpenFile/P=catPathName /Z fileID  as fname  //open file read-write 
    532548                if(!fileID) 
    533549                        err = 1 
Note: See TracChangeset for help on using the changeset viewer.