Changeset 729 for sans/Dev


Ignore:
Timestamp:
Aug 25, 2010 5:38:53 PM (12 years ago)
Author:
ajj
Message:

Fixing #301 - conflict between motofit and NCNR SANS package fixed by renaming our GetScalingInOverlap? to NCNR_GetScalingInOverlap

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf

    r715 r729  
    320320//the scale factor is the return value 
    321321// 
    322 Function GetScalingInOverlap(num2,wave1q,wave1i,wave2q,wave2i) 
     322Function NCNR_GetScalingInOverlap(num2,wave1q,wave1i,wave2q,wave2i) 
    323323        Variable num2           //largest point number of wave2 in overlap region 
    324324        Wave wave1q,wave1i,wave2q,wave2i                //1 = first dataset, 2= second dataset 
     
    10211021                        endif 
    10221022                        //do auto-scaling of data 
    1023                         norm12 = GetScalingInOverlap(num2,lowq,lowi,medq,medi) 
     1023                        norm12 = NCNR_GetScalingInOverlap(num2,lowq,lowi,medq,medi) 
    10241024                        //Set the global variable for the 1-2 scale factor 
    10251025                        Variable/G root:myGlobals:NSORT:gScale1_2 = norm12 
     
    11131113                        endif 
    11141114                        //do auto-scaling of data 
    1115                         norm23 = GetScalingInOverlap(num2,q12,i12,highq,highi) 
     1115                        norm23 = NCNR_GetScalingInOverlap(num2,q12,i12,highq,highi) 
    11161116                        //Set the global variable for the 12 - 3 scale factor 
    11171117                        Variable/G root:myGlobals:NSORT:gScale2_3 = norm23 
     
    12301230                        endif 
    12311231                        //do auto-scaling of data 
    1232                         norm12 = GetScalingInOverlap(num2,lowq,lowi,medq,medi) 
     1232                        norm12 = NCNR_GetScalingInOverlap(num2,lowq,lowi,medq,medi) 
    12331233                        //Set the global variable for the 1-2 scale factor 
    12341234                        Variable/G root:myGlobals:NSORT:gScale1_2 = norm12 
     
    13551355                        endif 
    13561356                        //do auto-scaling of data 
    1357                         norm23 = GetScalingInOverlap(num2,q12,i12,highq,highi) 
     1357                        norm23 = NCNR_GetScalingInOverlap(num2,q12,i12,highq,highi) 
    13581358                        //Set the global variable for the 12 - 3 scale factor 
    13591359                        Variable/G root:myGlobals:NSORT:gScale2_3 = norm23 
Note: See TracChangeset for help on using the changeset viewer.