Ignore:
Timestamp:
Apr 15, 2016 4:31:14 PM (6 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/VC_BeamCenter.ipf

    r984 r992  
    5050 
    5151 
    52         duplicate/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FL:det_FL curDispPanel 
     52        duplicate/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FL:det_FL curDispPanel 
    5353        SetScale/P x 0,1, curDispPanel 
    5454        SetScale/P y 0,1, curDispPanel 
     
    190190//                              NVAR VC_pixSize_X = root:Packages:NIST:VSANS:VCALC:gFront_L_pixelX 
    191191//                              NVAR VC_pixSize_Y = root:Packages:NIST:VSANS:VCALC:gFront_L_pixelY 
    192 //      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_"+str+":det_"+str) 
     192//      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_"+str+":det_"+str) 
    193193//                              break 
    194194//                      case "FR": 
     
    251251         
    252252        // if VCALC declare this way     
    253                 wave newW = $("root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_"+str+":det_"+str) 
     253                wave newW = $("root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_"+str+":det_"+str) 
    254254                nPix_X = VC_nPix_X 
    255255                nPix_Y = VC_nPix_Y 
     
    259259        else 
    260260        // TODO: if real data, need new declaration w/ data as the wave name 
    261                 wave newW = $("root:Packages:NIST:VSANS:"+folder+":entry:entry:instrument:detector_"+str+":data") 
     261                wave newW = $("root:Packages:NIST:VSANS:"+folder+":entry:instrument:detector_"+str+":data") 
    262262 
    263263                nPix_X = V_getDet_pixel_num_x(folder,str) 
     
    530530        Variable xCtr,yCtr 
    531531         
    532         Wave w = $("root:Packages:NIST:VSANS:"+folderStr+":entry:entry:instrument:detector_"+detStr+":data") 
     532        Wave w = $("root:Packages:NIST:VSANS:"+folderStr+":entry:instrument:detector_"+detStr+":data") 
    533533         
    534534        Variable nPix = 128 
Note: See TracChangeset for help on using the changeset viewer.