Changeset 980


Ignore:
Timestamp:
Feb 12, 2016 2:41:12 PM (7 years ago)
Author:
srkline
Message:

more minor changes

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

Legend:

Unmodified
Added
Removed

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/Nexus_VSANS_Write.ipf

    r979 r980  
    209209// file header. nothing more is needed (possibly) 
    210210// 
    211 // TODO -- I want to re-visit the propogation of errors in the DIV file. No errors are ever calculated/saved  
     211// TODO -- I want to re-visit the propagation of errors in the DIV file. No errors are ever calculated/saved  
    212212//   during the generation of the file, but there's no reason it couldn't. the idea is that the plex 
    213213//   is counted so long that the errors are insignificant compared to the data errors, but that may not 
    … …  
    216216// 
    217217// TODO -- make the number of pixels GLOBAL 
     218// TODO -- there will be lots of work to do to develop the procedures necessary to actually generate the  
     219//      9 data sets to become the DIV file contents. More complexity here than for the simple SANS case. 
    218220// 
    219221Proc H_Setup_VSANS_DIV_Structure() 
    … …  
    226228                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument           
    227229                        Make/O/T/N=1    name    = "NG3_VSANS" 
    228                 NewDataFolder/O/S root:VSANS_DIV_file:entry:data_B               
     230                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_B        
    229231                        Make/O/D/N=(320,320)    data    = abs(gnoise(p+q)) 
    230                         Make/O/D/N=(320,320)    error   = 0.01*abs(gnoise(p+q)) 
    231                 NewDataFolder/O/S root:VSANS_DIV_file:entry:data_MR              
    232                         Make/O/D/N=(48,256)     data    = abs(gnoise(p+q)) 
    233                         Make/O/D/N=(48,256)     error   = 0.01*abs(gnoise(p+q)) 
    234                 NewDataFolder/O/S root:VSANS_DIV_file:entry:data_ML              
    235                         Make/O/D/N=(48,256)     data    = abs(gnoise(p+q)) 
    236                         Make/O/D/N=(48,256)     error   = 0.01*abs(gnoise(p+q)) 
    237                 NewDataFolder/O/S root:VSANS_DIV_file:entry:data_MT              
    238                         Make/O/D/N=(128,48)     data    = abs(gnoise(p+q)) 
    239                         Make/O/D/N=(128,48)     error   = 0.01*abs(gnoise(p+q)) 
    240                 NewDataFolder/O/S root:VSANS_DIV_file:entry:data_MB              
    241                         Make/O/D/N=(128,48)     data    = abs(gnoise(p+q)) 
    242                         Make/O/D/N=(128,48)     error   = 0.01*abs(gnoise(p+q)) 
    243                 NewDataFolder/O/S root:VSANS_DIV_file:entry:data_FR              
    244                         Make/O/D/N=(48,256)     data    = abs(gnoise(p+q)) 
    245                         Make/O/D/N=(48,256)     error   = 0.01*abs(gnoise(p+q)) 
    246                 NewDataFolder/O/S root:VSANS_DIV_file:entry:data_FL              
    247                         Make/O/D/N=(48,256)     data    = abs(gnoise(p+q)) 
    248                         Make/O/D/N=(48,256)     error   = 0.01*abs(gnoise(p+q)) 
    249                 NewDataFolder/O/S root:VSANS_DIV_file:entry:data_FT              
    250                         Make/O/D/N=(128,48)     data    = abs(gnoise(p+q)) 
    251                         Make/O/D/N=(128,48)     error   = 0.01*abs(gnoise(p+q)) 
    252                 NewDataFolder/O/S root:VSANS_DIV_file:entry:data_FB              
    253                         Make/O/D/N=(128,48)     data    = abs(gnoise(p+q)) 
    254                         Make/O/D/N=(128,48)     error   = 0.01*abs(gnoise(p+q)) 
     232                        Make/O/D/N=(320,320)    linear_data_error       = 0.01*abs(gnoise(p+q)) 
     233                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_MR               
     234                        Make/O/D/N=(48,128)     data    = abs(gnoise(p+q)) 
     235                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(p+q)) 
     236                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_ML               
     237                        Make/O/D/N=(48,128)     data    = abs(gnoise(p+q)) 
     238                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(p+q)) 
     239                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_MT               
     240                        Make/O/D/N=(128,48)     data    = abs(gnoise(p+q)) 
     241                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(p+q)) 
     242                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_MB               
     243                        Make/O/D/N=(128,48)     data    = abs(gnoise(p+q)) 
     244                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(p+q)) 
     245                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_FR               
     246                        Make/O/D/N=(48,128)     data    = abs(gnoise(p+q)) 
     247                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(p+q)) 
     248                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_FL               
     249                        Make/O/D/N=(48,128)     data    = abs(gnoise(p+q)) 
     250                        Make/O/D/N=(48,128)     linear_data_error       = 0.01*abs(gnoise(p+q)) 
     251                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_FT               
     252                        Make/O/D/N=(128,48)     data    = abs(gnoise(p+q)) 
     253                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(p+q)) 
     254                NewDataFolder/O/S root:VSANS_DIV_file:entry:instrument:detector_FB               
     255                        Make/O/D/N=(128,48)     data    = abs(gnoise(p+q)) 
     256                        Make/O/D/N=(128,48)     linear_data_error       = 0.01*abs(gnoise(p+q)) 
    255257                         
    256258        SetDataFolder root: 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

    r979 r980  
    2222 
    2323 
     24// passing null file string presents a dialog 
     25Proc LoadFakeDIVData() 
     26        V_LoadHDF5Data("","DIV") 
     27End 
    2428 
    2529// passing null file string presents a dialog 
    … …  
    3034 
    3135// TODO: 
    32 //  x- move the initializtion of the raw data folder to be in the as-yet unwritten initialization routine for 
     36//  x- move the initialization of the raw data folder to be in the as-yet unwritten initialization routine for 
    3337// reduction. be sure that it's duplicated in the VCALC initialization too. 
    3438// -- as needed, get rid of the FAKE redimension of the data from 3D->2D and from 128x128 to something else for VSANS 
    3539//    This is a fake since I don't have anything close to correct fake data yet. (1/29/16) 
     40// 
     41// TODO: -- is there an extra "entry" heading? Am I adding this by mistake by setting base_name="entry" for RAW data? 
    3642// 
    3743Function V_LoadHDF5Data(file,folder) 
    … …  
    4450                base_name="entry" 
    4551        else 
    46                 base_name="" 
     52                base_name="entry"               //TODO -- remove this / change behavior in V_LoadHDF5_NoAtt() 
    4753        endif 
    4854         
    … …  
    8490                SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_B 
    8591                Wave det_B=data 
    86                 Redimension/N=(300,300)/E=1 det_B 
    87                  
    88                 Variable ctr=20,npix=100 
     92                Redimension/N=(320,320)/E=1 det_B 
     93                 
     94                Variable ctr=20,npix=128 
    8995                SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_MT 
    9096                Wave det_MT=data 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Initialize.ipf

    r971 r980  
    109109        NewDataFolder/O root:Packages:NIST:VSANS:SUB 
    110110        NewDataFolder/O root:Packages:NIST:VSANS:DRK 
     111        NewDataFolder/O root:Packages:NIST:VSANS:ADJ 
    111112 
    112113 

  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_WorkFolderUtils.ipf

    r979 r980  
    294294 
    295295 
    296  
    297 // 
    298 //Entry procedure from main panel 
    299 // 
    300 Proc AddFolder(oldType,newType) 
    301         String oldType,newType 
    302         Prompt oldType,"Source WORK data type",popup,"SAM;EMP;BGD;DIV;COR;CAL;RAW;ABS;STO;SUB;DRK;" 
    303         Prompt newType,"Destination WORK data type",popup,"SAM;EMP;BGD;DIV;COR;CAL;RAW;ABS;STO;SUB;DRK;" 
    304  
    305         // data folder "RAW" will be copied to "new" (either kills/copies or will overwrite) 
    306         Variable        err = Raw_to_work(newType) 
    307 //      CopyHDFToWorkFolder(oldtype,newtype) 
    308 End 
    309  
    310  
    311  
    312296//testing procedure 
     297// TODO -- can't duplicate this with another proceudre, but if I change the name of the variable 
     298//   "newType" to "type", then when Raw_to_work() gets to CopyHDFToWorkFolder(), the KillDataFolder/Z 
     299//   line fails (but reports no error), then DuplicateDataFolder fails, and reports an error. Trying 
     300//   to simplify this condition, I can't duplicate the error for WM... 
    313301Proc Add_to_Workfile(newtype, doadd) 
    314302        String newtype,doadd 
Note: See TracChangeset for help on using the changeset viewer.