Changeset fd5ac0d in sasview for src/sas/fit/BumpsFitting.py

Timestamp:

Feb 13, 2015 3:26:52 AM (9 years ago)

Author:

krzywon

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:

7a04dbb

Parents:

b9a5f0e

Message:

I have completed the removal of all SANS references.
I will build, run, and run all unit tests before pushing.

File:

• src/sas/fit/BumpsFitting.py (modified) (2 diffs)

src/sas/fit/BumpsFitting.py

@@ -12 +12 @@
 from bumps.fitproblem import FitProblem
 
-from sas import FitEngine
-from sas import FResult
-from sas import compile_constraints
+from sas.fit.AbstractFitEngine import FitEngine
+from sas.fit.AbstractFitEngine import FResult
+from sas.fit.expression import compile_constraints
 
 class Progress(object):
@@ -91 +91 @@
 # The disadvantage of this technique is that we need to copy every parameter
 # back into the model each time the function is evaluated.  We could instead
-# define reference parameters for each sans parameter, but then we would not
+# define reference parameters for each sas parameter, but then we would not
 # be able to express constraints using python expressions in the usual way
 # from bumps, and would instead need to use string expressions.