Changeset b9a5f0e in sasview for src/sas/plottools

Timestamp:

Feb 13, 2015 4:52:52 AM (10 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:

fd5ac0d

Parents:

35ec279

Message:

90% complete with the conversion.

Location:

src/sas/plottools

Files:

• fitDialog.py (modified) (2 diffs)
• fittings.py (modified) (2 diffs)

src/sas/plottools/fitDialog.py

@@ -430 +430 @@
                     tempdy = numpy.asarray(tempdy)
                     tempdy[tempdy == 0] = 1
-                    chisqr, out, cov = fittings.sansfit(self.model,
+                    chisqr, out, cov = fittings.sasfit(self.model,
                                                         [self.cstA, self.cstB],
                                                         tempx, tempy,
@@ -439 +439 @@
                     tempdy = numpy.asarray(tempdy)
                     tempdy[tempdy == 0] = 1
-                    chisqr, out, cov = fittings.sansfit(self.model,
+                    chisqr, out, cov = fittings.sasfit(self.model,
                                                         [self.cstA, self.cstB],
                                                         tempx, tempy, tempdy,

src/sas/plottools/fittings.py

@@ -27 +27 @@
     
     
-def sansfit(model, pars, x, y, err_y , qmin=None, qmax=None):
+def sasfit(model, pars, x, y, err_y , qmin=None, qmax=None):
     """
     Fit function
@@ -90 +90 @@
     cstB = Parameter(line, 'B', event.cstB)
     y = line.run()
-    chisqr, out, cov = sansfit(line, [cstA, cstB], event.x, y, 0)
+    chisqr, out, cov = sasfit(line, [cstA, cstB], event.x, y, 0)
     # print "Output parameters:", out
     print "The right answer is [70.0, 1.0]"