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.

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

Legend:

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

    r985 r992  
    3131///// 
    3232/// to get "useable" data out of the 3D wave (incorrectly written) 
    33 //              Redimension/N=(1,320,320)       root:V_Nexus_Template:entry:entry1:instrument:detector_B:data    
    34 //              root:V_Nexus_Template:entry:entry1:instrument:detector_B:data[0][][] = root:Packages:NIST:VSANS:VCALC:Back:det_B[q][r] 
    35 //              root:V_Nexus_Template:entry:entry1:instrument:detector_B:distance = VCALC_getSDD("B") 
     33//              Redimension/N=(1,320,320)       root:V_Nexus_Template:entry1:instrument:detector_B:data  
     34//              root:V_Nexus_Template:entry1:instrument:detector_B:data[0][][] = root:Packages:NIST:VSANS:VCALC:Back:det_B[q][r] 
     35//              root:V_Nexus_Template:entry1:instrument:detector_B:distance = VCALC_getSDD("B") 
    3636 
    3737 
     
    5959 
    6060 
    61         root:V_Nexus_Template:entry:entry1:instrument:beam:monochromator:wavelength = VCALC_getWavelength() 
     61        root:V_Nexus_Template:entry1:instrument:beam:monochromator:wavelength = VCALC_getWavelength() 
    6262                                 
    6363//                      SetDataFolder root:VSANS_file:entry1:instrument          
     
    7575                                         
    7676 
    77                 Redimension/N=(1,150,150)       root:V_Nexus_Template:entry:entry1:instrument:detector_B:data    
    78                 root:V_Nexus_Template:entry:entry1:instrument:detector_B:data[0][][] = root:Packages:NIST:VSANS:VCALC:Back:det_B[q][r] 
    79                 root:V_Nexus_Template:entry:entry1:instrument:detector_B:distance = VCALC_getSDD("B") 
     77                Redimension/N=(1,150,150)       root:V_Nexus_Template:entry1:instrument:detector_B:data  
     78                root:V_Nexus_Template:entry1:instrument:detector_B:data[0][][] = root:Packages:NIST:VSANS:VCALC:Back:det_B[q][r] 
     79                root:V_Nexus_Template:entry1:instrument:detector_B:distance = VCALC_getSDD("B") 
    8080 
    8181// 
  • 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 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Q.ipf

    r985 r992  
    5757 
    5858        String folderPath = "root:Packages:NIST:VSANS:"+folderStr 
    59         String instPath = ":entry:entry:instrument:detector_"    
     59        String instPath = ":entry:instrument:detector_"  
    6060 
    6161        detStr = "FL" 
     
    123123 
    124124        String folderPath = "root:Packages:NIST:VSANS:VCALC" 
    125         String instPath = ":entry:entry:instrument:detector_" 
     125        String instPath = ":entry:instrument:detector_" 
    126126        String detStr="" 
    127127 
     
    301301 
    302302//detector data 
    303         Wave det = $("root:Packages:NIST:VSANS:"+folderStr+":entry:entry:instrument:detector_"+type+":det_"+type) 
     303        Wave det = $("root:Packages:NIST:VSANS:"+folderStr+":entry:instrument:detector_"+type+":det_"+type) 
    304304 
    305305// TODO - these are to be set from globals, not hard-wired 
     
    335335Function FrontPanels_AsQ() 
    336336 
    337         String frontStr = "root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:" 
     337        String frontStr = "root:Packages:NIST:VSANS:VCALC:entry:instrument:" 
    338338//      SetDataFolder root:Packages:NIST:VSANS:VCALC:Front 
    339339        SetDataFolder $(frontStr+"detector_FB") 
     
    462462 
    463463        String folderPath = "root:Packages:NIST:VSANS:"+folderStr 
    464         String instPath = ":entry:entry:instrument:detector_"    
     464        String instPath = ":entry:instrument:detector_"  
    465465 
    466466        detStr = "ML" 
     
    524524 
    525525        String folderPath = "root:Packages:NIST:VSANS:VCALC" 
    526         String instPath = ":entry:entry:instrument:detector_" 
     526        String instPath = ":entry:instrument:detector_" 
    527527        String detStr="" 
    528528         
     
    683683//      Display /W=(1477,44,1978,517) 
    684684 
    685         String midStr = "root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:" 
     685        String midStr = "root:Packages:NIST:VSANS:VCALC:entry:instrument:" 
    686686//      SetDataFolder root:Packages:NIST:VSANS:VCALC:Middle 
    687687        SetDataFolder $(midStr+"detector_MB") 
     
    916916        // fill the panels with fake sphere scattering data 
    917917        // TODO: am I in the right data folder?? 
    918         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B 
     918        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B 
    919919 
    920920        WAVE det_B = det_B 
     
    962962 
    963963        String folderPath = "root:Packages:NIST:VSANS:VCALC" 
    964         String instPath = ":entry:entry:instrument:detector_" 
     964        String instPath = ":entry:instrument:detector_" 
    965965        String detStr = "" 
    966966         
     
    975975 
    976976//Back detector 
    977 //root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B:qTot_B 
     977//root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B:qTot_B 
    978978        detStr = "B" 
    979979        Wave qTot_B = $(folderPath+instPath+detStr+":qTot_"+detStr)                     // 2D q-values 
     
    10151015//      Display /W=(1477,44,1978,517) 
    10161016 
    1017         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B 
     1017        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B 
    10181018 
    10191019        CheckDisplayed /W=VCALC#Panels_Q det_B 
     
    10791079Window Back_IQ_Graph() : Graph 
    10801080 
    1081         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B 
     1081        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B 
    10821082 
    10831083        Variable binType 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Slit.ipf

    r982 r992  
    4444 
    4545        String folderPath = "root:Packages:NIST:VSANS:"+folderStr 
    46         String instPath = ":entry:entry:instrument:detector_"    
     46        String instPath = ":entry:instrument:detector_"  
    4747         
    4848        if(isVCALC) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Utils.ipf

    r987 r992  
    502502         
    503503        String folderPath = "root:Packages:NIST:VSANS:"+folderStr 
    504         String instPath = ":entry:entry:instrument:detector_" 
     504        String instPath = ":entry:instrument:detector_" 
    505505                 
    506506        if(isVCALC) 
     
    604604 
    605605        String folderPath = "root:Packages:NIST:VSANS:"+folderStr 
    606         String instPath = ":entry:entry:instrument:detector_" 
     606        String instPath = ":entry:instrument:detector_" 
    607607        String detStr 
    608608                 
  • 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 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DataPlotting.ipf

    r984 r992  
    407407        String type 
    408408         
    409         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B 
     409        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B 
    410410 
    411411        Variable binType 
  • 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()" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

    r991 r992  
    5353 
    5454        if(cmpstr(folder,"RAW")==0) 
    55                 base_name="entry" 
    56 //              base_name="RAW"         // this acts as a flag to remove the duplicate "entry" level 
     55//              base_name="entry" 
     56                base_name="RAW"         // this acts as a flag to remove the duplicate "entry" level 
    5757        else 
    5858        // null will use the file name as the top level (above entry) 
     
    6666        // then do any "massaging" needed to redimension, fake values, etc. 
    6767        // 
    68         string tmpStr = "root:Packages:NIST:VSANS:RAW:entry:entry:instrument:"  
     68        string tmpStr = "root:Packages:NIST:VSANS:RAW:entry:instrument:"  
    6969 
    7070        if(cmpstr(folder,"RAW")==0) 
     
    158158         
    159159        // check for fake data in VCALC folder... 
    160         wave/Z tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B:det_B" 
     160        wave/Z tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B:det_B" 
    161161        if(WaveExists(tmpw) == 0) 
    162162                Execute "VCALC_Panel()" 
    163163        endif 
    164164         
    165         SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_B 
     165        SetDataFolder root:Packages:NIST:VSANS:RAW:entry:instrument:detector_B 
    166166        Wave det_B=data 
    167167//      Redimension/N=(150,150)/E=1 det_B        
    168168        Redimension/D det_B 
    169         wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B:det_B" 
     169        wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B:det_B" 
    170170//      det_B=tmpw 
    171171//      det_B += 2 
     
    175175                         
    176176        Variable ctr=20,npix=128 
    177         SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_MT 
     177        SetDataFolder root:Packages:NIST:VSANS:RAW:entry:instrument:detector_MT 
    178178        Wave det_MT=data 
    179179//      Redimension/N=(npix,48)/E=1 det_MT 
     
    183183//      det_MT *= 10 
    184184//      det_MT += 2 
    185         wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MT:det_MT" 
     185        wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_MT:det_MT" 
    186186//      det_MT=tmpw 
    187187//      det_MT += 2 
     
    190190 
    191191         
    192         SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_MB 
     192        SetDataFolder root:Packages:NIST:VSANS:RAW:entry:instrument:detector_MB 
    193193        Wave det_MB=data 
    194194//      Redimension/N=(npix,48)/E=1 det_MB               
     
    198198//      det_MB *= 5 
    199199//      det_MB += 2 
    200         wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MB:det_MB" 
     200        wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_MB:det_MB" 
    201201//      det_MB=tmpw 
    202202//      det_MB += 2 
     
    206206         
    207207        ctr=30 
    208         SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_ML 
     208        SetDataFolder root:Packages:NIST:VSANS:RAW:entry:instrument:detector_ML 
    209209        Wave det_ML=data 
    210210//      Redimension/N=(48,npix)/E=1 det_ML               
     
    214214//      det_ML *= 2 
    215215//      det_ML += 2 
    216         wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_ML:det_ML" 
     216        wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_ML:det_ML" 
    217217//      det_ML=tmpw 
    218218//      det_ML += 2 
     
    221221 
    222222                 
    223         SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_MR 
     223        SetDataFolder root:Packages:NIST:VSANS:RAW:entry:instrument:detector_MR 
    224224        Wave det_MR=data 
    225225//      Redimension/N=(48,npix)/E=1 det_MR               
     
    228228        SetScale/I y -npix/2,npix/2,"",det_MR 
    229229//      det_MR +=2 
    230         wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MR:det_MR" 
     230        wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_MR:det_MR" 
    231231//      det_MR=tmpw 
    232232//      det_MR += 2 
     
    236236         
    237237        ctr=30 
    238         SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FT 
     238        SetDataFolder root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FT 
    239239        Wave det_FT=data 
    240240//      Redimension/N=(npix,48)/E=1 det_FT               
     
    242242        SetScale/I x -npix/2,npix/2,"",det_FT 
    243243        SetScale/I y ctr,ctr+48,"",det_FT 
    244         wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FT:det_FT" 
     244        wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FT:det_FT" 
    245245//      det_FT=tmpw 
    246246        Wave distance=distance 
     
    248248 
    249249 
    250         SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FB 
     250        SetDataFolder root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FB 
    251251        Wave det_FB=data 
    252252//      Redimension/N=(npix,48)/E=1 det_FB               
     
    254254        SetScale/I x -npix/2,npix/2,"",det_FB 
    255255        SetScale/I y -ctr-48,-ctr,"",det_FB 
    256         wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FB:det_FB" 
     256        wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FB:det_FB" 
    257257//      det_FB=tmpw 
    258258        Wave distance=distance 
     
    260260 
    261261                         
    262         SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FL 
     262        SetDataFolder root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FL 
    263263        Wave det_FL=data 
    264264//      Redimension/N=(48,npix)/E=1 det_FL               
     
    266266        SetScale/I x -ctr-48,-ctr,"",det_FL 
    267267        SetScale/I y -npix/2,npix/2,"",det_FL 
    268         wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FL:det_FL" 
     268        wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FL:det_FL" 
    269269//      det_FL=tmpw 
    270270        Wave distance=distance 
     
    272272 
    273273         
    274         SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FR 
     274        SetDataFolder root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FR 
    275275        Wave det_FR=data 
    276276//      Redimension/N=(48,npix)/E=1 det_FR               
     
    278278        SetScale/I x ctr,ctr+48,"",det_FR 
    279279        SetScale/I y -npix/2,npix/2,"",det_FR 
    280         wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FR:det_FR" 
     280        wave tmpw=$"root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_FR:det_FR" 
    281281//      det_FR=tmpw 
    282282        Wave distance=distance 
     
    421421// currently, the work folders have the following path - so passing in "RAW" as fname 
    422422// will take some re-configuring.  
    423 //  root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FL:distance 
     423//  root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FL:distance 
    424424// -- be sure this read from work folders is not broken in the future, and is passed to ALL of the 
    425425//    top-level R/W routines. (Write is necessary ONLY for SIM data files. Patch is direct to disk.) 
     
    432432        folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
    433433 
    434 // check for a work folder first (note that "entry" is doubled) 
    435         if(Exists("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path)) 
    436                 Wave/Z w = $("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path) 
     434// check for a work folder first (note that "entry" is now NOT doubled) 
     435        if(Exists("root:Packages:NIST:VSANS:"+folderStr+":"+path)) 
     436                Wave/Z w = $("root:Packages:NIST:VSANS:"+folderStr+":"+path) 
    437437                return(w[0]) 
    438438        endif 
     
    477477        folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
    478478 
    479 // check for a work folder first (note that "entry" is doubled) 
    480         if(Exists("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path)) 
    481                 Wave wOut = $("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path) 
     479// check for a work folder first (note that "entry" is NOT doubled) 
     480        if(Exists("root:Packages:NIST:VSANS:"+folderStr+":"+path)) 
     481                Wave wOut = $("root:Packages:NIST:VSANS:"+folderStr+":"+path) 
    482482                return wOut 
    483483        endif 
     
    519519        folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
    520520 
    521 // check for a work folder first (note that "entry" is doubled) 
    522         if(Exists("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path)) 
    523                 Wave/T wOut = $("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path) 
     521// check for a work folder first (note that "entry" is NOT doubled) 
     522        if(Exists("root:Packages:NIST:VSANS:"+folderStr+":"+path)) 
     523                Wave/T wOut = $("root:Packages:NIST:VSANS:"+folderStr+":"+path) 
    524524                return wOut 
    525525        endif 
     
    589589        folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
    590590 
    591 // check for a work folder first (note that "entry" is doubled) 
    592         if(Exists("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path)) 
    593                 Wave/Z/T tw = $("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path) 
     591// check for a work folder first (note that "entry" is NOT doubled) 
     592        if(Exists("root:Packages:NIST:VSANS:"+folderStr+":"+path)) 
     593                Wave/Z/T tw = $("root:Packages:NIST:VSANS:"+folderStr+":"+path) 
    594594                return(tw[0]) 
    595595        endif 
     
    652652        String folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
    653653         
    654         String localPath = "root:Packages:NIST:VSANS:"+folderStr+":entry" 
     654        String localPath = "root:Packages:NIST:VSANS:"+folderStr//+":entry" 
    655655        localPath += groupName + "/" + varName 
    656656        // make everything colons for local data folders 
     
    758758        String folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
    759759         
    760         String localPath = "root:Packages:NIST:VSANS:"+folderStr+":entry" 
     760        String localPath = "root:Packages:NIST:VSANS:"+folderStr//+":entry" 
    761761        localPath += groupName + "/" + varName 
    762762        // make everything colons for local data folders 
     
    892892        for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1) 
    893893                detStr = StringFromList(ii, ksDetectorListAll, ";") 
    894                 Duplicate/O $("root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_"+detStr+":det_"+detStr) tmpData 
     894                Duplicate/O $("root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_"+detStr+":det_"+detStr) tmpData 
    895895                Redimension/I tmpData 
    896896                tmpData = (tmpData ==   2147483647) ? 0 : tmpData               //the NaN "mask" in the sim data (T/B only)shows up as an ugly integer 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_Write.ipf

    r990 r992  
    36163616        Variable val 
    36173617 
    3618 //root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FB:beam_center_x 
    3619         String path = "root:Packages:NIST:VSANS:"+fname+":entry:" 
     3618//root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FB:beam_center_x 
     3619        String path = "root:Packages:NIST:VSANS:"+fname+":" 
    36203620        path += "entry:instrument:detector_"+detStr+":beam_center_x" 
    36213621         
     
    36613661        Variable val 
    36623662 
    3663 //root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FB:beam_center_y 
    3664         String path = "root:Packages:NIST:VSANS:"+fname+":entry:" 
     3663//root:Packages:NIST:VSANS:RAW:entry:instrument:detector_FB:beam_center_y 
     3664        String path = "root:Packages:NIST:VSANS:"+fname+":" 
    36653665        path += "entry:instrument:detector_"+detStr+":beam_center_y" 
    36663666         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Initialize.ipf

    r987 r992  
    134134         
    135135        Variable/G root:Packages:NIST:VSANS:Globals:gIsLogScale = 0 
    136         String/G root:Packages:NIST:VSANS:Globals:gDataDisplayType = "RAW" 
     136        String/G root:Packages:NIST:VSANS:Globals:gCurDispType = "RAW" 
    137137         
    138138        //check platform, so Angstrom can be drawn correctly 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Test_RAW_Panel.ipf

    r987 r992  
    349349// -- What can I do about this? 
    350350                                        String destPath = "root:Packages:NIST:VSANS:"+gCurDispType 
    351                                         Wave data_realDistX = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistX") 
    352                                         Wave data_realDistY = $(destPath + ":entry:entry:instrument:detector_"+detStr+":data_realDistY")         
     351                                        Wave data_realDistX = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistX") 
     352                                        Wave data_realDistY = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistY")       
    353353                                         
    354354// TODO: figure out what coordinates I need to pass -- xloc, yloc, textX, testY, (+1 on any?)                            
     
    430430                                endif 
    431431                                 
    432                                 SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:entry:instrument:detector_B") 
     432                                SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:instrument:detector_B") 
    433433                                Wave det_B=data 
    434434                                 
     
    462462                                endif 
    463463 
    464                                 SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:entry:instrument:detector_ML") 
     464                                SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:instrument:detector_ML") 
    465465                                Wave det_ML=data                                 
    466                                 SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:entry:instrument:detector_MR") 
     466                                SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:instrument:detector_MR") 
    467467                                Wave det_MR=data 
    468                                 SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:entry:instrument:detector_MT") 
     468                                SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:instrument:detector_MT") 
    469469                                Wave det_MT=data 
    470                                 SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:entry:instrument:detector_MB") 
     470                                SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:instrument:detector_MB") 
    471471                                Wave det_MB=data 
    472472 
     
    509509                                endif 
    510510 
    511                                 SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:entry:instrument:detector_FL") 
     511                                SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:instrument:detector_FL") 
    512512                                Wave det_FL=data 
    513                                 SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:entry:instrument:detector_FR") 
     513                                SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:instrument:detector_FR") 
    514514                                Wave det_FR=data 
    515                                 SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:entry:instrument:detector_FT") 
     515                                SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:instrument:detector_FT") 
    516516                                Wave det_FT=data                                 
    517                                 SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:entry:instrument:detector_FB") 
     517                                SetDataFolder $("root:Packages:NIST:VSANS:"+dataType+":entry:instrument:detector_FB") 
    518518                                Wave det_FB=data 
    519519                                                                 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_WorkFolderUtils.ipf

    r987 r992  
    1111// - adding RAW data to a workfile 
    1212// -- **this conversion applies the detector corrections** 
     13// -- Raw_to_work(newType) IS THE MAJOR ROUTINE TO APPLY DETECTOR CORRECTIONS 
     14// 
    1315// 
    1416// - copying workfiles to another folder 
     
    8385                //   DAS_logs 
    8486                //   top-level copies of data (duplicate links) 
    85                 KillDataFolder/Z $(toDF+":entry:entry:DAS_logs") 
    86                 KillDataFolder/Z $(toDF+":entry:entry:data") 
    87                 KillDataFolder/Z $(toDF+":entry:entry:data_B") 
    88                 KillDataFolder/Z $(toDF+":entry:entry:data_ML") 
    89                 KillDataFolder/Z $(toDF+":entry:entry:data_MR") 
    90                 KillDataFolder/Z $(toDF+":entry:entry:data_MT") 
    91                 KillDataFolder/Z $(toDF+":entry:entry:data_MB") 
    92                 KillDataFolder/Z $(toDF+":entry:entry:data_FL") 
    93                 KillDataFolder/Z $(toDF+":entry:entry:data_FR") 
    94                 KillDataFolder/Z $(toDF+":entry:entry:data_FT") 
    95                 KillDataFolder/Z $(toDF+":entry:entry:data_FB") 
     87                KillDataFolder/Z $(toDF+":entry:DAS_logs") 
     88                KillDataFolder/Z $(toDF+":entry:data") 
     89                KillDataFolder/Z $(toDF+":entry:data_B") 
     90                KillDataFolder/Z $(toDF+":entry:data_ML") 
     91                KillDataFolder/Z $(toDF+":entry:data_MR") 
     92                KillDataFolder/Z $(toDF+":entry:data_MT") 
     93                KillDataFolder/Z $(toDF+":entry:data_MB") 
     94                KillDataFolder/Z $(toDF+":entry:data_FL") 
     95                KillDataFolder/Z $(toDF+":entry:data_FR") 
     96                KillDataFolder/Z $(toDF+":entry:data_FT") 
     97                KillDataFolder/Z $(toDF+":entry:data_FB") 
    9698 
    9799                return(0) 
     
    101103                 
    102104                // everything on the top level 
    103                 V_DuplicateDataFolder($(fromDF+":entry:entry"),fromStr,toStr,0,"",0)    //no recursion here 
     105                V_DuplicateDataFolder($(fromDF+":entry"),fromStr,toStr,0,"",0)  //no recursion here 
    104106                // control 
    105                 V_DuplicateDataFolder($(fromDF+":entry:entry:control"),fromStr,toStr,0,"",1)    //yes recursion here 
     107                V_DuplicateDataFolder($(fromDF+":entry:control"),fromStr,toStr,0,"",1)  //yes recursion here 
    106108                // instrument 
    107                 V_DuplicateDataFolder($(fromDF+":entry:entry:instrument"),fromStr,toStr,0,"",1) //yes recursion here 
     109                V_DuplicateDataFolder($(fromDF+":entry:instrument"),fromStr,toStr,0,"",1)       //yes recursion here 
    108110                // reduction 
    109                 V_DuplicateDataFolder($(fromDF+":entry:entry:reduction"),fromStr,toStr,0,"",1)  //yes recursion here 
     111                V_DuplicateDataFolder($(fromDF+":entry:reduction"),fromStr,toStr,0,"",1)        //yes recursion here 
    110112                // sample 
    111                 V_DuplicateDataFolder($(fromDF+":entry:entry:sample"),fromStr,toStr,0,"",1)     //yes recursion here 
     113                V_DuplicateDataFolder($(fromDF+":entry:sample"),fromStr,toStr,0,"",1)   //yes recursion here 
    112114 
    113115        endif    
     
    382384        // TODO 
    383385        // -- currently only redimensioning the data and linear_data_error - What else??? 
    384         // -- ?? some of this is done at load time for RAW data 
     386        // -- ?? some of this is done at load time for RAW data. shouldn't be an issue to re-do the redimension 
    385387        for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1) 
    386388                detStr = StringFromList(ii, ksDetectorListAll, ";") 
     
    469471                        Wave w = V_getDetectorDataW(fname,detStr) 
    470472                        Wave w_err = V_getDetectorDataErrW(fname,detStr) 
    471                         Wave w_dt = V_getDetector_deadtime(fname,detStr) 
     473//                      Wave w_dt = V_getDetector_deadtime(fname,detStr) 
    472474//                      SolidAngleCorrection(fill this in) 
    473475                         
     
    490492                        Wave w = V_getDetectorDataW(fname,detStr) 
    491493                        Wave w_err = V_getDetectorDataErrW(fname,detStr) 
    492                         Wave w_dt = V_getDetector_deadtime(fname,detStr) 
    493 //                      DeadTimeCorrectionTubes(w,w_err,w_dt,ctTime) 
    494                                 //deadtime corrections 
    495 //      itim = integersread[2] 
    496 //      cntrate = sum(data,-inf,inf)/itim               //use sum of detector counts rather than scaler value 
    497 //      //TODO - do correct dead time correction for tubes 
    498 //      deadtime = 1//DetectorDeadtime(textread[3],textread[9],dateAndTimeStr=textRead[1],dtime=realsRead[48])  //pick the correct deadtime 
    499 //      dscale = 1/(1-deadTime*cntrate) 
    500 //       
    501          
    502 // dead time correction 
    503 //      data *= dscale          //deadtime correction for everyone else, including NCNR 
    504 //      data_err *= dscale 
    505  
     494                         
     495                        if(cmpstr(detStr,"B") == 0) 
     496                                Variable b_dt = V_getDetector_deadtime_B(fname,detStr) 
     497                                // do the correction for the back panel 
     498                                 
     499                                //      itim = integersread[2] 
     500                                //      cntrate = sum(data,-inf,inf)/itim               //use sum of detector counts rather than scaler value 
     501                                //      //TODO - do correct dead time correction for tubes 
     502                                //      deadtime = 1//DetectorDeadtime(textread[3],textread[9],dateAndTimeStr=textRead[1],dtime=realsRead[48])  //pick the correct deadtime 
     503                                //      dscale = 1/(1-deadTime*cntrate) 
     504                                //       
     505                                         
     506                                // dead time correction 
     507                                //      data *= dscale          //deadtime correction for everyone else, including NCNR 
     508                                //      data_err *= dscale 
     509                                 
     510                                 
     511                        else 
     512                                Wave w_dt = V_getDetector_deadtime(fname,detStr) 
     513                                // do the corrections for 8 tube panels 
     514                                //                      DeadTimeCorrectionTubes(w,w_err,w_dt,ctTime) 
     515 
     516                        endif 
    506517                endfor 
     518                 
    507519        else 
    508520                Print "Dead Time correction not done" 
    509521        endif    
     522         
    510523         
    511524        // (5) angle-dependent tube shadowing 
     
    525538                        Wave w = V_getDetectorDataW(fname,detStr) 
    526539                        Wave w_err = V_getDetectorDataErrW(fname,detStr) 
    527                         Wave w_dt = V_getDetector_deadtime(fname,detStr) 
    528540//                      TransmissionCorrection(fill this in) 
    529541                         
     
    559571                // save the true monitor counts? save the scaling factor? 
    560572                String path = "entry:instrument:beam_monitor_norm:saved_count" 
    561                 Wave/Z savW = $("root:Packages:NIST:VSANS:"+fname+":entry:"+path) 
     573                Wave/Z savW = $("root:Packages:NIST:VSANS:"+fname+":"+path) 
    562574                savW[0] = scale 
    563575        endfor 
     
    768780        String/G $(destPath + ":fileList") = oldList + newfile 
    769781         
    770         //reset the current displaytype to "newtype" 
    771         String/G root:myGlobals:gDataDisplayType=newType 
     782        //reset the current display type to "newtype" 
     783        SVAR gCurDispType = root:Packages:NIST:VSANS:Globals:gCurDispType 
     784        gCurDispType = newType 
    772785         
    773786        //return to root folder (redundant) 
Note: See TracChangeset for help on using the changeset viewer.