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/VC_VCALCPanel_MockUp.ipf

    r985 r992  
    648648        NewDataFolder/O root:Packages:NIST:VSANS:VCALC 
    649649                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry 
    650                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry 
    651                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument 
    652                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B 
    653                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MB 
    654                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MT 
    655                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_ML 
    656                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MR 
    657                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FB 
    658                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FT 
    659                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FL 
    660                 NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FR 
     650                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry 
     651                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument 
     652                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B 
     653                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_MB 
     654                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_MT 
     655                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_ML 
     656                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_MR 
     657                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FB 
     658                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FT 
     659                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FL 
     660                NewDataFolder/O root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FR 
    661661 
    662662//      NewDataFolder/O root:Packages:NIST:VSANS:VCALC:Front 
     
    687687         
    688688// detector resolution (xy for each bank!) 
    689         Make/O/D/N=1 :entry:entry:instrument:detector_FL:x_pixel_size = 0.84            // (cm)         these tubes are vertical 8.4 mm x-spacing (JGB 2/2106) 
    690         Make/O/D/N=1 :entry:entry:instrument:detector_FL:y_pixel_size = 0.8             // (cm)         //!! now 8 mm, since nPix=128, rather than 256 
    691         Make/O/D/N=1 :entry:entry:instrument:detector_FR:x_pixel_size = 0.84 
    692         Make/O/D/N=1 :entry:entry:instrument:detector_FR:y_pixel_size = 0.8 
     689        Make/O/D/N=1 :entry:instrument:detector_FL:x_pixel_size = 0.84          // (cm)         these tubes are vertical 8.4 mm x-spacing (JGB 2/2106) 
     690        Make/O/D/N=1 :entry:instrument:detector_FL:y_pixel_size = 0.8           // (cm)         //!! now 8 mm, since nPix=128, rather than 256 
     691        Make/O/D/N=1 :entry:instrument:detector_FR:x_pixel_size = 0.84 
     692        Make/O/D/N=1 :entry:instrument:detector_FR:y_pixel_size = 0.8 
    693693        //T/B 
    694         Make/O/D/N=1 :entry:entry:instrument:detector_FT:x_pixel_size = 0.4             //these tubes are horizontal 
    695         Make/O/D/N=1 :entry:entry:instrument:detector_FT:y_pixel_size = 0.84 
    696         Make/O/D/N=1 :entry:entry:instrument:detector_FB:x_pixel_size = 0.4 
    697         Make/O/D/N=1 :entry:entry:instrument:detector_FB:y_pixel_size = 0.84 
     694        Make/O/D/N=1 :entry:instrument:detector_FT:x_pixel_size = 0.4           //these tubes are horizontal 
     695        Make/O/D/N=1 :entry:instrument:detector_FT:y_pixel_size = 0.84 
     696        Make/O/D/N=1 :entry:instrument:detector_FB:x_pixel_size = 0.4 
     697        Make/O/D/N=1 :entry:instrument:detector_FB:y_pixel_size = 0.84 
    698698         
    699699//      Variable/G gFront_L_pixelX = 0.84                        
     
    708708         
    709709// number of pixels in each bank (this can be modified at acquisition time, so it must be adjustable here) 
    710         Make/O/D/N=1 :entry:entry:instrument:detector_FL:pixel_num_x = 48       // == number of tubes 
    711         Make/O/D/N=1 :entry:entry:instrument:detector_FL:pixel_num_y = 128      // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015) 
    712         Make/O/D/N=1 :entry:entry:instrument:detector_FR:pixel_num_x = 48       // == number of tubes 
    713         Make/O/D/N=1 :entry:entry:instrument:detector_FR:pixel_num_y = 128      // == pixels in vertical direction  
    714         Make/O/D/N=1 :entry:entry:instrument:detector_FT:pixel_num_x = 128      // == pixels in horizontal direction 
    715         Make/O/D/N=1 :entry:entry:instrument:detector_FT:pixel_num_y = 48       // == number of tubes 
    716         Make/O/D/N=1 :entry:entry:instrument:detector_FB:pixel_num_x = 128      // == pixels in horizontal direction 
    717         Make/O/D/N=1 :entry:entry:instrument:detector_FB:pixel_num_y = 48       // == number of tubes 
     710        Make/O/D/N=1 :entry:instrument:detector_FL:pixel_num_x = 48     // == number of tubes 
     711        Make/O/D/N=1 :entry:instrument:detector_FL:pixel_num_y = 128    // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015) 
     712        Make/O/D/N=1 :entry:instrument:detector_FR:pixel_num_x = 48     // == number of tubes 
     713        Make/O/D/N=1 :entry:instrument:detector_FR:pixel_num_y = 128    // == pixels in vertical direction  
     714        Make/O/D/N=1 :entry:instrument:detector_FT:pixel_num_x = 128    // == pixels in horizontal direction 
     715        Make/O/D/N=1 :entry:instrument:detector_FT:pixel_num_y = 48     // == number of tubes 
     716        Make/O/D/N=1 :entry:instrument:detector_FB:pixel_num_x = 128    // == pixels in horizontal direction 
     717        Make/O/D/N=1 :entry:instrument:detector_FB:pixel_num_y = 48     // == number of tubes 
    718718 
    719719//      Variable/G gFront_L_nPix_X = 48         // == number of tubes 
     
    742742         
    743743// detector resolution (xy for each bank!) 
    744         Make/O/D/N=1 :entry:entry:instrument:detector_ML:x_pixel_size = 0.84            // (cm)         these tubes are vertical 8.4 mm x-spacing (JGB 2/2106) 
    745         Make/O/D/N=1 :entry:entry:instrument:detector_ML:y_pixel_size = 0.8             // (cm)         //!! now 8 mm, since nPix=128, rather than 256 
    746         Make/O/D/N=1 :entry:entry:instrument:detector_MR:x_pixel_size = 0.84 
    747         Make/O/D/N=1 :entry:entry:instrument:detector_MR:y_pixel_size = 0.8 
     744        Make/O/D/N=1 :entry:instrument:detector_ML:x_pixel_size = 0.84          // (cm)         these tubes are vertical 8.4 mm x-spacing (JGB 2/2106) 
     745        Make/O/D/N=1 :entry:instrument:detector_ML:y_pixel_size = 0.8           // (cm)         //!! now 8 mm, since nPix=128, rather than 256 
     746        Make/O/D/N=1 :entry:instrument:detector_MR:x_pixel_size = 0.84 
     747        Make/O/D/N=1 :entry:instrument:detector_MR:y_pixel_size = 0.8 
    748748        //T/B 
    749         Make/O/D/N=1 :entry:entry:instrument:detector_MT:x_pixel_size = 0.4             //these tubes are horizontal 
    750         Make/O/D/N=1 :entry:entry:instrument:detector_MT:y_pixel_size = 0.84 
    751         Make/O/D/N=1 :entry:entry:instrument:detector_MB:x_pixel_size = 0.4 
    752         Make/O/D/N=1 :entry:entry:instrument:detector_MB:y_pixel_size = 0.84 
     749        Make/O/D/N=1 :entry:instrument:detector_MT:x_pixel_size = 0.4           //these tubes are horizontal 
     750        Make/O/D/N=1 :entry:instrument:detector_MT:y_pixel_size = 0.84 
     751        Make/O/D/N=1 :entry:instrument:detector_MB:x_pixel_size = 0.4 
     752        Make/O/D/N=1 :entry:instrument:detector_MB:y_pixel_size = 0.84 
    753753 
    754754//      Variable/G gMiddle_L_pixelX = 0.84              // (cm)         these tubes are vertical 
     
    763763 
    764764// number of pixels in each bank (this can be modified at acquisition time, so it must be adjustable here) 
    765         Make/O/D/N=1 :entry:entry:instrument:detector_ML:pixel_num_x = 48       // == number of tubes 
    766         Make/O/D/N=1 :entry:entry:instrument:detector_ML:pixel_num_y = 128      // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015) 
    767         Make/O/D/N=1 :entry:entry:instrument:detector_MR:pixel_num_x = 48       // == number of tubes 
    768         Make/O/D/N=1 :entry:entry:instrument:detector_MR:pixel_num_y = 128      // == pixels in vertical direction  
    769         Make/O/D/N=1 :entry:entry:instrument:detector_MT:pixel_num_x = 128      // == pixels in horizontal direction 
    770         Make/O/D/N=1 :entry:entry:instrument:detector_MT:pixel_num_y = 48       // == number of tubes 
    771         Make/O/D/N=1 :entry:entry:instrument:detector_MB:pixel_num_x = 128      // == pixels in horizontal direction 
    772         Make/O/D/N=1 :entry:entry:instrument:detector_MB:pixel_num_y = 48       // == number of tubes 
     765        Make/O/D/N=1 :entry:instrument:detector_ML:pixel_num_x = 48     // == number of tubes 
     766        Make/O/D/N=1 :entry:instrument:detector_ML:pixel_num_y = 128    // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015) 
     767        Make/O/D/N=1 :entry:instrument:detector_MR:pixel_num_x = 48     // == number of tubes 
     768        Make/O/D/N=1 :entry:instrument:detector_MR:pixel_num_y = 128    // == pixels in vertical direction  
     769        Make/O/D/N=1 :entry:instrument:detector_MT:pixel_num_x = 128    // == pixels in horizontal direction 
     770        Make/O/D/N=1 :entry:instrument:detector_MT:pixel_num_y = 48     // == number of tubes 
     771        Make/O/D/N=1 :entry:instrument:detector_MB:pixel_num_x = 128    // == pixels in horizontal direction 
     772        Make/O/D/N=1 :entry:instrument:detector_MB:pixel_num_y = 48     // == number of tubes 
    773773         
    774774//      Variable/G gMiddle_L_nPix_X = 48                // == number of tubes 
     
    789789        Variable/G gBack_h = 150 
    790790         
    791         Make/O/D/N=1 :entry:entry:instrument:detector_B:x_pixel_size = 0.1              // 1mm resolution (units of cm here) 
    792         Make/O/D/N=1 :entry:entry:instrument:detector_B:y_pixel_size = 0.1               
     791        Make/O/D/N=1 :entry:instrument:detector_B:x_pixel_size = 0.1            // 1mm resolution (units of cm here) 
     792        Make/O/D/N=1 :entry:instrument:detector_B:y_pixel_size = 0.1             
    793793//      Variable/G gBack_pixelX = 0.1            
    794794//      Variable/G gBack_pixelY = 0.1 
    795795 
    796         Make/O/D/N=1 :entry:entry:instrument:detector_B:pixel_num_x = 150       // detector pixels in x-direction 
    797         Make/O/D/N=1 :entry:entry:instrument:detector_B:pixel_num_y = 150 
     796        Make/O/D/N=1 :entry:instrument:detector_B:pixel_num_x = 150     // detector pixels in x-direction 
     797        Make/O/D/N=1 :entry:instrument:detector_B:pixel_num_y = 150 
    798798//      Variable/G gBack_nPix_X = 150            
    799799//      Variable/G gBack_nPix_Y = 150    
     
    806806//      SetDataFolder root:Packages:NIST:VSANS:VCALC:Front 
    807807 
    808         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FL 
     808        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FL 
    809809        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_FL 
    810810        Duplicate/O det_FL qTot_FL,qx_FL,qy_FL,qz_FL 
    811811 
    812         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FR 
     812        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FR 
    813813        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_FR 
    814814        Duplicate/O det_FR qTot_FR,qx_FR,qy_FR,qz_FR 
    815815 
    816         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FT 
     816        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FT 
    817817        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_FT 
    818818        Duplicate/O det_FT qTot_FT,qx_FT,qy_FT,qz_FT 
    819819         
    820         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FB 
     820        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FB 
    821821        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_FB 
    822822        Duplicate/O det_FB qTot_FB,qx_FB,qy_FB,qz_FB 
     
    827827//      SetDataFolder root:Packages:NIST:VSANS:VCALC:Middle 
    828828 
    829         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_ML 
     829        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_ML 
    830830        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_ML 
    831831        Duplicate/O det_ML qTot_ML,qx_ML,qy_ML,qz_ML 
    832832         
    833         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MR 
     833        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_MR 
    834834        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_MR 
    835835        Duplicate/O det_MR qTot_MR,qx_MR,qy_MR,qz_MR 
    836836 
    837         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MT 
     837        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_MT 
    838838        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_MT 
    839839        Duplicate/O det_MT qTot_MT,qx_MT,qy_MT,qz_MT 
    840840         
    841         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MB 
     841        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_MB 
    842842        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_MB 
    843843        Duplicate/O det_MB qTot_MB,qx_MB,qy_MB,qz_MB 
     
    847847//      SetDataFolder root:Packages:NIST:VSANS:VCALC:Back 
    848848 
    849         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B 
     849        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B 
    850850        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_B 
    851851        Duplicate/O det_B qTot_B,qx_B,qy_B,qz_B 
Note: See TracChangeset for help on using the changeset viewer.