Changeset 639 for sans/Dev/trunk/NCNR_User_Procedures

Timestamp:

Mar 12, 2010 5:00:04 PM (13 years ago)

Author:

srkline

Message:

Corrections to the documentation for the invariant, no real changes to the ipf file - I made some changes but took them back out.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

@@ -48 +48 @@
 Macro PrintModelInvariant(delta_rho,phi)
         Variable delta_rho=3e-6,phi=0.1
+        Prompt delta_rho,"Contrast (1/A^2)"
+        Prompt phi,"Volume fraction"
+        
         // delta_rho [=] 1/A^2
         Variable inv
+
         inv = 2*pi*pi*delta_rho*delta_rho*phi*(1-phi)*1e8
         
@@ -60 +64 @@
 Macro SolveForVolumeFraction(invariant,delta_rho)
         Variable invariant,delta_rho=6e-6
+        Prompt invariant,"Invariant [=] cm^-1 A^-3"
+        Prompt delta_rho,"Contrast (1/A^2)"
+        
         // delta_rho [=] 1/A^2
         Variable phi1,phi2,arg
-        
         arg = 1 - 4*invariant*(1e-8)/2/pi/pi/delta_rho/delta_rho
         phi1 = (1 - sqrt(arg))/2
         phi2 = (1 + sqrt(arg))/2
-        
         Printf "The two solutions for phi are: %8.6f\t and %8.6f\r\r",phi1,phi2
+
+        
 End