Changeset 81bece4 in sasview

Timestamp:

Oct 21, 2009 1:57:09 PM (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:

acd0bda3

Parents:

7ef319e

Message:

refactor models.py

Location:

sansview/perspectives/fitting

Files:

• invariant.py (deleted)
• models.py (modified) (2 diffs)

sansview/perspectives/fitting/models.py

@@ -269 +269 @@
         self.shape_indep_list.append(PeakLorentzModel)
         
-        from sans.models.FractalModel import FractalModel
-        class FractalAbsModel(FractalModel):
-            def _Fractal(self, x):
-                return FractalModel._Fractal(self, math.fabs(x))
+        from sans.models.FractalAbsModel import FractalAbsModel
         self.shape_indep_list.append(FractalAbsModel)
         
@@ -278 +275 @@
         self.shape_indep_list.append( LorentzModel) 
             
-        from sans.models.PowerLawModel import PowerLawModel
-        class PowerLawAbsModel(PowerLawModel):
-            def _PowerLaw(self, x):
-                try:
-                    return PowerLawModel._PowerLaw(self, math.fabs(x))
-                except:
-                    print sys.exc_value  
+        from sans.models.PowerLawAbsModel import PowerLawAbsModel
         self.shape_indep_list.append( PowerLawAbsModel )
+        
         from sans.models.TeubnerStreyModel import TeubnerStreyModel
         self.shape_indep_list.append(TeubnerStreyModel )