Changeset a99a29ac in sasview

Timestamp:

Oct 8, 2009 4:17:44 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:

cfbcb6a

Parents:

ac13512

Message:

compute volume fix for discriminant

File:

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

DataLoader/invariant.py

@@ -104 +104 @@
         if len(data.x)<=1 or len(data.y)<=1 or len(data.x)!=len(data.y)\
                 or len(data.x)!= len(data.dxl):
-            print ""
+           
             msg = "x, dxl, and y must be have the same length and greater than 1"
             raise ValueError,msg
@@ -132 +132 @@
                 for k = 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
+                     volume1 = (1- sqrt(1- 4*k))/2
+                     volume2 = (1+ sqrt(1- 4*k))/2
                     
-            the result returned will be 0<volume <1 or None
+            the result returned will be 0<= volume <= 1 or None
             
             @param contrast: contrast value provides by the user of type float
@@ -155 +155 @@
         #compute intermediate constant
         k =  self.q_star /(2*(math.pi* math.fabs(float(contrast)))**2)
-        # compute the volume
-        volume1 = 0.5 *(1 - math.sqrt(1 + 4*k))
-        volume2 = 0.5 *(1 + math.sqrt(1 + 4*k))
-        print "volume1",volume1
-        print "volume2",volume2
-        print
-        if 0< volume1< 1:
-            return volume1
-        elif 0< volume2< 1: 
-            return volume2 
-        return 
+        #check discriminant value
+        discrim= 1 - 4*k
+        if discrim < 0:
+            return 
+        elif discrim ==0:
+            volume = 1/2
+            return volume
+        else:
+            # compute the volume
+            volume1 = 0.5 *(1 - math.sqrt(discrim))
+            volume2 = 0.5 *(1 + math.sqrt(discrim))
+            print "volume1",volume1
+            print "volume2",volume2
+            if 0<= volume1<= 1:
+                return volume1
+            elif 0<= volume2<= 1: 
+                return volume2 
+            return 
     
     def _getSurface(self, pConst, volume=None):