Changes in / [658dd57:14ecc24e] in sasview


Ignore:
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • .pydevproject

    r26c8be3 r9d93c37  
    44<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> 
    55<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> 
    6 <path>/sasview4/src</path> 
     6<path>/sasview/src</path> 
    77</pydev_pathproperty> 
    88</pydev_project> 
  • 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.