Changeset b699768 in sasview for src/sas/sascalc/fit

Timestamp:

Feb 19, 2016 8:07:22 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

d7bb526

Parents:

792e6be

Message:

Initial commit of the refactored SasCalc? module.

Location:

src/sas/sascalc/fit

Files:

• AbstractFitEngine.py (moved) (moved from src/sas/fit/AbstractFitEngine.py) (1 diff)
• BumpsFitting.py (moved) (moved from src/sas/fit/BumpsFitting.py) (1 diff)
• Loader.py (moved) (moved from src/sas/fit/Loader.py)
• __init__.py (moved) (moved from src/sas/fit/__init__.py)
• expression.py (moved) (moved from src/sas/fit/expression.py)

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -6 +6 @@
 import numpy
 
-from sas.dataloader.data_info import Data1D
-from sas.dataloader.data_info import Data2D
+from sas.sascalc.dataloader.data_info import Data1D
+from sas.sascalc.dataloader.data_info import Data2D
 _SMALLVALUE = 1.0e-10
 

src/sas/sascalc/fit/BumpsFitting.py

@@ -28 +28 @@
 
 
-from sas.fit.AbstractFitEngine import FitEngine
-from sas.fit.AbstractFitEngine import FResult
-from sas.fit.expression import compile_constraints
+from sas.sascalc.fit.AbstractFitEngine import FitEngine
+from sas.sascalc.fit.AbstractFitEngine import FResult
+from sas.sascalc.fit.expression import compile_constraints
 
 class Progress(object):