Changeset 729 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf

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:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf (modified) (5 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf

@@ -320 +320 @@
 //the scale factor is the return value
 //
-Function GetScalingInOverlap(num2,wave1q,wave1i,wave2q,wave2i)
+Function NCNR_GetScalingInOverlap(num2,wave1q,wave1i,wave2q,wave2i)
         Variable num2           //largest point number of wave2 in overlap region
         Wave wave1q,wave1i,wave2q,wave2i                //1 = first dataset, 2= second dataset
@@ -1021 +1021 @@
                         endif
                         //do auto-scaling of data
-                        norm12 = GetScalingInOverlap(num2,lowq,lowi,medq,medi)
+                        norm12 = NCNR_GetScalingInOverlap(num2,lowq,lowi,medq,medi)
                         //Set the global variable for the 1-2 scale factor
                         Variable/G root:myGlobals:NSORT:gScale1_2 = norm12
@@ -1113 +1113 @@
                         endif
                         //do auto-scaling of data
-                        norm23 = GetScalingInOverlap(num2,q12,i12,highq,highi)
+                        norm23 = NCNR_GetScalingInOverlap(num2,q12,i12,highq,highi)
                         //Set the global variable for the 12 - 3 scale factor
                         Variable/G root:myGlobals:NSORT:gScale2_3 = norm23
@@ -1230 +1230 @@
                         endif
                         //do auto-scaling of data
-                        norm12 = GetScalingInOverlap(num2,lowq,lowi,medq,medi)
+                        norm12 = NCNR_GetScalingInOverlap(num2,lowq,lowi,medq,medi)
                         //Set the global variable for the 1-2 scale factor
                         Variable/G root:myGlobals:NSORT:gScale1_2 = norm12
@@ -1355 +1355 @@
                         endif
                         //do auto-scaling of data
-                        norm23 = GetScalingInOverlap(num2,q12,i12,highq,highi)
+                        norm23 = NCNR_GetScalingInOverlap(num2,q12,i12,highq,highi)
                         //Set the global variable for the 12 - 3 scale factor
                         Variable/G root:myGlobals:NSORT:gScale2_3 = norm23