Ignore:
Timestamp:
Feb 21, 2017 1:03:50 PM (6 years ago)
Author:
srkline
Message:

minor changes to prefix functions with "V_" to avoid conflicts with non-VSANS functions.

File:
1 edited

Legend:

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

    r975 r1024  
    7070// 
    7171// 
    72 Proc Tubes_to_Array() 
     72Proc V_Tubes_to_Array() 
    7373        Make/O/D/N=(8,1127) pack 
    7474        edit pack 
     
    105105//¥Sort WA_PeakCentersX WA_PeakCentersY,WA_PeakCentersX 
    106106// 
    107 Proc MakeTableForPeaks(numTube,numPeak) 
     107Proc V_MakeTableForPeaks(numTube,numPeak) 
    108108        Variable numTube,numPeak 
    109109         
     
    112112End 
    113113 
    114 Proc Identify_AllPeaks() 
     114Proc V_Identify_AllPeaks() 
    115115 
    116116        Variable ii,numTubes=8 
     
    119119        ii=1 
    120120        do 
    121                 Identify_Peaks(str+num2str(ii),ii-1) 
     121                V_Identify_Peaks(str+num2str(ii),ii-1) 
    122122                ii+=1 
    123123        while(ii<=numTubes) 
     
    125125End 
    126126 
    127 Proc Identify_Peaks(tubeStr,ind) 
     127Proc V_Identify_Peaks(tubeStr,ind) 
    128128        String tubeStr 
    129129        Variable ind 
     
    188188 
    189189 
    190 Proc MakeTableForFitCoefs(numTube,numCoef) 
     190Proc V_MakeTableForFitCoefs(numTube,numCoef) 
    191191        Variable numTube,numCoef 
    192192         
     
    195195End 
    196196 
    197 Proc PlotFit_AllPeaks() 
     197Proc V_PlotFit_AllPeaks() 
    198198 
    199199        Variable ii,numTubes=8 
     
    201201        ii=1 
    202202        do 
    203                 PlotFit_Peaks(ii-1) 
     203                V_PlotFit_Peaks(ii-1) 
    204204                ii+=1 
    205205        while(ii<=numTubes) 
     
    207207End 
    208208 
    209 Proc PlotFit_Peaks(ind) 
     209Proc V_PlotFit_Peaks(ind) 
    210210        Variable ind 
    211211         
     
    267267 
    268268 
    269 Proc Make_mm_tubes() 
     269Proc V_Make_mm_tubes() 
    270270 
    271271        Variable ii,numTubes=8 
     
    281281 
    282282 
    283 Proc Append_Adjusted_mm() 
     283Proc V_Append_Adjusted_mm() 
    284284 
    285285// a blank base image 
     
    315315//////////////////////////////// 
    316316 
    317 Proc MakeMatrix_PixCenter() 
     317Proc V_MakeMatrix_PixCenter() 
    318318        Duplicate/O pack pack_centered 
    319319         
     
    322322        ii=1 
    323323        do 
    324                 FillMatrix_Pix_Center(ii) 
     324                V_FillMatrix_Pix_Center(ii) 
    325325                ii+=1 
    326326        while(ii<=numTubes) 
     
    341341// FindRoots/P=W_coef           can also be used to find the roots (but which one?) 
    342342// 
    343 Function FillMatrix_Pix_Center(ind) 
     343Function V_FillMatrix_Pix_Center(ind) 
    344344        Variable ind 
    345345         
     
    376376// -- OR -- use mm and append each tube with its own y-axis 
    377377// 
    378 Function FillAdjusted(ind) 
     378Function V_FillAdjusted(ind) 
    379379        Variable ind 
    380380         
     
    429429// range of the 1st tube. This is completely arbitrary 
    430430// 
    431 Proc Interpolate_mm_tubes() 
     431Proc V_Interpolate_mm_tubes() 
    432432 
    433433        Duplicate/O pack pack_image 
     
    473473// this doesn't work - the interpolation step doesn't do what I want 
    474474// and the plot of the triplet with f(z) for color doesn't fill space like I want 
    475 Proc AnotherExample() 
     475Proc V_AnotherExample() 
    476476 
    477477        Concatenate/O/NP {tube1_mm,tube2_mm,tube3_mm,tube4_mm,tube5_mm,tube6_mm,tube7_mm,tube8_mm},cat_mm 
     
    513513// Plotting a 2D Z Wave With 1D X and Y Center Data 
    514514// 
    515 Function MakeEdgesWave(centers, edgesWave) 
     515Function V_MakeEdgesWave(centers, edgesWave) 
    516516        Wave centers    // Input 
    517517        Wave edgesWave  // Receives output 
     
    526526 
    527527//This function demonstrates the use of MakeEdgesWave: 
    528 Function DemoPlotXYZAsImage() 
     528Function V_DemoPlotXYZAsImage() 
    529529        Make/O mat={{0,1,2},{2,3,4},{3,4,5}}    // Matrix containing Z values 
    530530        Make/O centersX = {1, 2.5, 5}           // X centers wave 
    531531        Make/O centersY = {300, 400, 600}               // Y centers wave 
    532         Make/O edgesX; MakeEdgesWave(centersX, edgesX)  // Create X edges wave 
    533         Make/O edgesY; MakeEdgesWave(centersY, edgesY)  // Create Y edges wave 
     532        Make/O edgesX; V_MakeEdgesWave(centersX, edgesX)        // Create X edges wave 
     533        Make/O edgesY; V_MakeEdgesWave(centersY, edgesY)        // Create Y edges wave 
    534534        Display; AppendImage mat vs {edgesX,edgesY} 
    535535End 
Note: See TracChangeset for help on using the changeset viewer.