Changeset 278

Timestamp:

Feb 19, 2008 12:30:43 PM (15 years ago)

Author:

srkline

Message:

changed variable name in hsStruct calculation to avoid conflict with new Igor function (beta)

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/HardSphereStruct_v40.ipf (modified) (3 diffs)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/HardSphereStruct_v40.ipf

@@ -75 +75 @@
 
 // Local variables
-        Variable denom,dnum,alpha,beta,gamm,q,a,asq,ath,afor,rca,rsa
+        Variable denom,dnum,alpha,fbeta,gamm,q,a,asq,ath,afor,rca,rsa
         Variable calp,cbeta,cgam,prefac,c,vstruc
 //  COMPUTE CONSTANTS
@@ -82 +82 @@
       DNUM = (1.0 + 2.0*PHI)^2
       ALPHA = DNUM/DENOM
-      BETA = -6.0*PHI*((1.0 + PHI/2.0)^2)/DENOM
+      fBETA = -6.0*PHI*((1.0 + PHI/2.0)^2)/DENOM
       GAMM = 0.50*PHI*DNUM/DENOM
 //
@@ -98 +98 @@
         RSA = SIN(A)
         CALP = ALPHA*(RSA/ASQ - RCA/A)
-        CBETA = BETA*(2.0*RSA/ASQ - (ASQ - 2.0)*RCA/ATH - 2.0/ATH)
+        CBETA = fBETA*(2.0*RSA/ASQ - (ASQ - 2.0)*RCA/ATH - 2.0/ATH)
         CGAM = GAMM*(-RCA/A + (4.0/A)*((3.0*ASQ - 6.0)*RCA/AFOR + (ASQ - 6.0)*RSA/ATH + 6.0/AFOR))
         PREFAC = -24.0*PHI/A