Ignore:
Timestamp:
Apr 15, 2016 4:31:14 PM (7 years ago)
Author:
srkline
Message:

removed the doubled "entry" field from the VSANS file load.

appears now to work fine with R/W routines and with VCALC.

File:
1 edited

Legend:

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

    r984 r992  
    117117        // make a wave of the same dimensions, in the same data folder for the distance 
    118118        // ?? or a 3D wave? 
    119         Make/O/D/N=(dimX,dimY) $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistX") 
    120         Make/O/D/N=(dimX,dimY) $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistY") 
    121         Wave data_realDistX = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistX") 
    122         Wave data_realDistY = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistY") 
     119        Make/O/D/N=(dimX,dimY) $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistX") 
     120        Make/O/D/N=(dimX,dimY) $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistY") 
     121        Wave data_realDistX = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistX") 
     122        Wave data_realDistY = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistY") 
    123123         
    124124        // then per tube, do the quadratic calculation to get the real space distance along the tube 
     
    164164        // make a wave of the same dimensions, in the same data folder for the distance 
    165165        // ?? or a 3D wave? 
    166         Make/O/D/N=(dimX,dimY) $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistX") 
    167         Make/O/D/N=(dimX,dimY) $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistY") 
    168         Wave data_realDistX = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistX") 
    169         Wave data_realDistY = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistY") 
     166        Make/O/D/N=(dimX,dimY) $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistX") 
     167        Make/O/D/N=(dimX,dimY) $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistY") 
     168        Wave data_realDistX = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistX") 
     169        Wave data_realDistY = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistY") 
    170170         
    171171         
     
    197197        String folder,detStr,destPath 
    198198         
    199         Wave data_realDistX = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistX") 
    200         Wave data_realDistY = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistY")         
     199        Wave data_realDistX = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistX") 
     200        Wave data_realDistY = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistY")       
    201201 
    202202        String orientation 
     
    213213        yCtr = V_getDet_beam_center_y(folder,detStr)     
    214214         
    215         Make/O/D/N=1 $(destPath + ":entry:entry:instrument:detector_"+detStr+":beam_center_x_mm") 
    216         Make/O/D/N=1 $(destPath + ":entry:entry:instrument:detector_"+detStr+":beam_center_y_mm") 
    217         WAVE x_mm = $(destPath + ":entry:entry:instrument:detector_"+detStr+":beam_center_x_mm") 
    218         WAVE y_mm = $(destPath + ":entry:entry:instrument:detector_"+detStr+":beam_center_y_mm") 
     215        Make/O/D/N=1 $(destPath + ":entry:instrument:detector_"+detStr+":beam_center_x_mm") 
     216        Make/O/D/N=1 $(destPath + ":entry:instrument:detector_"+detStr+":beam_center_y_mm") 
     217        WAVE x_mm = $(destPath + ":entry:instrument:detector_"+detStr+":beam_center_x_mm") 
     218        WAVE y_mm = $(destPath + ":entry:instrument:detector_"+detStr+":beam_center_y_mm") 
    219219 
    220220        Variable tube_width = V_getDet_tubeWidth(folder,detStr) 
     
    255255        String folder,detStr,destPath 
    256256         
    257         Wave data_realDistX = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistX") 
    258         Wave data_realDistY = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistY")         
     257        Wave data_realDistX = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistX") 
     258        Wave data_realDistY = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistY")       
    259259         
    260260        Variable xCtr,yCtr 
     
    262262        yCtr = V_getDet_beam_center_y(folder,detStr)     
    263263         
    264         Make/O/D/N=1 $(destPath + ":entry:entry:instrument:detector_"+detStr+":beam_center_x_mm") 
    265         Make/O/D/N=1 $(destPath + ":entry:entry:instrument:detector_"+detStr+":beam_center_y_mm") 
    266         WAVE x_mm = $(destPath + ":entry:entry:instrument:detector_"+detStr+":beam_center_x_mm") 
    267         WAVE y_mm = $(destPath + ":entry:entry:instrument:detector_"+detStr+":beam_center_y_mm") 
     264        Make/O/D/N=1 $(destPath + ":entry:instrument:detector_"+detStr+":beam_center_x_mm") 
     265        Make/O/D/N=1 $(destPath + ":entry:instrument:detector_"+detStr+":beam_center_y_mm") 
     266        WAVE x_mm = $(destPath + ":entry:instrument:detector_"+detStr+":beam_center_x_mm") 
     267        WAVE y_mm = $(destPath + ":entry:instrument:detector_"+detStr+":beam_center_y_mm") 
    268268 
    269269        x_mm[0] = data_realDistX[xCtr][0] 
     
    337337                detStr = StringFromList(ii, ksDetectorListNoB, ";") 
    338338//              Wave w = V_getDetectorDataW(fname,detStr) 
    339                 Make/O/D/N=(3,48) $("root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_"+detStr+":spatial_calibration") 
    340                 Wave calib = $("root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_"+detStr+":spatial_calibration") 
     339                Make/O/D/N=(3,48) $("root:Packages:NIST:VSANS:RAW:entry:instrument:detector_"+detStr+":spatial_calibration") 
     340                Wave calib = $("root:Packages:NIST:VSANS:RAW:entry:instrument:detector_"+detStr+":spatial_calibration") 
    341341                // !!!! this overwrites what is there 
    342342 
     
    394394        yCtr = V_getDet_beam_center_y_mm(fname,detStr) 
    395395        lambda = V_getWavelength(fname) 
    396         Wave data_realDistX = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistX") 
    397         Wave data_realDistY = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistY") 
     396        Wave data_realDistX = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistX") 
     397        Wave data_realDistY = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistY") 
    398398 
    399399// make the new waves 
    400         Duplicate/O data_realDistX $(destPath + ":entry:entry:instrument:detector_"+detStr+":qTot_"+detStr) 
    401         Duplicate/O data_realDistX $(destPath + ":entry:entry:instrument:detector_"+detStr+":qx_"+detStr) 
    402         Duplicate/O data_realDistX $(destPath + ":entry:entry:instrument:detector_"+detStr+":qy_"+detStr) 
    403         Duplicate/O data_realDistX $(destPath + ":entry:entry:instrument:detector_"+detStr+":qz_"+detStr) 
    404         Wave qTot = $(destPath + ":entry:entry:instrument:detector_"+detStr+":qTot_"+detStr) 
    405         Wave qx = $(destPath + ":entry:entry:instrument:detector_"+detStr+":qx_"+detStr) 
    406         Wave qy = $(destPath + ":entry:entry:instrument:detector_"+detStr+":qy_"+detStr) 
    407         Wave qz = $(destPath + ":entry:entry:instrument:detector_"+detStr+":qz_"+detStr) 
     400        Duplicate/O data_realDistX $(destPath + ":entry:instrument:detector_"+detStr+":qTot_"+detStr) 
     401        Duplicate/O data_realDistX $(destPath + ":entry:instrument:detector_"+detStr+":qx_"+detStr) 
     402        Duplicate/O data_realDistX $(destPath + ":entry:instrument:detector_"+detStr+":qy_"+detStr) 
     403        Duplicate/O data_realDistX $(destPath + ":entry:instrument:detector_"+detStr+":qz_"+detStr) 
     404        Wave qTot = $(destPath + ":entry:instrument:detector_"+detStr+":qTot_"+detStr) 
     405        Wave qx = $(destPath + ":entry:instrument:detector_"+detStr+":qx_"+detStr) 
     406        Wave qy = $(destPath + ":entry:instrument:detector_"+detStr+":qy_"+detStr) 
     407        Wave qz = $(destPath + ":entry:instrument:detector_"+detStr+":qz_"+detStr) 
    408408 
    409409// calculate all of the q-values 
     
    814814         
    815815        //need to update the display with "data" from the correct dataFolder 
    816         //reset the current displaytype to "type" 
    817         String/G root:myGlobals:gDataDisplayType=Type 
     816        //reset the current display type to "type" 
     817        SVAR gCurDispType = root:Packages:NIST:VSANS:Globals:gCurDispType 
     818        gCurDispType = Type      
    818819         
    819820        fRawWindowHook() 
     
    10501051        // if the DIV workfile doesn't exist, let the user know,and abort 
    10511052 
    1052         WAVE/Z div_data = $("root:Packages:NIST:VSANS:DIV:entry:entry:instrument:detector_"+detStr+":data") 
     1053        WAVE/Z div_data = $("root:Packages:NIST:VSANS:DIV:entry:instrument:detector_"+detStr+":data") 
    10531054        if(WaveExists(div_data) == 0) 
    10541055                Print "The DIV wave does not exist in DIVCorrection()" 
Note: See TracChangeset for help on using the changeset viewer.