Changeset 79411b2 in sasview

Timestamp:

Apr 12, 2012 3:22:49 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:

2e9c3ea

Parents:

7415cbe

Message:

Fixing code style problems

Files:

• calculatorview/src/sans/perspectives/calculator/load_thread.py (modified) (2 diffs)
• sansmodels/src/sans/models/GaussLorentzGelModel.py (modified) (3 diffs)

calculatorview/src/sans/perspectives/calculator/load_thread.py

@@ -1 +1 @@
 
 import time
-import sys
 
 
@@ -43 +42 @@
         try:
             data =  self.loader.load(self.path)
-            elapsed = time.time() - self.starttime
             self.complete(data=data)
         except KeyboardInterrupt:

sansmodels/src/sans/models/GaussLorentzGelModel.py

@@ -6 +6 @@
 
 from sans.models.BaseComponent import BaseComponent
-from math import exp
+import math
 
 class GaussLorentzGelModel(BaseComponent):
@@ -30 +30 @@
         ## Name of the model
         self.name = "GaussLorentzGel"
-        self.description="""I(q)=scale_g*exp(-q^2*Z^2/2)+scale_l/(1+q^2*z^2)
+        self.description = """I(q)=scale_g*exp(-q^2*Z^2/2)+scale_l/(1+q^2*z^2)
             + background
             List of default parameters:
@@ -55 +55 @@
 
         #list of parameter that cannot be fitted
-        self.fixed= []  
+        self.fixed = []  
     def _gausslorentzgel(self, x):
         """
         Model definition
         """
-        inten = self.params['scale_g']*exp(-1.0*x*x*self.params['stat_colength']* \
+        inten = self.params['scale_g']*math.exp(-1.0*x*x*self.params['stat_colength']* \
                 self.params['stat_colength']/2.0) + self.params['scale_l']/ \
                 (1.0 + (x*self.params['dyn_colength'])* \