Changeset 8c9ffde in sasview for test/sasmodels/test/utest_modelmultiplication.py
- Timestamp:
- Feb 13, 2015 2:01:33 AM (9 years ago)
- 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:
- 35ec279
- Parents:
- 3a39c2e
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
test/sasmodels/test/utest_modelmultiplication.py
r5777106 r8c9ffde 11 11 """ 12 12 def setUp(self): 13 from sa ns.models.SphereModel import SphereModel14 from sa ns.models.SquareWellStructure import SquareWellStructure15 from sa ns.models.DiamCylFunc import DiamCylFunc16 from sa ns.models.MultiplicationModel import MultiplicationModel13 from sas.models.SphereModel import SphereModel 14 from sas.models.SquareWellStructure import SquareWellStructure 15 from sas.models.DiamCylFunc import DiamCylFunc 16 from sas.models.MultiplicationModel import MultiplicationModel 17 17 18 18 self.model = SphereModel() … … 69 69 self.assertEqual(list3, ['radius.npts', 'radius.nsigmas', 'radius.width']) 70 70 71 from sa ns.models.dispersion_models import ArrayDispersion71 from sas.models.dispersion_models import ArrayDispersion 72 72 disp_th = ArrayDispersion() 73 73 … … 94 94 """ 95 95 def setUp(self): 96 from sa ns.models.SphereModel import SphereModel97 from sa ns.models.HardsphereStructure import HardsphereStructure98 from sa ns.models.DiamCylFunc import DiamCylFunc99 from sa ns.models.MultiplicationModel import MultiplicationModel96 from sas.models.SphereModel import SphereModel 97 from sas.models.HardsphereStructure import HardsphereStructure 98 from sas.models.DiamCylFunc import DiamCylFunc 99 from sas.models.MultiplicationModel import MultiplicationModel 100 100 101 101 self.model = SphereModel() … … 152 152 self.assertEqual(list3, ['radius.npts', 'radius.nsigmas', 'radius.width']) 153 153 154 from sa ns.models.dispersion_models import ArrayDispersion154 from sas.models.dispersion_models import ArrayDispersion 155 155 disp_th = ArrayDispersion() 156 156 … … 176 176 """ 177 177 def setUp(self): 178 from sa ns.models.SphereModel import SphereModel179 from sa ns.models.StickyHSStructure import StickyHSStructure180 from sa ns.models.DiamCylFunc import DiamCylFunc181 from sa ns.models.MultiplicationModel import MultiplicationModel178 from sas.models.SphereModel import SphereModel 179 from sas.models.StickyHSStructure import StickyHSStructure 180 from sas.models.DiamCylFunc import DiamCylFunc 181 from sas.models.MultiplicationModel import MultiplicationModel 182 182 183 183 self.model = SphereModel() … … 234 234 self.assertEqual(list3, ['radius.npts', 'radius.nsigmas', 'radius.width']) 235 235 236 from sa ns.models.dispersion_models import ArrayDispersion236 from sas.models.dispersion_models import ArrayDispersion 237 237 disp_th = ArrayDispersion() 238 238 … … 259 259 """ 260 260 def setUp(self): 261 from sa ns.models.SphereModel import SphereModel262 from sa ns.models.HayterMSAStructure import HayterMSAStructure263 from sa ns.models.DiamCylFunc import DiamCylFunc264 from sa ns.models.MultiplicationModel import MultiplicationModel261 from sas.models.SphereModel import SphereModel 262 from sas.models.HayterMSAStructure import HayterMSAStructure 263 from sas.models.DiamCylFunc import DiamCylFunc 264 from sas.models.MultiplicationModel import MultiplicationModel 265 265 266 266 self.model = SphereModel() … … 317 317 self.assertEqual(list3, ['radius.npts', 'radius.nsigmas', 'radius.width']) 318 318 319 from sa ns.models.dispersion_models import ArrayDispersion319 from sas.models.dispersion_models import ArrayDispersion 320 320 disp_th = ArrayDispersion() 321 321 … … 344 344 """ 345 345 def setUp(self): 346 from sa ns.models.CylinderModel import CylinderModel347 from sa ns.models.SquareWellStructure import SquareWellStructure348 from sa ns.models.DiamCylFunc import DiamCylFunc349 from sa ns.models.MultiplicationModel import MultiplicationModel346 from sas.models.CylinderModel import CylinderModel 347 from sas.models.SquareWellStructure import SquareWellStructure 348 from sas.models.DiamCylFunc import DiamCylFunc 349 from sas.models.MultiplicationModel import MultiplicationModel 350 350 351 351 self.model = CylinderModel() … … 405 405 'cyl_phi.npts', 'cyl_phi.nsigmas', 'cyl_phi.width']) 406 406 407 from sa ns.models.dispersion_models import ArrayDispersion407 from sas.models.dispersion_models import ArrayDispersion 408 408 disp_th = ArrayDispersion() 409 409 … … 426 426 """ 427 427 def setUp(self): 428 from sa ns.models.CylinderModel import CylinderModel429 from sa ns.models.HardsphereStructure import HardsphereStructure430 from sa ns.models.DiamCylFunc import DiamCylFunc431 from sa ns.models.MultiplicationModel import MultiplicationModel428 from sas.models.CylinderModel import CylinderModel 429 from sas.models.HardsphereStructure import HardsphereStructure 430 from sas.models.DiamCylFunc import DiamCylFunc 431 from sas.models.MultiplicationModel import MultiplicationModel 432 432 433 433 self.model = CylinderModel() … … 490 490 'cyl_phi.npts', 'cyl_phi.nsigmas', 'cyl_phi.width']) 491 491 492 from sa ns.models.dispersion_models import ArrayDispersion492 from sas.models.dispersion_models import ArrayDispersion 493 493 disp_th = ArrayDispersion() 494 494 … … 511 511 """ 512 512 def setUp(self): 513 from sa ns.models.CylinderModel import CylinderModel514 from sa ns.models.StickyHSStructure import StickyHSStructure515 from sa ns.models.DiamCylFunc import DiamCylFunc516 from sa ns.models.MultiplicationModel import MultiplicationModel513 from sas.models.CylinderModel import CylinderModel 514 from sas.models.StickyHSStructure import StickyHSStructure 515 from sas.models.DiamCylFunc import DiamCylFunc 516 from sas.models.MultiplicationModel import MultiplicationModel 517 517 518 518 self.model = CylinderModel() … … 572 572 'cyl_phi.npts', 'cyl_phi.nsigmas', 'cyl_phi.width']) 573 573 574 from sa ns.models.dispersion_models import ArrayDispersion574 from sas.models.dispersion_models import ArrayDispersion 575 575 disp_th = ArrayDispersion() 576 576 … … 593 593 """ 594 594 def setUp(self): 595 from sa ns.models.CylinderModel import CylinderModel596 from sa ns.models.HayterMSAStructure import HayterMSAStructure597 from sa ns.models.DiamCylFunc import DiamCylFunc598 from sa ns.models.MultiplicationModel import MultiplicationModel595 from sas.models.CylinderModel import CylinderModel 596 from sas.models.HayterMSAStructure import HayterMSAStructure 597 from sas.models.DiamCylFunc import DiamCylFunc 598 from sas.models.MultiplicationModel import MultiplicationModel 599 599 600 600 self.model = CylinderModel() … … 656 656 'cyl_phi.npts', 'cyl_phi.nsigmas', 'cyl_phi.width']) 657 657 658 from sa ns.models.dispersion_models import ArrayDispersion658 from sas.models.dispersion_models import ArrayDispersion 659 659 disp_th = ArrayDispersion() 660 660 … … 677 677 """ 678 678 def setUp(self): 679 from sa ns.models.GuinierModel import GuinierModel680 from sa ns.models.HayterMSAStructure import HayterMSAStructure681 from sa ns.models.MultiplicationModel import MultiplicationModel679 from sas.models.GuinierModel import GuinierModel 680 from sas.models.HayterMSAStructure import HayterMSAStructure 681 from sas.models.MultiplicationModel import MultiplicationModel 682 682 683 683 self.model = GuinierModel() … … 704 704 """ 705 705 def setUp(self): 706 from sa ns.models.LamellarModel import LamellarModel707 from sa ns.models.HayterMSAStructure import HayterMSAStructure708 from sa ns.models.MultiplicationModel import MultiplicationModel706 from sas.models.LamellarModel import LamellarModel 707 from sas.models.HayterMSAStructure import HayterMSAStructure 708 from sas.models.MultiplicationModel import MultiplicationModel 709 709 710 710 self.model = LamellarModel()
Note: See TracChangeset
for help on using the changeset viewer.