Changeset 8c9ffde in sasview for test/sasmodels/test/utest_other_models.py
- Timestamp:
- Feb 13, 2015 4: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_other_models.py
r5777106 r8c9ffde 34 34 35 35 def setUp(self): 36 from sa ns.models.CoreShellModel import CoreShellModel36 from sas.models.CoreShellModel import CoreShellModel 37 37 self.comp = CoreShellModel() 38 38 #Give initial value to model … … 81 81 82 82 def setUp(self): 83 from sa ns.models.MultiShellModel import MultiShellModel83 from sas.models.MultiShellModel import MultiShellModel 84 84 self.comp = MultiShellModel() 85 85 #Give initial value to model … … 128 128 129 129 def setUp(self): 130 from sa ns.models.VesicleModel import VesicleModel130 from sas.models.VesicleModel import VesicleModel 131 131 self.comp = VesicleModel() 132 132 #Give initial value to model … … 174 174 175 175 def setUp(self): 176 from sa ns.models.BinaryHSModel import BinaryHSModel176 from sas.models.BinaryHSModel import BinaryHSModel 177 177 self.comp = BinaryHSModel() 178 178 #Give initial value to model … … 222 222 223 223 def setUp(self): 224 from sa ns.models.CoreShellCylinderModel import CoreShellCylinderModel224 from sas.models.CoreShellCylinderModel import CoreShellCylinderModel 225 225 self.comp = CoreShellCylinderModel() 226 226 #Give initial value to model … … 277 277 278 278 def setUp(self): 279 from sa ns.models.CoreShellCylinderModel import CoreShellCylinderModel280 from sa ns.models.CoreShellBicelleModel import CoreShellBicelleModel279 from sas.models.CoreShellCylinderModel import CoreShellCylinderModel 280 from sas.models.CoreShellBicelleModel import CoreShellBicelleModel 281 281 self.comp1 = CoreShellCylinderModel() 282 282 self.comp2 = CoreShellBicelleModel() … … 297 297 298 298 def setUp(self): 299 from sa ns.models.HollowCylinderModel import HollowCylinderModel299 from sas.models.HollowCylinderModel import HollowCylinderModel 300 300 self.comp = HollowCylinderModel() 301 301 #Give initial value to model … … 350 350 351 351 def setUp(self): 352 from sa ns.models.FlexibleCylinderModel import FlexibleCylinderModel352 from sas.models.FlexibleCylinderModel import FlexibleCylinderModel 353 353 self.comp = FlexibleCylinderModel() 354 354 #Give initial value to model … … 402 402 403 403 def setUp(self): 404 from sa ns.models.FlexCylEllipXModel import FlexCylEllipXModel404 from sas.models.FlexCylEllipXModel import FlexCylEllipXModel 405 405 self.comp = FlexCylEllipXModel() 406 406 #Give initial value to model … … 451 451 452 452 def setUp(self): 453 from sa ns.models.StackedDisksModel import StackedDisksModel453 from sas.models.StackedDisksModel import StackedDisksModel 454 454 self.comp = StackedDisksModel() 455 455 #Give initial value to model … … 510 510 511 511 def setUp(self): 512 from sa ns.models.ParallelepipedModel import ParallelepipedModel512 from sas.models.ParallelepipedModel import ParallelepipedModel 513 513 self.comp = ParallelepipedModel() 514 514 #Give initial value to model … … 564 564 565 565 def setUp(self): 566 from sa ns.models.EllipticalCylinderModel import EllipticalCylinderModel566 from sas.models.EllipticalCylinderModel import EllipticalCylinderModel 567 567 self.comp = EllipticalCylinderModel() 568 568 self.comp.setParam("scale",1.0) … … 620 620 621 621 def setUp(self): 622 from sa ns.models.EllipsoidModel import EllipsoidModel622 from sas.models.EllipsoidModel import EllipsoidModel 623 623 self.comp = EllipsoidModel() 624 624 self.comp.setParam("scale",1.0) … … 672 672 673 673 def setUp(self): 674 from sa ns.models.CoreShellEllipsoidModel import CoreShellEllipsoidModel674 from sas.models.CoreShellEllipsoidModel import CoreShellEllipsoidModel 675 675 self.comp = CoreShellEllipsoidModel() 676 676 #Give initial value to model … … 729 729 730 730 def setUp(self): 731 from sa ns.models.TriaxialEllipsoidModel import TriaxialEllipsoidModel731 from sas.models.TriaxialEllipsoidModel import TriaxialEllipsoidModel 732 732 self.comp = TriaxialEllipsoidModel() 733 733 self.comp.setParam("scale",1.0) … … 785 785 786 786 def setUp(self): 787 from sa ns.models.LamellarModel import LamellarModel787 from sas.models.LamellarModel import LamellarModel 788 788 self.comp = LamellarModel() 789 789 self.comp.setParam("scale",1.0) … … 829 829 830 830 def setUp(self): 831 from sa ns.models.LamellarFFHGModel import LamellarFFHGModel831 from sas.models.LamellarFFHGModel import LamellarFFHGModel 832 832 self.comp = LamellarFFHGModel() 833 833 self.comp.setParam("scale",1.0) … … 876 876 877 877 def setUp(self): 878 from sa ns.models.LamellarPSModel import LamellarPSModel878 from sas.models.LamellarPSModel import LamellarPSModel 879 879 self.comp = LamellarPSModel() 880 880 self.comp.setParam("scale",1.0) … … 924 924 925 925 def setUp(self): 926 from sa ns.models.LamellarPSHGModel import LamellarPSHGModel926 from sas.models.LamellarPSHGModel import LamellarPSHGModel 927 927 self.comp = LamellarPSHGModel() 928 928 self.comp.setParam("scale",1.0) … … 973 973 974 974 def setUp(self): 975 from sa ns.models.SquareWellStructure import SquareWellStructure975 from sas.models.SquareWellStructure import SquareWellStructure 976 976 self.comp = SquareWellStructure() 977 977 self.comp.setParam("effect_radius",50.0) … … 1017 1017 1018 1018 def setUp(self): 1019 from sa ns.models.HardsphereStructure import HardsphereStructure1019 from sas.models.HardsphereStructure import HardsphereStructure 1020 1020 self.comp = HardsphereStructure() 1021 1021 self.comp.setParam("effect_radius",50.0) … … 1058 1058 1059 1059 def setUp(self): 1060 from sa ns.models.StickyHSStructure import StickyHSStructure1060 from sas.models.StickyHSStructure import StickyHSStructure 1061 1061 self.comp = StickyHSStructure() 1062 1062 self.comp.setParam("effect_radius",50.0) … … 1101 1101 1102 1102 def setUp(self): 1103 from sa ns.models.HayterMSAStructure import HayterMSAStructure1103 from sas.models.HayterMSAStructure import HayterMSAStructure 1104 1104 self.comp = HayterMSAStructure() 1105 1105 self.comp.setParam("effect_radius",20.75) … … 1147 1147 1148 1148 def setUp(self): 1149 from sa ns.models.BEPolyelectrolyte import BEPolyelectrolyte1149 from sas.models.BEPolyelectrolyte import BEPolyelectrolyte 1150 1150 self.comp = BEPolyelectrolyte() 1151 1151 … … 1196 1196 1197 1197 def setUp(self): 1198 from sa ns.models.DABModel import DABModel1198 from sas.models.DABModel import DABModel 1199 1199 self.comp = DABModel() 1200 1200 self.comp.setParam('length',40.0) … … 1240 1240 1241 1241 def setUp(self): 1242 from sa ns.models.GuinierModel import GuinierModel1242 from sas.models.GuinierModel import GuinierModel 1243 1243 self.comp = GuinierModel() 1244 1244 self.comp.setParam('scale',1.0) … … 1282 1282 1283 1283 def setUp(self): 1284 from sa ns.models.DebyeModel import DebyeModel1284 from sas.models.DebyeModel import DebyeModel 1285 1285 self.comp = DebyeModel() 1286 1286 self.comp.setParam('rg', 50.0) … … 1325 1325 1326 1326 def setUp(self): 1327 from sa ns.models.PorodModel import PorodModel1327 from sas.models.PorodModel import PorodModel 1328 1328 self.comp = PorodModel() 1329 1329 self.comp.setParam('scale', 1.0) … … 1367 1367 1368 1368 def setUp(self): 1369 from sa ns.models.PeakGaussModel import PeakGaussModel1369 from sas.models.PeakGaussModel import PeakGaussModel 1370 1370 self.comp = PeakGaussModel() 1371 1371 self.comp.setParam('scale', 100) … … 1409 1409 1410 1410 def setUp(self): 1411 from sa ns.models.PeakLorentzModel import PeakLorentzModel1411 from sas.models.PeakLorentzModel import PeakLorentzModel 1412 1412 self.comp = PeakLorentzModel() 1413 1413 self.comp.setParam('scale', 100) … … 1454 1454 1455 1455 def setUp(self): 1456 from sa ns.models.FractalModel import FractalModel1456 from sas.models.FractalModel import FractalModel 1457 1457 self.comp = FractalModel() 1458 1458 self.comp.setParam('scale', 0.05) … … 1500 1500 1501 1501 def setUp(self): 1502 from sa ns.models.LorentzModel import LorentzModel1502 from sas.models.LorentzModel import LorentzModel 1503 1503 self.comp = LorentzModel() 1504 1504 self.comp.setParam("background",1) … … 1543 1543 1544 1544 def setUp(self): 1545 from sa ns.models.PowerLawAbsModel import PowerLawAbsModel1545 from sas.models.PowerLawAbsModel import PowerLawAbsModel 1546 1546 self.comp = PowerLawAbsModel() 1547 1547 self.comp.setParam("background",1) … … 1585 1585 1586 1586 def setUp(self): 1587 from sa ns.models.PowerLawModel import PowerLawModel1587 from sas.models.PowerLawModel import PowerLawModel 1588 1588 self.comp = PowerLawModel() 1589 1589 self.comp.setParam("background",1) … … 1627 1627 1628 1628 def setUp(self): 1629 from sa ns.models.TeubnerStreyModel import TeubnerStreyModel1629 from sas.models.TeubnerStreyModel import TeubnerStreyModel 1630 1630 self.comp = TeubnerStreyModel() 1631 1631 self.comp.setParam("background",0.1) … … 1670 1670 1671 1671 def setUp(self): 1672 from sa ns.models.LineModel import LineModel1672 from sas.models.LineModel import LineModel 1673 1673 self.comp = LineModel() 1674 1674 self.comp.setParam("A",1) … … 1706 1706 1707 1707 def setUp(self): 1708 from sa ns.models.MassFractalModel import MassFractalModel1708 from sas.models.MassFractalModel import MassFractalModel 1709 1709 self.comp = MassFractalModel() 1710 1710 … … 1717 1717 1718 1718 def setUp(self): 1719 from sa ns.models.SurfaceFractalModel import SurfaceFractalModel1719 from sas.models.SurfaceFractalModel import SurfaceFractalModel 1720 1720 self.comp = SurfaceFractalModel() 1721 1721 … … 1728 1728 1729 1729 def setUp(self): 1730 from sa ns.models.MassSurfaceFractal import MassSurfaceFractal1730 from sas.models.MassSurfaceFractal import MassSurfaceFractal 1731 1731 self.comp = MassSurfaceFractal() 1732 1732
Note: See TracChangeset
for help on using the changeset viewer.