Changeset cfbcb6a in sasview

Timestamp:

Oct 8, 2009 4:47:31 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

515cc389

Parents:

a99a29ac

Message:

change check for volume

File:

• DataLoader/invariant.py (modified) (4 diffs)

DataLoader/invariant.py

@@ -130 +130 @@
             
                 q_star= 2*(pi*contrast)**2* volume( 1- volume)
-                for k = q_star/(2*(pi*|contrast|)**2)
+                for k = 10^(8)*q_star/(2*(pi*|contrast|)**2)
                 we get 2 values of volume:
                      volume1 = (1- sqrt(1- 4*k))/2
                      volume2 = (1+ sqrt(1- 4*k))/2
-                    
+                contrast unit is 1/A^(2)= 10^(16)cm^(2)
+                q_star unit  1/A^(3)*1/cm
+                
             the result returned will be 0<= volume <= 1 or None
             
@@ -140 +142 @@
             @return None : if the invariant Calculator does not a computed
             q_star already  stored
+            @note: volume fraction must have no unit
         """
         if contrast ==None:
@@ -154 +157 @@
        
         #compute intermediate constant
-        k =  self.q_star /(2*(math.pi* math.fabs(float(contrast)))**2)
+        k =  1.e-8*self.q_star /(2*(math.pi* math.fabs(float(contrast)))**2)
         #check discriminant value
         discrim= 1 - 4*k
@@ -168 +171 @@
             print "volume1",volume1
             print "volume2",volume2
-            if 0<= volume1<= 1:
+           
+            if 0<= volume1 and volume1 <= 1:
                 return volume1
-            elif 0<= volume2<= 1: 
+            elif 0<= volume2 and volume2<= 1: 
                 return volume2 
             return