Ignore:
Timestamp:
May 2, 2017 8:07:09 AM (7 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:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/basepage.py

    r9c0f3c17 ra1b8fee  
    22Base Page for fitting 
    33""" 
     4from __future__ import print_function 
     5 
    46import sys 
    57import os 
     
    657659        # It seems MAC needs wxCallAfter 
    658660        if event.GetId() == GUIFRAME_ID.COPYEX_ID: 
    659             print "copy excel" 
     661            print("copy excel") 
    660662            wx.CallAfter(self.get_copy_excel) 
    661663        elif event.GetId() == GUIFRAME_ID.COPYLAT_ID: 
    662             print "copy latex" 
     664            print("copy latex") 
    663665            wx.CallAfter(self.get_copy_latex) 
    664666        else: 
     
    33683370        except Exception: 
    33693371            logger.error(traceback.format_exc()) 
    3370             print "Error in BasePage._paste_poly_help: %s" % \ 
    3371                   sys.exc_info()[1] 
     3372            print("Error in BasePage._paste_poly_help: %s" % \ 
     3373                  sys.exc_info()[1]) 
    33723374 
    33733375    def _set_disp_cb(self, isarray, item): 
     
    33983400            Moveit; This method doesn't belong here 
    33993401        """ 
    3400         print "BasicPage.update_pinhole_smear was called: skipping" 
     3402        print("BasicPage.update_pinhole_smear was called: skipping") 
    34013403        return 
    34023404 
     
    35743576        # check model type to show sizer 
    35753577        if self.model is not None: 
    3576             print "_set_model_sizer_selection: disabled." 
     3578            print("_set_model_sizer_selection: disabled.") 
    35773579            # self._set_model_sizer_selection(self.model) 
    35783580 
  • src/sas/sasgui/perspectives/fitting/fitting.py

    r7432acb ra1b8fee  
    1111#copyright 2009, University of Tennessee 
    1212################################################################################ 
     13from __future__ import print_function 
     14 
    1315import re 
    1416import sys 
     
    12531255        """ 
    12541256        """ 
    1255         print "update_fit result", result 
     1257        print("update_fit result", result) 
    12561258 
    12571259    def _batch_fit_complete(self, result, pars, page_id, 
     
    20462048            res = (fn - gn) / en 
    20472049        except ValueError: 
    2048             print "Unmatch lengths %s, %s, %s" % (len(fn), len(gn), len(en)) 
     2050            print("Unmatch lengths %s, %s, %s" % (len(fn), len(gn), len(en))) 
    20492051            return 
    20502052 
  • src/sas/sasgui/perspectives/fitting/media/plugin.rst

    r984f3fc r72100ee  
    538538    sin, cos, tan, asin, acos, atan: 
    539539        Trigonometry functions and inverses, operating on radians. 
    540     sinh, cos, tanh, asinh, acosh, atanh: 
     540    sinh, cosh, tanh, asinh, acosh, atanh: 
    541541        Hyperbolic trigonometry functions. 
    542542    atan2(y,x): 
  • src/sas/sasgui/perspectives/fitting/models.py

    r463e7ffc ra1b8fee  
    22    Utilities to manage models 
    33""" 
     4from __future__ import print_function 
     5 
    46import traceback 
    57import os 
     
    141143        type, value, tb = sys.exc_info() 
    142144        if type is not None and issubclass(type, py_compile.PyCompileError): 
    143             print "Problem with", repr(value) 
     145            print("Problem with", repr(value)) 
    144146            raise type, value, tb 
    145147        return 1 
  • src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

    r5295cf5 r9d93c37  
    636636 
    637637     Example: radius [2 : 5] , radius [10 : 25] 
    638  
    639 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    640  
    641 .. note::  This help document was last changed by Steve King, 10Oct2016 
     638      
     639.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     640 
     641Combined Batch Fit Mode 
     642----------------------- 
     643 
     644Batch mode does not allow for multiple models.  In other words in batch mode 
     645all the data sets must be fit with single model and set of parameter.  At times 
     646there may be a shape change occuring in the series that requires changing the 
     647model part way through the series.  In this case set up two batch fit pages 
     648following the instructions in :ref:`Batch Fit Mode`.  However *be careful!* each 
     649time a batch fit panel runs fit it will overwrite the table of values. 
     650 
     651However there may be occassion when one wants to run these two (or more) batch 
     652fits and then plot one of the common parameters (e.g. radius of shere and 
     653eventually cylinder).  In this case the Combined Batch Fit can be used. 
     654Similarly to the Simultaneous Fit page a new page will appear.  In this case, 
     655instead of a check box for each fitpage model there will be a check box for each 
     656batchpage.  Clicking the Fit button will run each batch fit *in sequence*.  
     657 
     658.. image:: combine_batch_page.png 
     659 
     660The batch table will then pop up at the end as before with the following 
     661caveats: 
     662 
     663.. note:: 
     664   The order matters.  The parameters in the table will be taken from the model 
     665   used in the first batch page of the list.  Any parameters from the 
     666   second and on batch pages that have the same name as a parameter in the first 
     667   will show up allowing for plotting of that parameter across the models. 
     668.. note:: 
     669   a corralary of the above is that currently models created as a sum|multiply 
     670   model will not work as desired because the generated model parameters have a 
     671   p#_ appended to the beginning and thus radius and p1_radius will not be 
     672   recognized as the same parameter. 
     673    
     674.. image:: combine_batch_grid.png 
     675 
     676In this case the series is a time series.  Unfortunately the time is not listed 
     677in the file but the file name contains the information.  A column can be added 
     678manually, in this case called time.  Clicking on the top of a column will select 
     679it. Clicking next on the Add button next to the x or y row will add the cell 
     680information to use in a plot.  The axis labels will be automatically populated 
     681from the top row information.  Units can be specified as well using text and a 
     682subset of in line Latex.  Once this is set up, in this case using the peak 
     683position from the two different models for the y axis and time on the x axis, 
     684one clicks the Plot button.   
     685 
     686.. image:: combine_batch_plot.png 
     687 
     688Note the discontinuity in the peak position.  This 
     689is due to the fact that the Guassian fit is actually pretty bad and is not 
     690actually finding the peak. 
     691 
     692.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     693 
     694.. note::  This help document was last changed by Paul Butler, 06April2017 
  • src/sas/sasgui/perspectives/fitting/simfitpage.py

    r959eb01 ra9f9ca4  
    11""" 
    2     Simultaneous fit page 
     2    Simultaneous or Batch fit page 
    33""" 
     4# Note that this is used for both Simultaneous/Constrained fit AND for  
     5# combined batch fit.  This is done through setting of the batch_on parameter. 
     6# There are the a half dozen or so places where an if statement is used as in  
     7# if not batch_on: 
     8#     xxxx 
     9# else: 
     10#     xxxx 
     11# This is just wrong but dont have time to fix this go. Proper approach would be 
     12# to strip all parts of the code that depend on batch_on and create the top 
     13# level class from which a contrained/simultaneous fit page and a combined  
     14# batch page inherit. 
     15# 
     16#            04/09/2017   --PDB 
     17 
    418import sys 
    519from collections import namedtuple 
     
    400414        # General Help button 
    401415        self.btHelp = wx.Button(self, wx.ID_HELP, 'HELP') 
    402         self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.") 
     416        if self.batch_on: 
     417            self.btHelp.SetToolTipString("Combined Batch Fitting help.") 
     418        else: 
     419            self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.") 
    403420        self.btHelp.Bind(wx.EVT_BUTTON, self._on_help) 
    404421 
     
    527544    """ 
    528545        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 
    529         _PageAnchor = "#simultaneous-fit-mode" 
    530         _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 
     546        if not self.batch_on: 
     547            _PageAnchor = "#simultaneous-fit-mode" 
     548            _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 
    531549                                          _PageAnchor, 
    532550                                          "Simultaneous/Constrained Fitting Help") 
     551        else: 
     552            _PageAnchor = "#combined-batch-fit-mode" 
     553            _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 
     554                                          _PageAnchor, 
     555                                          "Combined Batch Fit Help") 
    533556 
    534557    def set_manager(self, manager): 
Note: See TracChangeset for help on using the changeset viewer.