Changeset 0abf7bf in sasview for sansmodels/test/utest_disperser.py

Timestamp:

Nov 23, 2011 1:16:37 PM (12 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:

26da93f

Parents:

953fe92

Message:

Re #5 Get rid of pyre models, odb creation, and modelfactory, all of which haven't been used since 2007.

File:

• sansmodels/test/utest_disperser.py (modified) (3 diffs)

sansmodels/test/utest_disperser.py

@@ -15 +15 @@
 
 from sans.models.sans_extension.c_models import Disperser
-from sans.models.ModelFactory import ModelFactory
+from sans.models.CylinderModel import CylinderModel
 from sans.models.DisperseModel import DisperseModel
       
@@ -22 +22 @@
     
     def setUp(self):
-        self.model = ModelFactory().getModel("CylinderModel")
+        self.model = CylinderModel()
         self.model.setParam("cyl_theta", 1.57)
         self.model.setParam("cyl_phi", 0.1)
@@ -84 +84 @@
     
     def setUp(self):
-        self.model = ModelFactory().getModel("CylinderModel")
+        self.model = CylinderModel()
         self.model.setParam("cyl_theta", 1.57)
         self.model.setParam("cyl_phi", 0.1)