Changes in / [868846b:e2b2473] in sasview


Ignore:
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • .pydevproject

    r9d93c37 r26c8be3  
    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>/sasview/src</path> 
     6<path>/sasview4/src</path> 
    77</pydev_pathproperty> 
    88</pydev_project> 

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

    r05b0bf6 r5295cf5  
    484484.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    485485 
    486 .. _Batch_Fit_Mode: 
    487  
    488486Batch Fit Mode 
    489487-------------- 
    … …  
    638636 
    639637     Example: radius [2 : 5] , radius [10 : 25] 
    640       
    641 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    642  
    643 Combined Batch Fit Mode 
    644 ----------------------- 
    645  
    646 The purpose of the Combined Batch Fit is to allow running two or more batch 
    647 fits in sequence without overwriting the output table of results.  This may be 
    648 of interest for example if one is fitting a series of data sets where there is 
    649 a shape change occurring in the series that requires changing the model part 
    650 way through the series; for example a sphere to rod transition.  Indeed the 
    651 regular batch mode does not allow for multiple models and requires all the 
    652 files in the series to be fit with single model and set of parameters.  While 
    653 it is of course possible to just run part of the series as a batch fit using 
    654 model one followed by running another batch fit on the rest of the series with 
    655 model two (and/or model three etc), doing so will overwrite the table of 
    656 outputs from the previous batch fit(s).  This may not be desirable if one is 
    657 interested in comparing the parameters: for example the sphere radius of set 
    658 one and the cylinder radius of set two. 
    659  
    660 Method 
    661 ^^^^^^ 
    662  
    663 In order to use the *Combined Batch Fit*, first load all the data needed as 
    664 described in :ref:`Loading_data`. Next start up two or more *BatchPage* fits 
    665 following the instructions in :ref:`Batch_Fit_Mode` but **DO NOT PRESS FIT**. 
    666 At this point the *Combine Batch Fit* menu item under the *Fitting menu* should 
    667 be active (if there is one or no *BatchPage* the menu item will be greyed out 
    668 and inactive).  Clicking on *Combine Batch Fit* will bring up a new panel, 
    669 similar to the *Const & Simult Fit* panel. In this case there will be a 
    670 checkbox for each *BatchPage* instead of each *FitPage* that should be included 
    671 in the fit.  Once all are selected, click the Fit button on 
    672 the *BatchPage* to run each batch fit in *sequence* 
    673  
    674 .. image:: combine_batch_page.png 
    675  
    676 The batch table will then pop up at the end as for the case of the simple Batch 
    677 Fitting with the following caveats: 
    678  
    679 .. note:: 
    680    The order matters.  The parameters in the table will be taken from the model 
    681    used in the first *BatchPage* of the list.  Any parameters from the 
    682    second and later *BatchPage* s that have the same name as a parameter in the 
    683    first will show up allowing for plotting of that parameter across the 
    684    models. The other parameters will not be available in the grid. 
    685 .. note:: 
    686    a corralary of the above is that currently models created as a sum|multiply 
    687    model will not work as desired because the generated model parameters have a 
    688    p#_ appended to the beginning and thus radius and p1_radius will not be 
    689    recognized as the same parameter. 
    690     
    691 .. image:: combine_batch_grid.png 
    692  
    693 In the example shown above the data is a time series with a shifting peak. 
    694 The first part of the series was fitted using the *broad_peak* model, while 
    695 the rest of the data were fit using the *gaussian_peak* model. Unfortunately the 
    696 time is not listed in the file but the file name contains the information. As 
    697 described in :ref:`Grid_Window`, a column can be added manually, in this case 
    698 called time, and the peak position plotted against time.  
    699  
    700 .. image:: combine_batch_plot.png 
    701  
    702 Note the discontinuity in the peak position.  This reflects the fact that the 
    703 Gaussian fit is a rather poor model for the data and is not actually 
    704 finding the peak. 
    705  
    706 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    707  
    708 .. note::  This help document was last changed by Paul Butler, 10 September 
    709    2017 
     638 
     639.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     640 
     641.. note::  This help document was last changed by Steve King, 10Oct2016 

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

    ra9f9ca4 r959eb01  
    11""" 
    2     Simultaneous or Batch fit page 
     2    Simultaneous 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  
    184import sys 
    195from collections import namedtuple 
    … …  
    414400        # General Help button 
    415401        self.btHelp = wx.Button(self, wx.ID_HELP, 'HELP') 
    416         if self.batch_on: 
    417             self.btHelp.SetToolTipString("Combined Batch Fitting help.") 
    418         else: 
    419             self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.") 
     402        self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.") 
    420403        self.btHelp.Bind(wx.EVT_BUTTON, self._on_help) 
    421404 
    … …  
    544527    """ 
    545528        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 
    546         if not self.batch_on: 
    547             _PageAnchor = "#simultaneous-fit-mode" 
    548             _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 
     529        _PageAnchor = "#simultaneous-fit-mode" 
     530        _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 
    549531                                          _PageAnchor, 
    550532                                          "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") 
    556533 
    557534    def set_manager(self, manager): 
Note: See TracChangeset for help on using the changeset viewer.