Changeset 14ecc24e in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

May 2, 2017 8:07:09 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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

Children:

6fab3a0

Parents:

a9f9ca4 (diff), 658dd57 (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.

Message:

Merge branch 'master' into ticket-597

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitting.py (modified) (3 diffs)
• media/plugin.rst (modified) (1 diff)
• models.py (modified) (2 diffs)
• media/combine_batch_grid.png (added)
• media/combine_batch_page.png (added)
• media/combine_batch_plot.png (added)
• media/fitting_help.rst (modified) (1 diff)
• simfitpage.py (modified) (3 diffs)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2 +2 @@
 Base Page for fitting
 """
+from __future__ import print_function
+
 import sys
 import os
@@ -657 +659 @@
         # It seems MAC needs wxCallAfter
         if event.GetId() == GUIFRAME_ID.COPYEX_ID:
-            print "copy excel"
+            print("copy excel")
             wx.CallAfter(self.get_copy_excel)
         elif event.GetId() == GUIFRAME_ID.COPYLAT_ID:
-            print "copy latex"
+            print("copy latex")
             wx.CallAfter(self.get_copy_latex)
         else:
@@ -3368 +3370 @@
         except Exception:
             logger.error(traceback.format_exc())
-            print "Error in BasePage._paste_poly_help: %s" % \
-                  sys.exc_info()[1]
+            print("Error in BasePage._paste_poly_help: %s" % \
+                  sys.exc_info()[1])
 
     def _set_disp_cb(self, isarray, item):
@@ -3398 +3400 @@
             Moveit; This method doesn't belong here
         """
-        print "BasicPage.update_pinhole_smear was called: skipping"
+        print("BasicPage.update_pinhole_smear was called: skipping")
         return
 
@@ -3574 +3576 @@
         # check model type to show sizer
         if self.model is not None:
-            print "_set_model_sizer_selection: disabled."
+            print("_set_model_sizer_selection: disabled.")
             # self._set_model_sizer_selection(self.model)
 

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -11 +11 @@
 #copyright 2009, University of Tennessee
 ################################################################################
+from __future__ import print_function
+
 import re
 import sys
@@ -1253 +1255 @@
         """
         """
-        print "update_fit result", result
+        print("update_fit result", result)
 
     def _batch_fit_complete(self, result, pars, page_id,
@@ -2046 +2048 @@
             res = (fn - gn) / en
         except ValueError:
-            print "Unmatch lengths %s, %s, %s" % (len(fn), len(gn), len(en))
+            print("Unmatch lengths %s, %s, %s" % (len(fn), len(gn), len(en)))
             return
 

src/sas/sasgui/perspectives/fitting/media/plugin.rst

@@ -538 +538 @@
     sin, cos, tan, asin, acos, atan:
         Trigonometry functions and inverses, operating on radians.
-    sinh, cos, tanh, asinh, acosh, atanh:
+    sinh, cosh, tanh, asinh, acosh, atanh:
         Hyperbolic trigonometry functions.
     atan2(y,x):

src/sas/sasgui/perspectives/fitting/models.py

@@ -2 +2 @@
     Utilities to manage models
 """
+from __future__ import print_function
+
 import traceback
 import os
@@ -141 +143 @@
         type, value, tb = sys.exc_info()
         if type is not None and issubclass(type, py_compile.PyCompileError):
-            print "Problem with", repr(value)
+            print("Problem with", repr(value))
             raise type, value, tb
         return 1

src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

@@ -636 +636 @@
 
      Example: radius [2 : 5] , radius [10 : 25]
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-.. note::  This help document was last changed by Steve King, 10Oct2016
+     
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+Combined Batch Fit Mode
+-----------------------
+
+Batch mode does not allow for multiple models.  In other words in batch mode
+all the data sets must be fit with single model and set of parameter.  At times
+there may be a shape change occuring in the series that requires changing the
+model part way through the series.  In this case set up two batch fit pages
+following the instructions in :ref:`Batch Fit Mode`.  However *be careful!* each
+time a batch fit panel runs fit it will overwrite the table of values.
+
+However there may be occassion when one wants to run these two (or more) batch
+fits and then plot one of the common parameters (e.g. radius of shere and
+eventually cylinder).  In this case the Combined Batch Fit can be used.
+Similarly to the Simultaneous Fit page a new page will appear.  In this case,
+instead of a check box for each fitpage model there will be a check box for each
+batchpage.  Clicking the Fit button will run each batch fit *in sequence*. 
+
+.. image:: combine_batch_page.png
+
+The batch table will then pop up at the end as before with the following
+caveats:
+
+.. note::
+   The order matters.  The parameters in the table will be taken from the model
+   used in the first batch page of the list.  Any parameters from the
+   second and on batch pages that have the same name as a parameter in the first
+   will show up allowing for plotting of that parameter across the models.
+.. note::
+   a corralary of the above is that currently models created as a sum|multiply
+   model will not work as desired because the generated model parameters have a
+   p#_ appended to the beginning and thus radius and p1_radius will not be
+   recognized as the same parameter.
+   
+.. image:: combine_batch_grid.png
+
+In this case the series is a time series.  Unfortunately the time is not listed
+in the file but the file name contains the information.  A column can be added
+manually, in this case called time.  Clicking on the top of a column will select
+it. Clicking next on the Add button next to the x or y row will add the cell
+information to use in a plot.  The axis labels will be automatically populated
+from the top row information.  Units can be specified as well using text and a
+subset of in line Latex.  Once this is set up, in this case using the peak
+position from the two different models for the y axis and time on the x axis,
+one clicks the Plot button.  
+
+.. image:: combine_batch_plot.png
+
+Note the discontinuity in the peak position.  This
+is due to the fact that the Guassian fit is actually pretty bad and is not
+actually finding the peak.
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. note::  This help document was last changed by Paul Butler, 06April2017

src/sas/sasgui/perspectives/fitting/simfitpage.py

@@ -1 +1 @@
 """
-    Simultaneous fit page
+    Simultaneous or Batch fit page
 """
+# Note that this is used for both Simultaneous/Constrained fit AND for 
+# combined batch fit.  This is done through setting of the batch_on parameter.
+# There are the a half dozen or so places where an if statement is used as in 
+# if not batch_on:
+#     xxxx
+# else:
+#     xxxx
+# This is just wrong but dont have time to fix this go. Proper approach would be
+# to strip all parts of the code that depend on batch_on and create the top
+# level class from which a contrained/simultaneous fit page and a combined 
+# batch page inherit.
+#
+#            04/09/2017   --PDB
+
 import sys
 from collections import namedtuple
@@ -400 +414 @@
         # General Help button
         self.btHelp = wx.Button(self, wx.ID_HELP, 'HELP')
-        self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.")
+        if self.batch_on:
+            self.btHelp.SetToolTipString("Combined Batch Fitting help.")
+        else:
+            self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.")
         self.btHelp.Bind(wx.EVT_BUTTON, self._on_help)
 
@@ -527 +544 @@
     """
         _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
-        _PageAnchor = "#simultaneous-fit-mode"
-        _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation,
+        if not self.batch_on:
+            _PageAnchor = "#simultaneous-fit-mode"
+            _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation,
                                           _PageAnchor,
                                           "Simultaneous/Constrained Fitting Help")
+        else:
+            _PageAnchor = "#combined-batch-fit-mode"
+            _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation,
+                                          _PageAnchor,
+                                          "Combined Batch Fit Help")
 
     def set_manager(self, manager):