Changeset 62 for sans/Analysis/trunk

Timestamp:

Mar 26, 2007 1:49:49 PM (16 years ago)

Author:

srkline

Message:

scale factor added to final Beaucage model

File:

• sans/Analysis/trunk/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Beaucage.ipf (modified) (8 diffs)

sans/Analysis/trunk/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Beaucage.ipf

@@ -198 +198 @@
         
         Variable ans,erf1,prec=1e-15
-        Variable G1,Rg1,B1,Pow1,bkg
-        
-        G1 = w[0]
-        Rg1 = w[1]
-        B1 = w[2]
-        Pow1 = w[3]
-        bkg = w[4]
+        Variable G1,Rg1,B1,Pow1,bkg,scale
+        
+        scale = w[0]
+        G1 = w[1]
+        Rg1 = w[2]
+        B1 = w[3]
+        Pow1 = w[4]
+        bkg = w[5]
         
         erf1 = erf( (x*Rg1/sqrt(6)) ,prec)
@@ -210 +211 @@
         ans = G1*exp(-x*x*Rg1*Rg1/3)
         ans += B1*(erf1^3/x)^Pow1
+        ans *= scale
         ans += bkg
         
@@ -220 +222 @@
         
         Variable ans,G1,Rg1,B1,G2,Rg2,B2,Pow1,Pow2,bkg
-        Variable erf1,erf2,prec=1e-15
+        Variable erf1,erf2,prec=1e-15,scale
         
         //Rsub = Rs
-        G1 = w[0]       //equivalent to I(0)
-        Rg1 = w[1]
-        B1 = w[2]
-        Pow1 = w[3]
-        G2 = w[4]
-        Rg2 = w[5]
-        B2 = w[6]
-        Pow2 = w[7]
-        bkg = w[8]
+        scale = w[0]
+        G1 = w[1]       //equivalent to I(0)
+        Rg1 = w[2]
+        B1 = w[3]
+        Pow1 = w[4]
+        G2 = w[5]
+        Rg2 = w[6]
+        B2 = w[7]
+        Pow2 = w[8]
+        bkg = w[9]
         
         erf1 = erf( (x*Rg1/sqrt(6)) ,prec)
@@ -241 +244 @@
         ans += G2*exp(-x*x*Rg2*Rg2/3)
         ans += B2*(erf2^3/x)^Pow2
-        
+        ans *= scale
         ans += bkg
         
@@ -254 +257 @@
         Variable ans,G1,Rg1,B1,G2,Rg2,B2,Pow1,Pow2,bkg
         Variable G3,Rg3,B3,Pow3,erf3
-        Variable erf1,erf2,prec=1e-15
+        Variable erf1,erf2,prec=1e-15,scale
         
         //Rsub = Rs
-        G1 = w[0]       //equivalent to I(0)
-        Rg1 = w[1]
-        B1 = w[2]
-        Pow1 = w[3]
-        G2 = w[4]
-        Rg2 = w[5]
-        B2 = w[6]
-        Pow2 = w[7]
-        G3 = w[8]
-        Rg3 = w[9]
-        B3 = w[10]
-        Pow3 = w[11]
-        bkg = w[12]
+        scale = w[0]
+        G1 = w[1]       //equivalent to I(0)
+        Rg1 = w[2]
+        B1 = w[3]
+        Pow1 = w[4]
+        G2 = w[5]
+        Rg2 = w[6]
+        B2 = w[7]
+        Pow2 = w[8]
+        G3 = w[9]
+        Rg3 = w[10]
+        B3 = w[11]
+        Pow3 = w[12]
+        bkg = w[13]
         
         erf1 = erf( (x*Rg1/sqrt(6)) ,prec)
@@ -279 +283 @@
         ans += G2*exp(-x*x*Rg2*Rg2/3) + B2*exp(-x*x*Rg3*Rg3/3)*(erf2^3/x)^Pow2
         ans += G3*exp(-x*x*Rg3*Rg3/3) + B3*(erf3^3/x)^Pow3
-        
+        ans *= scale
         ans += bkg
         
@@ -292 +296 @@
         Variable G3,Rg3,B3,Pow3,erf3
         Variable G4,Rg4,B4,Pow4,erf4
-        Variable erf1,erf2,prec=1e-15
+        Variable erf1,erf2,prec=1e-15,scale
         
         //Rsub = Rs
-        G1 = w[0]       //equivalent to I(0)
-        Rg1 = w[1]
-        B1 = w[2]
-        Pow1 = w[3]
-        G2 = w[4]
-        Rg2 = w[5]
-        B2 = w[6]
-        Pow2 = w[7]
-        G3 = w[8]
-        Rg3 = w[9]
-        B3 = w[10]
-        Pow3 = w[11]
-        G4 = w[12]
-        Rg4 = w[13]
-        B4 = w[14]
-        Pow4 = w[15]
-        bkg = w[16]
+        scale = w[0]
+        G1 = w[1]       //equivalent to I(0)
+        Rg1 = w[2]
+        B1 = w[3]
+        Pow1 = w[4]
+        G2 = w[5]
+        Rg2 = w[6]
+        B2 = w[7]
+        Pow2 = w[8]
+        G3 = w[9]
+        Rg3 = w[10]
+        B3 = w[11]
+        Pow3 = w[12]
+        G4 = w[13]
+        Rg4 = w[14]
+        B4 = w[15]
+        Pow4 = w[16]
+        bkg = w[17]
         
         erf1 = erf( (x*Rg1/sqrt(6)) ,prec)
@@ -322 +327 @@
         ans += G3*exp(-x*x*Rg3*Rg3/3) + B3*exp(-x*x*Rg4*Rg4/3)*(erf3^3/x)^Pow3
         ans += G4*exp(-x*x*Rg4*Rg4/3) + B4*(erf4^3/x)^Pow4
-        
+        ans *= scale
         ans += bkg