Changeset 883a2ef in sasview for sansrealspace/src/realspace/test

Timestamp:

Nov 28, 2007 10:25:16 AM (17 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

aa61e49

Parents:

f980d4a

Message:

Updated according to code review.
Fixed consecutive 2D sims.

Location:

sansrealspace/src/realspace/test

Files:

• cylinder_d=0.5_Iq2D.txt (modified) (1 diff)
• simulation_stimuli.py (modified) (1 diff)
• utest_oriented.py (modified) (1 diff)

sansrealspace/src/realspace/test/cylinder_d=0.5_Iq2D.txt

@@ -1 +1 @@
 PARS: {'scale': 1.0, 'length': 100, 'radius': 20, 'background': 0.0, 'cyl_theta': 1.5707963267948966, 'contrast': 1.0, 'cyl_phi': 1.5707963267948966}
 <q>  <ana>  <sim>  <err>
-0.001  1.25586e+013  1.25584e+013  5.25262e+008
-0.00929167  1.1909e+013  1.19058e+013  1.05064e+010
-0.0175833  1.0341e+013  1.03345e+013  3.12179e+010
-0.025875  8.16205e+012  8.14926e+012  5.17962e+010
-0.0341667  5.77306e+012  5.81045e+012  6.21145e+010
-0.0424583  3.56425e+012  3.55223e+012  5.90114e+010
-0.05075  1.82415e+012  1.80424e+012  4.48859e+010
-0.0590417  6.86403e+011  6.93632e+011  2.71769e+010
-0.0673333  1.26379e+011  1.2136e+011  1.06077e+010
-0.075625  1.69416e+009  1.50569e+009  1.08773e+009
-0.0839167  1.17674e+011  1.24732e+011  9.32509e+009
-0.0922083  2.93262e+011  2.7841e+011  1.38067e+010
-0.1005  4.06932e+011  4.09882e+011  1.72092e+010
-0.108792  4.1248e+011  4.37694e+011  1.84369e+010
-0.117083  3.26735e+011  3.07555e+011  1.59575e+010
-0.125375  2.00372e+011  1.98719e+011  1.30112e+010
-0.133667  8.63351e+010  8.31996e+010  8.33716e+009
-0.141958  1.76833e+010  1.4757e+010  3.47028e+009
-0.15025  2.29778e+008  5.88028e+008  6.83052e+008
-0.158542  1.83678e+010  1.6151e+010  3.56511e+009
-0.166833  4.78555e+010  5.04122e+010  6.33775e+009
-0.175125  6.83196e+010  7.36705e+010  7.69267e+009
-0.183417  7.03999e+010  7.70008e+010  7.86228e+009
-0.191708  5.61199e+010  5.68128e+010  6.74312e+009
-0.2  3.43293e+010  3.12432e+010  4.97778e+009
+0.001  1.25586e+013  1.25584e+013  5.24372e+008
+0.00929167  1.1909e+013  1.19119e+013  1.04128e+010
+0.0175833  1.0341e+013  1.03444e+013  3.11005e+010
+0.025875  8.16205e+012  8.19485e+012  5.13766e+010
+0.0341667  5.77306e+012  5.76297e+012  6.22366e+010
+0.0424583  3.56425e+012  3.54391e+012  5.90911e+010
+0.05075  1.82415e+012  1.8406e+012  4.53958e+010
+0.0590417  6.86403e+011  6.94445e+011  2.73011e+010
+0.0673333  1.26379e+011  1.26541e+011  1.08456e+010
+0.075625  1.69416e+009  1.95158e+009  1.23535e+009
+0.0839167  1.17674e+011  1.26397e+011  9.39118e+009
+0.0922083  2.93262e+011  2.85994e+011  1.40496e+010
+0.1005  4.06932e+011  4.13645e+011  1.72159e+010
+0.108792  4.1248e+011  4.28788e+011  1.82404e+010
+0.117083  3.26735e+011  3.25064e+011  1.63836e+010
+0.125375  2.00372e+011  1.90569e+011  1.27255e+010
+0.133667  8.63351e+010  8.94079e+010  8.63641e+009
+0.141958  1.76833e+010  1.23431e+010  3.16684e+009
+0.15025  2.29778e+008  1.37597e+008  3.31662e+008
+0.158542  1.83678e+010  2.03592e+010  4.03062e+009
+0.166833  4.78555e+010  4.76265e+010  6.15775e+009
+0.175125  6.83196e+010  6.19958e+010  7.01335e+009
+0.183417  7.03999e+010  7.12558e+010  7.51039e+009
+0.191708  5.61199e+010  5.79624e+010  6.79382e+009
+0.2  3.43293e+010  3.93938e+010  5.56512e+009

sansrealspace/src/realspace/test/simulation_stimuli.py

@@ -46 +46 @@
     def setup(self):
         """Setup the canvas for stimuli application"""
-        return VolumeCanvas.VolumeCanvas()
+        volume = VolumeCanvas.VolumeCanvas()
+        volume.params['lores_density'] = 0.05
+        return volume
     
     def getRandomStimulus(self):

sansrealspace/src/realspace/test/utest_oriented.py

@@ -434 +434 @@
             raise sys.exc_type, sys.exc_value
 
-          
+class TestParamChange(unittest.TestCase):
+    """ Tests for oriented (2D) systems """
+        
+    def setUp(self):
+        """ Set up cylinder model """
+        from sans.models.CylinderModel import CylinderModel
+        radius = 5
+        length = 40
+        density = 20
+    
+        # Analytical model
+        self.ana = CylinderModel()
+        self.ana.setParam('scale', 1.0)
+        self.ana.setParam('contrast', 1.0)
+        self.ana.setParam('background', 0.0)
+        self.ana.setParam('radius', radius)
+        self.ana.setParam('length', length)
+        self.ana.setParam('cyl_theta', math.pi/2.0)
+        self.ana.setParam('cyl_phi', math.pi/2.0)
+    
+        # Simulation model
+        self.model = VolumeCanvas.VolumeCanvas()
+        self.handle = self.model.add('cylinder')
+        self.model.setParam('lores_density', density)
+        self.model.setParam('%s.radius' % self.handle, radius)
+        self.model.setParam('%s.length' % self.handle, length)
+        self.model.setParam('scale' , 1.0)
+        self.model.setParam('%s.contrast' % self.handle, 1.0)
+        self.model.setParam('background' , 0.0)
+        self.model.setParam('%s.orientation' % self.handle, [0,0,0])
+    
+    def testalongY(self):
+        """ Test that a parameter change forces the generation
+            of new space points
+        """
+        ana_val = self.ana.runXY([0.1, 0.2])
+        sim_val = self.model.getIq2D(0.1, 0.2)
+        
+        self.assert_( math.fabs(sim_val/ana_val-1.0)<0.05 )
+        
+        # Change the radius a re-evaluate
+        self.ana.setParam('radius', 10)
+        self.model.setParam('%s.radius' % self.handle, 10)
+        
+        ana_val = self.ana.runXY([0.1, 0.2])
+        sim_val = self.model.getIq2D(0.1, 0.2)
+        self.assert_( math.fabs(sim_val/ana_val-1.0)<0.05 )