Changeset 50f1477 in sasview for src/sas/sascalc/fit/BumpsFitting.py

Timestamp:

Dec 19, 2016 7:25:08 AM (8 years ago)

Author:

GitHub <noreply@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

09fdc89, b61bd57

Parents:

f2724b6 (diff), 345e7e4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

jhbakker <j.h.bakker@…> (12/19/16 07:25:08)

git-committer:

GitHub <noreply@…> (12/19/16 07:25:08)

Message:

Merge pull request #27 from SasView?/revert-26-Jurtest2

Revert "Jurtest2"

File:

• src/sas/sascalc/fit/BumpsFitting.py (modified) (1 diff)

src/sas/sascalc/fit/BumpsFitting.py

@@ -27 +27 @@
 from bumps import parameter
 from bumps.fitproblem import FitProblem
+
 
 from sas.sascalc.fit.AbstractFitEngine import FitEngine