Changeset ac13512 in sasview

Timestamp:

Oct 8, 2009 1:48:32 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:

a99a29ac

Parents:

0a140e8

Message:

working on invariant

Location:

DataLoader

Files:

• invariant.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• test/PolySpheres.txt (added)
• test/utest_invariant.py (added)

DataLoader/invariant.py

@@ -156 +156 @@
         k =  self.q_star /(2*(math.pi* math.fabs(float(contrast)))**2)
         # compute the volume
-        volume = 0.5 *(1 - math.sqrt(1 + 4*k))
-        if 0< volume< 1:
-            return 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 
     

DataLoader/setup.py

@@ -3 +3 @@
 """
 import os, sys
-
+if len(sys.argv) == 1:
+    sys.argv.append('install')
+    
 # Then build and install the modules
 from distutils.core import setup, Extension