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_BroadPeak_Pix_2D.ipf

    r982 r1024  
    2727// three waves XYZ, then converted to a matrix 
    2828// 
    29 Proc PlotBroadPeak_Pix2D(xDim,yDim)                                              
     29Proc V_PlotBroadPeak_Pix2D(xDim,yDim)                                            
    3030        Variable xDim=48, yDim=128 
    3131        Prompt xDim "Enter X dimension: " 
     
    3939        // generate the triplet representation 
    4040        Make/O/D/N=(xDim*yDim) xwave_PeakPix2D, ywave_PeakPix2D,zwave_PeakPix2D  
    41         FillPixTriplet(xwave_PeakPix2D, ywave_PeakPix2D,zwave_PeakPix2D,xDim,yDim) 
     41        V_FillPixTriplet(xwave_PeakPix2D, ywave_PeakPix2D,zwave_PeakPix2D,xDim,yDim) 
    4242         
    4343         
    4444        Variable/G g_PeakPix2D=0 
    45         g_PeakPix2D := BroadPeak_Pix2D(coef_PeakPix2D,zwave_PeakPix2D,xwave_PeakPix2D,ywave_PeakPix2D)  //AAO 2D calculation 
     45        g_PeakPix2D := V_BroadPeak_Pix2D(coef_PeakPix2D,zwave_PeakPix2D,xwave_PeakPix2D,ywave_PeakPix2D)        //AAO 2D calculation 
    4646         
    4747        Display ywave_PeakPix2D vs xwave_PeakPix2D 
     
    6262        // not a function evaluation - this simply keeps the matrix for display in sync with the triplet calculation 
    6363        Variable/G g_PeakPix2Dmat=0 
    64         g_PeakPix2Dmat := UpdatePix2Mat(xwave_PeakPix2D,ywave_PeakPix2D,zwave_PeakPix2D,PeakPix2D_lin,PeakPix2D_mat) 
     64        g_PeakPix2Dmat := V_UpdatePix2Mat(xwave_PeakPix2D,ywave_PeakPix2D,zwave_PeakPix2D,PeakPix2D_lin,PeakPix2D_mat) 
    6565         
    6666         
     
    6969End 
    7070 
    71 Function FillPixTriplet(xwave_PeakPix2D, ywave_PeakPix2D,zwave_PeakPix2D,xDim,yDim) 
     71Function V_FillPixTriplet(xwave_PeakPix2D, ywave_PeakPix2D,zwave_PeakPix2D,xDim,yDim) 
    7272        Wave xwave_PeakPix2D, ywave_PeakPix2D,zwave_PeakPix2D 
    7373        Variable xDim,yDim 
     
    8888End 
    8989 
    90 Function UpdatePix2Mat(Qx,Qy,inten,linMat,mat) 
     90Function V_UpdatePix2Mat(Qx,Qy,inten,linMat,mat) 
    9191        Wave Qx,Qy,inten,linMat,mat 
    9292         
     
    117117// and the points "2.5" and "3.5" evaluate correctly as 2 and 3 
    118118// 
    119 Function BroadPeak_Pix2D(cw,zw,xw,yw) : FitFunc 
     119Function V_BroadPeak_Pix2D(cw,zw,xw,yw) : FitFunc 
    120120        Wave cw,zw,xw,yw 
    121121         
     
    123123        MultiThread zw = BroadPeak_Pix2DX(cw,xw,yw) 
    124124#else 
    125         MultiThread zw = I_BroadPeak_Pix2D(cw,xw,yw) 
     125        MultiThread zw = V_I_BroadPeak_Pix2D(cw,xw,yw) 
    126126#endif 
    127127         
     
    130130 
    131131//threaded version of the function 
    132 ThreadSafe Function BroadPeak_Pix2D_T(cw,zw,xw,yw,p1,p2) 
     132ThreadSafe Function V_BroadPeak_Pix2D_T(cw,zw,xw,yw,p1,p2) 
    133133        WAVE cw,zw,xw,yw 
    134134        Variable p1,p2 
     
    137137        zw[p1,p2]= BroadPeak_Pix2DX(cw,xw,yw) 
    138138#else 
    139         zw[p1,p2]= I_BroadPeak_Pix2D(cw,xw,yw) 
     139        zw[p1,p2]= V_I_BroadPeak_Pix2D(cw,xw,yw) 
    140140#endif 
    141141 
     
    176176// This is not an XOP, but is correct in what it is passing and speed seems to be just fine. 
    177177// 
    178 ThreadSafe Function I_BroadPeak_Pix2D(w,xw,yw) 
     178ThreadSafe Function V_I_BroadPeak_Pix2D(w,xw,yw) 
    179179//ThreadSafe Function fBroadPeak_Pix2D(w,xw,yw) 
    180180        Wave w 
     
    245245// -- the smearing calculation can only calculate (nord) points at a time. 
    246246// 
    247 ThreadSafe Function BroadPeak_Pix2D_noThread(cw,zw,xw,yw) 
     247ThreadSafe Function V_BroadPeak_Pix2D_noThread(cw,zw,xw,yw) 
    248248        WAVE cw,zw, xw,yw 
    249249         
     
    251251        zw = BroadPeak_Pix2DX(cw,xw,yw) 
    252252#else 
    253         zw = I_BroadPeak_Pix2D(cw,xw,yw) 
     253        zw = V_I_BroadPeak_Pix2D(cw,xw,yw) 
    254254#endif 
    255255 
Note: See TracChangeset for help on using the changeset viewer.