Changeset 51da9dc in sasview for fittingview/src/sans

Timestamp:

Feb 9, 2012 12:01:49 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

6752950

Parents:

0a90d92

Message:

reordered non_shape list

File:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/models.py

@@ -480 +480 @@
         self.shape_indep_list.append(FractalModel )
         self.model_name_list.append(FractalModel.__name__)
-
-        from sans.models.MassFractalModel import MassFractalModel
-        self.shape_indep_list.append(MassFractalModel)
-        self.model_name_list.append(MassFractalModel.__name__)
-
-        from sans.models.SurfaceFractalModel import SurfaceFractalModel
-        self.shape_indep_list.append(SurfaceFractalModel)
-        self.model_name_list.append(SurfaceFractalModel.__name__)
-        
-        from sans.models.MassSurfaceFractal import MassSurfaceFractal
-        self.shape_indep_list.append(MassSurfaceFractal)
-        self.model_name_list.append(MassSurfaceFractal.__name__)
         
         from sans.models.FractalCoreShellModel import FractalCoreShellModel
@@ -512 +500 @@
         self.shape_indep_list.append( LorentzModel) 
         self.model_name_list.append(LorentzModel.__name__)
+
+        from sans.models.MassFractalModel import MassFractalModel
+        self.shape_indep_list.append(MassFractalModel)
+        self.model_name_list.append(MassFractalModel.__name__)
+        
+        from sans.models.MassSurfaceFractal import MassSurfaceFractal
+        self.shape_indep_list.append(MassSurfaceFractal)
+        self.model_name_list.append(MassSurfaceFractal.__name__)
         
         from sans.models.PeakGaussModel import PeakGaussModel
@@ -536 +532 @@
         self.shape_indep_list.append(RPA10Model)
         self.multi_func_list.append(RPA10Model)
+
+        from sans.models.SurfaceFractalModel import SurfaceFractalModel
+        self.shape_indep_list.append(SurfaceFractalModel)
+        self.model_name_list.append(SurfaceFractalModel.__name__)
         
         from sans.models.TeubnerStreyModel import TeubnerStreyModel