Changeset 26e4a24 in sasview for sansmodels/src/sans

Timestamp:

Aug 7, 2009 9:24:39 AM (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:

ecc58e72

Parents:

58c6ba6

Message:

reverse previous unittest

Location:

sansmodels/src/sans/models

Files:

• BaseComponent.py (modified) (1 diff)
• DebyeModel.py (modified) (1 diff)
• c_extensions/elliptical_cylinder.h (modified) (1 diff)
• c_models/classTemplate.txt (modified) (1 diff)
• test/utest_dispersity.py (modified) (1 diff)
• test/utest_models.py (modified) (1 diff)
• test/utest_other_dispersity.py (added)

sansmodels/src/sans/models/BaseComponent.py

@@ -72 +72 @@
         q_array = numpy.asarray(qdist)
         iq_array = numpy.zeros(len(q_array))
-        for i in len(q_array):
+        for i in xrange(len(q_array)):
             iq_array[i] = self.runXY(q_array[i])
             

sansmodels/src/sans/models/DebyeModel.py

@@ -64 +64 @@
         # an exception
         y = (x * self.params['rg'])**2.0
-        if y == 0:
-            return 1e+16
+        if x == 0:
+            D=1
         else:
-            D = 2.0*( math.exp(-y) + y -1.0 )/y**2.0
-            return self.params['scale']* D + self.params['background']
+           D = 2.0*( math.exp(-y) + y -1.0 )/y**2.0
+        return self.params['scale']* D + self.params['background']
    
     def run(self, x = 0.0):

sansmodels/src/sans/models/c_extensions/elliptical_cylinder.h

@@ -7 +7 @@
  * [DESCRIPTION] = Please see details...
  * [FIXED]= <text> cyl_phi.width;
- * cyl_theta.width; cyl_psi.width; length.width; r_minor.width; r_ratio.width </text>
+ * cyl_theta.width; cyl_psi.width; length.width; r_minor.width; r_ratio.width 
+ *</text>
  * [ORIENTATION_PARAMS]= cyl_phi; cyl_theta; cyl_psi;  cyl_phi.width; cyl_theta.width; cyl_psi.width
  * */

sansmodels/src/sans/models/c_models/classTemplate.txt

@@ -149 +149 @@
     return PyArray_Return(result); 
  }
-/**
- * Function to call to evaluate model
- * @param args: input numpy array  [q[],phi[]]
- * @return: numpy array object 
- */
-static PyObject * evaluateTwoDim( [CMODEL]* model, 
-                              PyArrayObject *q, PyArrayObject *phi)
- {
-    PyArrayObject *result;
-    //check validity of input vectors
-    if (q->nd != 1 || q->descr->type_num != PyArray_DOUBLE
-        || phi->nd != 1 || phi->descr->type_num != PyArray_DOUBLE
-        || phi->dimensions[0] != q->dimensions[0]){
-     
-        //const char * message= "Invalid array: q->nd=%d,type_num=%d\n",q->nd,q->descr->type_num;
-        PyErr_SetString(PyExc_ValueError ,"wrong input"); 
-        return NULL;
-    }
-        result= (PyArrayObject *)PyArray_FromDims(q->nd,(int*)(q->dimensions), PyArray_DOUBLE);
-
-        if (result == NULL){
-            const char * message= "Could not create result ";
-        PyErr_SetString(PyExc_RuntimeError , message);
-            return NULL;
-        }
-        
-    for (int i = 0; i < q->dimensions[0]; i++) {
-      double q_value = *(double *)(q->data + i*q->strides[0]);
-      double phi_value = *(double *)(phi->data + i*phi->strides[0]);
-      double *result_value = (double *)(result->data + i*result->strides[0]);
-      if (q_value == 0)
-          *result_value = 0.0;
-      else
-          *result_value = model->evaluate_rphi(q_value, phi_value);
-    }
-    return PyArray_Return(result); 
- }
+
  /**
  * Function to call to evaluate model

sansmodels/src/sans/models/test/utest_dispersity.py

@@ -57 +57 @@
         
         new_model = self.model.clone()
-        print "gaussian",self.model.run(0.001)
         self.assertAlmostEqual(new_model.run(0.001), 4723.32213339, 3)
         self.assertAlmostEqual(new_model.runXY([0.001,0.001]), 4743.56, 2)
-        
-    def test_schulz_zero(self):
-        from sans.models.dispersion_models import SchulzDispersion
-        disp = SchulzDispersion()
-        self.model.set_dispersion('radius', disp)
-        self.model.dispersion['radius']['width'] = 5.0
-        #self.model.dispersion['radius']['width'] = 0.0
-        self.model.dispersion['radius']['npts'] = 100
-        #self.model.setParam('scale', 1.0)
-        self.model.setParam('scale', 10.0)
-        print "schulz",self.model.run(0.001), self.model.dispersion
-        self.assertAlmostEqual(self.model.run(0.001), 450.355, 3)
-        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 452.299, 3)
-        
-    def test_lognormal_zero(self):
-        from sans.models.dispersion_models import LogNormalDispersion
-        disp = LogNormalDispersion()
-        self.model.set_dispersion('radius', disp)
-        self.model.dispersion['radius']['width'] = 5.0
-        #self.model.dispersion['radius']['width'] = 0.0
-        self.model.dispersion['radius']['npts'] = 100
-        #self.model.setParam('scale', 1.0)
-        self.model.setParam('scale', 10.0)
-        print "model dispersion",self.model.dispersion
-        print "lognormal",self.model.run(0.001)
-        self.assertAlmostEqual(self.model.run(0.001), 450.355, 3)
-        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 452.299, 3)
         
     def test_gaussian_zero(self):

sansmodels/src/sans/models/test/utest_models.py

@@ -24 +24 @@
     def test1D(self):
         """ Test 1D model for a sphere """
-        self.assertAlmostEqual(self.comp.run(1.0), 5.6387e-5, 4)
+        self.assertAlmostEqual(self.comp.run(1.0), 56.3878, 4)
         
     def test1D_2(self):
         """ Test 2D model for a sphere """
-        self.assertAlmostEqual(self.comp.run([1.0, 1.3]), 5.63878e-5, 4)
+        self.assertAlmostEqual(self.comp.run([1.0, 1.3]), 56.3878, 4)
 
 class TestCyl(unittest.TestCase):