Changes in / [ba22344:36d69e1] in sasview


Ignore:
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • sasview/README.txt

    r311d00a r220b1e7  
    441- Features 
    55=========== 
    6     - New in Version 4.1.0 
    7       ------------------ 
    8       This incremental release brings a series of new features and improvements, 
    9       and a host of bug fixes. Of particular note are: 
    10        
    11       - Correlation Function Analysis (Corfunc) 
    12         This performs a correlation function analysis of one-dimensional SAXS/SANS data,  
    13         or generates a model-independent volume fraction profile from the SANS from an  
    14         adsorbed polymer/surfactant layer. 
    15  
    16         A correlation function may be interpreted in terms of an imaginary rod moving  
    17         through the structure of the material. Γ1D(R) is the probability that a rod of  
    18         length R moving through the material has equal electron/neutron scattering  
    19         length density at either end. Hence a frequently occurring spacing within a  
    20         structure manifests itself as a peak. 
    21  
    22         A volume fraction profile \Phi(z) describes how the density of polymer  
    23         segments/surfactant molecules varies with distance from an (assumed locally flat) 
    24         interface. 
    25  
    26       - Fitting of SESANS Data 
    27         Data from Spin-Echo SANS measurements can now be loaded and fitted. The data will  
    28         be plotted against the correct axes and models will automatically perform a Hankel  
    29         transform in order to calculate SESANS from a SANS model. 
    30  
    31       - Documentation 
    32         The documentation has undergone significant checking and updating. 
    33  
    34       - Improvements 
    35         - Correlation function (corfunc) analysis of 1D SAS data added from CCP13 
    36         - File converter tool for multi-file single column data sets 
    37         - SESANS data loading and direct fitting using the Hankel transformation 
    38         - Saving and loading of simultaneous and constrained fits now supported 
    39         - Save states from SasView v3.x.y now loaded using sasmodel model names 
    40         - Saving and loading of projects with 2D fits now supported 
    41         - Loading a project removes all existing data, fits, and plots 
    42         - Structure factor and form factor can be plotted independently 
    43         - OpenCL is disabled by default and can be enabled through a fit menu 
    44         - Data and theory fields are now independently expandable 
    45       - Bug Fixes 
    46         - Fixes #667: Models computed multiple times on parameters changes 
    47         - Fixes #673: Custom models override built in models of same name 
    48         - Fixes #678: Hard crash when running complex models on GPU 
    49         - Fixes $774: Old style plugin models unloadable 
    50         - Fixes #789: stacked disk scale doesn't match cylinder model 
    51         - Fixes #792: core_shell_fractal uses wrong effective radius 
    52         - Fixes #800: Plot range reset on plot redraws 
    53         - Fixes #811 and #825: 2D smearing broken 
    54         - Fixes #815: Integer model parameter handling 
    55         - Fixes #824: Cannot apply sector averaging when no detector data present 
    56         - Fixes #830: Cansas HDF5 reader fully compliant with NXCanSAS v1.0 format 
    57         - Fixes #835: Fractal model breaks with negative Q values 
    58         - Fixes #843: Multilayer vesicle does not define effective radius 
    59         - Fixes #858: Hayter MSA S(Q) returns errors 
    60         - Numerous grammatical and contexual errors in documention 
    61  
    62  
    636    - New in Version 4.0.1 
    647      ------------------ 
    … …  
    483426=============== 
    484427 
    485  
    486    4.1- All systems: 
    487       The conversion to sasmodels infrastructure is ongoing and should be 
    488       completed in the next release. In the meantime this leads to a few known 
    489       issues: 
    490         - The way that orientation is defined is being refactored to address 
    491         long standing issues and comments.  In release 4.1 however only models 
    492         with symmetry (e.g. a=b) have been converted to the new definitions. 
    493         The rest (a <> b <> c - e.g. parellelepiped) maintain the same 
    494         definition as before and will be converted in 4.2.  Note that 
    495         orientational distribution also makes much more sense in the new 
    496         framework.  The documentation should indicate which definition is being 
    497         used for a given model. 
    498         - The infrastructure currently handles internal conversion of old style 
    499         models so that user created models in previous versions should continue 
    500         to work for now. At some point in the future such support will go away. 
    501         Everyone is encouraged to convert to the new structure which should be 
    502         relatively straight forward and provides a number of benefits.  
    503         - In that vein, the distributed models and those generated by the new 
    504         plugin model editor are in the new format, however those generated by 
    505         sum|multiply models are the old style sum|multiply models. This should 
    506         also disappear in the near future  
    507         - The on the fly discovery of plugin models and changes thereto behave 
    508         inconsistently.  If a change to a plugin model does not seem to 
    509         register, the Load Plugin Models (under fitting -> Plugin Model 
    510         Operations) can be used.  However, after calling Load Plugin Models, the 
    511         active plugin will no longer be loaded (even though the GUI looks like 
    512         it is) unless it is a sum|multiply model which works properly.  All 
    513         others will need to be recalled from the model dropdown menu to reload 
    514         the model into the calculation engine.  While it might be annoying it 
    515         does not appear to prevent SasView from working.. 
    516         - The model code and documentation review is ongoing. At this time the 
    517         core shell parellelepiped is known to have the C shell effectively fixed 
    518         at 0 (noted in documentation) while the triaxial ellipsoid does not seem 
    519         to reproduce the limit of the oblate or prolate ellipsoid. If errors are 
    520         found and corrected, corrected versions will be uploaded to the 
    521         marketplace.  
    522     
    523428   3.1- All systems: 
    524429        - The documentation window may take a few seconds to load the first time 

  • sasview/local_config.py

    rf9d1f60 r73cbeec  
    3333''' remember to:''' 
    3434_acknowledgement_preamble_bullet1 =\ 
    35 '''Acknowledge its use in your publications as :''' 
     35'''Acknowledge its use in your publications as suggested below;''' 
    3636_acknowledgement_preamble_bullet2 =\ 
    37 '''Reference SasView as:''' 
     37'''Reference SasView as : M. Doucet, et al. SasView Version 4.0, Zenodo''' +\ 
     38''', http://doi.org/10.5281/zenodo.159083;''' 
    3839_acknowledgement_preamble_bullet3 =\ 
    39 '''Reference the model you used if appropriate (see documentation for refs)''' 
     40'''Reference the model you used if appropriate (see documentation for refs);''' 
    4041_acknowledgement_preamble_bullet4 =\ 
    4142'''Send us your reference for our records: developers@sasview.org''' 
    4243_acknowledgement_publications = \ 
    43 '''This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.''' 
    44 _acknowledgement_citation = \ 
    45 '''M. Doucet et al. SasView Version 4.1, Zenodo, 10.5281/zenodo.438138''' 
     44'''This work benefited from the use of the SasView application, originally developed under NSF Award  
     45DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme  
     46under the SINE2020 project Grant No 654000, and by Patrick O'Brien & Adam Washington.''' 
    4647 
    4748_acknowledgement =  \ 
    48 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: https://github.com/orgs/SasView/people 
    49 ''' 
     49'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547, but is currently maintained  
     50by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft. SasView also contains code developed with funding from the  
     51EU Horizon 2020 programme under the SINE2020 project (Grant No 654000), and by Patrick O'Brien (pycrust) and Adam Washington (corfunc-py).''' 
    5052 
    5153_homepage = "http://www.sasview.org" 
    … …  
    8789_corner_image = os.path.join(icon_path, "angles_flat.png") 
    8890_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    89 _copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft" 
     91_copyright = "(c) 2009 - 2016, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft" 
    9092marketplace_url = "http://marketplace.sasview.org/" 
    9193 

  • setup.py

    r27109e5 r1e13b53  
    315315                               'test/1d_data/*', 
    316316                               'test/2d_data/*', 
    317                                'test/convertible_files/*', 
    318                                'test/coordinate_data/*', 
    319                                'test/image_data/*', 
    320                                'test/media/*', 
    321                                'test/other_files/*', 
    322317                               'test/save_states/*', 
    323                                'test/sesans_data/*' 
    324                                ] 
     318                               'test/upcoming_formats/*', 
     319                                 'default_categories.json'] 
    325320packages.append("sas.sasview") 
    326321 

  • src/sas/sascalc/calculator/slit_length_calculator.py

    rbfba720 rb699768  
    1616        # y data 
    1717        self.y = None 
    18         # default slit length 
     18        #default slit length 
    1919        self.slit_length = 0.0 
    2020 
    … …  
    4242        """ 
    4343        # None data do nothing 
    44         if self.y is None or self.x is None: 
     44        if self.y == None or self.x == None: 
    4545            return 
    4646        # set local variable 
    … …  
    5454        y_sum = 0.0 
    5555        y_max = 0.0 
    56         ind = 0 
     56        ind = 0.0 
    5757 
    5858        # sum 10 or more y values until getting max_y, 
    … …  
    7070        # defaults 
    7171        y_half_d = 0.0 
    72         ind = 0 
     72        ind = 0.0 
    7373        # find indices where it crosses y = y_half. 
    7474        while True: 
    … …  
    8181 
    8282        # y value and ind just before passed the spot of the half height 
    83         y_half_u = y[ind - 1] 
     83        y_half_u = y[ind-1] 
    8484 
    8585        # get corresponding x values 
    8686        x_half_d = x[ind] 
    87         x_half_u = x[ind - 1] 
     87        x_half_u = x[ind-1] 
    8888 
    8989        # calculate x at y = y_half using linear interpolation 
    … …  
    9191            x_half = (x_half_d + x_half_u)/2.0 
    9292        else: 
    93             x_half = ((x_half_u * (y_half - y_half_d) 
    94                        + x_half_d * (y_half_u - y_half)) 
    95                        / (y_half_u - y_half_d)) 
     93            x_half = (x_half_u * (y_half - y_half_d)  \ 
     94                       + x_half_d * (y_half_u - y_half)) \ 
     95                        / (y_half_u - y_half_d) 
    9696 
    9797        # Our slit length is half width, so just give half beam value 

  • src/sas/sascalc/dataloader/readers/cansas_reader.py

    r8434365 rc221349  
    930930            self._write_data(datainfo, entry_node) 
    931931        # Transmission Spectrum Info 
    932         # TODO: fix the writer to linearize all data, including T_spectrum 
    933         # self._write_trans_spectrum(datainfo, entry_node) 
     932        self._write_trans_spectrum(datainfo, entry_node) 
    934933        # Sample info 
    935934        self._write_sample_info(datainfo, entry_node) 

  • src/sas/sascalc/fit/BumpsFitting.py

    r1a30720 r345e7e4  
    352352    except Exception as exc: 
    353353        best, fbest = None, numpy.NaN 
    354         errors = [str(exc), traceback.format_exc()] 
     354        errors = [str(exc), traceback.traceback.format_exc()] 
    355355    finally: 
    356356        mapper.stop_mapper(fitdriver.mapper) 

  • src/sas/sasgui/guiframe/acknowledgebox.py

    r74c8cd0 rc1fdf84  
    1111import wx.richtext 
    1212import wx.lib.hyperlink 
    13 from wx.lib.expando import ExpandoTextCtrl 
    1413import random 
    1514import os.path 
    … …  
    3736    Shows the current method for acknowledging SasView in 
    3837    scholarly publications. 
     38 
    3939    """ 
    4040 
    … …  
    4444        wx.Dialog.__init__(self, *args, **kwds) 
    4545 
    46         self.ack = ExpandoTextCtrl(self, style=wx.TE_LEFT|wx.TE_MULTILINE|wx.TE_BESTWRAP|wx.TE_READONLY|wx.TE_NO_VSCROLL) 
     46        self.ack = wx.TextCtrl(self, style=wx.TE_LEFT|wx.TE_MULTILINE|wx.TE_BESTWRAP|wx.TE_READONLY|wx.TE_NO_VSCROLL) 
    4747        self.ack.SetValue(config._acknowledgement_publications) 
    48         #self.ack.SetMinSize((-1, 55)) 
    49         self.citation = ExpandoTextCtrl(self, style=wx.TE_LEFT|wx.TE_MULTILINE|wx.TE_BESTWRAP|wx.TE_READONLY|wx.TE_NO_VSCROLL) 
    50         self.citation.SetValue(config._acknowledgement_citation) 
     48        self.ack.SetMinSize((-1, 55)) 
    5149        self.preamble = wx.StaticText(self, -1, config._acknowledgement_preamble) 
    5250        items = [config._acknowledgement_preamble_bullet1, 
    … …  
    5452                 config._acknowledgement_preamble_bullet3, 
    5553                 config._acknowledgement_preamble_bullet4] 
    56         self.list1 = wx.StaticText(self, -1, "(1) " + items[0]) 
    57         self.list2 = wx.StaticText(self, -1, "(2) " + items[1]) 
    58         self.list3 = wx.StaticText(self, -1, "(3) " + items[2]) 
    59         self.list4 = wx.StaticText(self, -1, "(4) " + items[3]) 
     54        self.list1 = wx.StaticText(self, -1, "\t(1) " + items[0]) 
     55        self.list2 = wx.StaticText(self, -1, "\t(2) " + items[1]) 
     56        self.list3 = wx.StaticText(self, -1, "\t(3) " + items[2]) 
     57        self.list4 = wx.StaticText(self, -1, "\t(4) " + items[3]) 
    6058        self.static_line = wx.StaticLine(self, 0) 
    6159        self.__set_properties() 
    … …  
    7169        self.SetTitle("Acknowledging SasView") 
    7270        #Increased size of box from (525, 225), SMK, 04/10/16 
    73         self.SetClientSize((600, 320)) 
     71        self.SetSize((600, 300)) 
    7472        # end wxGlade 
    7573 
    … …  
    8381        sizer_titles.Add(self.preamble, 0, wx.ALL|wx.EXPAND, 5) 
    8482        sizer_titles.Add(self.list1, 0, wx.ALL|wx.EXPAND, 5) 
     83        sizer_titles.Add(self.list2, 0, wx.ALL|wx.EXPAND, 5) 
     84        sizer_titles.Add(self.list3, 0, wx.ALL|wx.EXPAND, 5) 
     85        sizer_titles.Add(self.list4, 0, wx.ALL|wx.EXPAND, 5) 
     86        sizer_titles.Add(self.static_line, 0, wx.ALL|wx.EXPAND, 0) 
    8587        sizer_titles.Add(self.ack, 0, wx.ALL|wx.EXPAND, 5) 
    86         sizer_titles.Add(self.list2, 0, wx.ALL|wx.EXPAND, 5) 
    87         sizer_titles.Add(self.citation, 0, wx.ALL|wx.EXPAND, 5) 
    88         sizer_titles.Add(self.list3, 0, wx.ALL|wx.EXPAND, 5) 
    89         #sizer_titles.Add(self.static_line, 0, wx.ALL|wx.EXPAND, 0) 
    90         sizer_titles.Add(self.list4, 0, wx.ALL|wx.EXPAND, 5) 
    9188        sizer_main.Add(sizer_titles, -1, wx.ALL|wx.EXPAND, 5) 
    9289        self.SetAutoLayout(True) 
    … …  
    9491        self.Layout() 
    9592        self.Centre() 
    96         #self.SetClientSize(sizer_main.GetSize()) 
    9793        # end wxGlade 
    9894 

  • src/sas/sasgui/guiframe/config.py

    rf9d1f60 rd85c194  
    11""" 
    2     Application settings 
     2Application settings 
    33""" 
     4import os 
    45import time 
    5 import os 
    66from sas.sasgui.guiframe.gui_style import GUIFRAME 
    7 import sas.sasview 
    8 import logging 
    9  
    107# Version of the application 
    11 __appname__ = "SasView" 
    12 __version__ = sas.sasview.__version__ 
    13 __build__ = sas.sasview.__build__ 
     8__appname__ = "DummyView" 
     9__version__ = '0.0.0' 
     10__build__ = '1' 
    1411__download_page__ = 'https://github.com/SasView/sasview/releases' 
    1512__update_URL__ = 'http://www.sasview.org/latestversion.json' 
    1613 
     14 
    1715# Debug message flag 
    18 __EVT_DEBUG__ = False 
     16__EVT_DEBUG__ = True 
    1917 
    2018# Flag for automated testing 
    … …  
    3129_acknowledgement_preamble =\ 
    3230'''To ensure the long term support and development of this software please''' +\ 
    33 ''' remember to:''' 
     31''' remember to do the following.''' 
    3432_acknowledgement_preamble_bullet1 =\ 
    35 '''Acknowledge its use in your publications as :''' 
     33'''Acknowledge its use in your publications as suggested below''' 
    3634_acknowledgement_preamble_bullet2 =\ 
    37 '''Reference SasView as:''' 
     35'''Reference the following website: http://www.sasview.org''' 
    3836_acknowledgement_preamble_bullet3 =\ 
    3937'''Reference the model you used if appropriate (see documentation for refs)''' 
    … …  
    4139'''Send us your reference for our records: developers@sasview.org''' 
    4240_acknowledgement_publications = \ 
    43 '''This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.''' 
    44 _acknowledgement_citation = \ 
    45 '''M. Doucet et al. SasView Version 4.1, Zenodo, 10.5281/zenodo.438138''' 
     41'''This work benefited from the use of the SasView application, originally 
     42developed under NSF award DMR-0520547. 
     43''' 
     44_acknowledgement =  \ 
     45'''This work originally developed as part of the DANSE project funded by the NSF 
     46under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
     47and ILL. 
    4648 
    47 _acknowledgement =  \ 
    48 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: https://github.com/orgs/SasView/people 
    4949''' 
    50  
    5150_homepage = "http://www.sasview.org" 
    52 _download = __download_page__ 
     51_download = "http://sourceforge.net/projects/sasview/files/" 
    5352_authors = [] 
    5453_paper = "http://sourceforge.net/p/sasview/tickets/" 
    5554_license = "mailto:help@sasview.org" 
    56  
    57  
    58 icon_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "images")) 
    59 logging.info("icon path: %s" % icon_path) 
    60 media_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "media")) 
    61 test_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "test")) 
    62  
    63 _nist_logo = os.path.join(icon_path, "nist_logo.png") 
    64 _umd_logo = os.path.join(icon_path, "umd_logo.png") 
    65 _sns_logo = os.path.join(icon_path, "sns_logo.png") 
    66 _ornl_logo = os.path.join(icon_path, "ornl_logo.png") 
    67 _isis_logo = os.path.join(icon_path, "isis_logo.png") 
    68 _ess_logo = os.path.join(icon_path, "ess_logo.png") 
    69 _ill_logo = os.path.join(icon_path, "ill_logo.png") 
    70 _ansto_logo = os.path.join(icon_path, "ansto_logo.png") 
    71 _tudelft_logo = os.path.join(icon_path, "tudelft_logo.png") 
    72 _nsf_logo = os.path.join(icon_path, "nsf_logo.png") 
    73 _danse_logo = os.path.join(icon_path, "danse_logo.png") 
    74 _inst_logo = os.path.join(icon_path, "utlogo.gif") 
     55_nsf_logo = "images/nsf_logo.png" 
     56_danse_logo = "images/danse_logo.png" 
     57_inst_logo = "images/utlogo.gif" 
     58_nist_logo = "images/nist_logo.png" 
     59_umd_logo = "images/umd_logo.png" 
     60_sns_logo = "images/sns_logo.png" 
     61_isis_logo = "images/isis_logo.png" 
     62_ess_logo = "images/ess_logo.png" 
     63_ill_logo = "images/ill_logo.png" 
    7564_nist_url = "http://www.nist.gov/" 
    7665_umd_url = "http://www.umd.edu/" 
    7766_sns_url = "http://neutrons.ornl.gov/" 
    78 _ornl_url = "http://neutrons.ornl.gov/" 
    7967_nsf_url = "http://www.nsf.gov" 
     68_danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html" 
     69_inst_url = "http://www.utk.edu" 
    8070_isis_url = "http://www.isis.stfc.ac.uk/" 
    8171_ess_url = "http://ess-scandinavia.eu/" 
    8272_ill_url = "http://www.ill.eu/" 
    83 _ansto_url = "http://www.ansto.gov.au/" 
    84 _tudelft_url = "http://www.tnw.tudelft.nl/en/cooperation/facilities/reactor-instituut-delft/" 
    85 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html" 
    86 _inst_url = "http://www.utk.edu" 
    87 _corner_image = os.path.join(icon_path, "angles_flat.png") 
    88 _welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    89 _copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft" 
    90 marketplace_url = "http://marketplace.sasview.org/" 
    91  
    92 #edit the list of file state your plugin can read 
    93 APPLICATION_WLIST = 'SasView files (*.svs)|*.svs' 
    94 APPLICATION_STATE_EXTENSION = '.svs' 
    95 GUIFRAME_WIDTH = 1150 
    96 GUIFRAME_HEIGHT = 840 
    97 PLUGIN_STATE_EXTENSIONS = ['.fitv', '.inv', '.prv', '.crf'] 
    98 PLUGINS_WLIST = ['Fitting files (*.fitv)|*.fitv', 
    99                  'Invariant files (*.inv)|*.inv', 
    100                  'P(r) files (*.prv)|*.prv', 
    101                  'Corfunc files (*.crf)|*.crf'] 
    102 PLOPANEL_WIDTH = 415 
    103 PLOPANEL_HEIGTH = 370 
     73_corner_image = "images/angles_flat.png" 
     74_welcome_image = "images/SVwelcome.png" 
     75_copyright = "(c) 2008, University of Tennessee" 
     76#edit the lists below of file state your plugin can read 
     77#for sasview this how you can edit these lists 
     78#PLUGIN_STATE_EXTENSIONS = ['.prv','.fitv', '.inv'] 
     79#APPLICATION_STATE_EXTENSION = '.svs' 
     80#PLUGINS_WLIST = ['P(r) files (*.prv)|*.prv', 
     81#                  'Fitting files (*.fitv)|*.fitv', 
     82#                  'Invariant files (*.inv)|*.inv'] 
     83#APPLICATION_WLIST = 'SasView files (*.svs)|*.svs' 
     84APPLICATION_WLIST = '' 
     85APPLICATION_STATE_EXTENSION = None 
     86PLUGINS_WLIST = [] 
     87PLUGIN_STATE_EXTENSIONS = [] 
     88SPLASH_SCREEN_PATH = "images/danse_logo.png" 
     89DEFAULT_STYLE = GUIFRAME.SINGLE_APPLICATION 
     90SPLASH_SCREEN_WIDTH = 500 
     91SPLASH_SCREEN_HEIGHT = 300 
     92WELCOME_PANEL_ON = False 
     93TUTORIAL_PATH = None 
     94SS_MAX_DISPLAY_TIME = 1500 
     95PLOPANEL_WIDTH = 350 
     96PLOPANEL_HEIGTH = 350 
     97GUIFRAME_WIDTH = 1000 
     98GUIFRAME_HEIGHT = 800 
     99CONTROL_WIDTH = -1 
     100CONTROL_HEIGHT = -1 
     101SetupIconFile_win = os.path.join("images", "ball.ico") 
     102SetupIconFile_mac = os.path.join("images", "ball.icns") 
     103DefaultGroupName = "DANSE" 
     104OutputBaseFilename = "setupGuiFrame" 
    104105DATAPANEL_WIDTH = 235 
    105106DATAPANEL_HEIGHT = 700 
    106 SPLASH_SCREEN_PATH = os.path.join(icon_path, "SVwelcome_mini.png") 
    107 TUTORIAL_PATH = os.path.join(media_path, "Tutorial.pdf") 
    108 DEFAULT_STYLE = GUIFRAME.MULTIPLE_APPLICATIONS|GUIFRAME.MANAGER_ON\ 
    109                     |GUIFRAME.CALCULATOR_ON|GUIFRAME.TOOLBAR_ON 
    110 SPLASH_SCREEN_WIDTH = 512 
    111 SPLASH_SCREEN_HEIGHT = 366 
    112 SS_MAX_DISPLAY_TIME = 2000 
    113 WELCOME_PANEL_ON = True 
    114 WELCOME_PANEL_SHOW = False 
    115 CLEANUP_PLOT = False 
    116 # OPEN and SAVE project menu 
    117 OPEN_SAVE_PROJECT_MENU = True 
    118 #VIEW MENU 
    119 VIEW_MENU = True 
    120 #EDIT MENU 
    121 EDIT_MENU = True 
    122  
    123 SetupIconFile_win = os.path.join(icon_path, "ball.ico") 
    124 SetupIconFile_mac = os.path.join(icon_path, "ball.icns") 
    125 DefaultGroupName = "." 
    126 OutputBaseFilename = "setupSasView" 
    127  
    128107FIXED_PANEL = True 
    129108DATALOADER_SHOW = True 
    … …  
    134113# set a default perspective 
    135114DEFAULT_PERSPECTIVE = 'None' 
    136  
    137 # Time out for updating sasview 
    138 UPDATE_TIMEOUT = 2 
    139  
    140 #OpenCL option 
    141 SAS_OPENCL = None 
     115# OPEN and SAVE project menu 
     116OPEN_SAVE_PROJECT_MENU = True 
     117CLEANUP_PLOT = False 
     118# OPEN and SAVE project menu 
     119OPEN_SAVE_PROJECT_MENU = False 
     120#VIEW MENU 
     121VIEW_MENU = False 
     122#EDIT MENU 
     123EDIT_MENU = False 
     124import wx.lib.newevent 
     125(StatusBarEvent, EVT_STATUS) = wx.lib.newevent.NewEvent() 
    142126 
    143127def printEVT(message): 
     128    """ 
     129    :TODO - need method documentation 
     130    """ 
    144131    if __EVT_DEBUG__: 
    145         """ 
    146         :TODO - Need method doc string 
    147         """ 
    148132        print "%g:  %s" % (time.clock(), message) 
    149  
     133     
    150134        if __EVT_DEBUG_2_FILE__: 
    151135            out = open(__EVT_DEBUG_FILENAME__, 'a') 
    152136            out.write("%10g:  %s\n" % (time.clock(), message)) 
    153137            out.close() 
     138             

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

    r4c5098c rddbac66  
    17551755                                          data_id="Data  " + data.name + " unsmeared", 
    17561756                                          dy=unsmeared_error) 
    1757             # Comment this out until we can get P*S models with correctly populated parameters 
    1758             #if sq_model is not None and pq_model is not None: 
    1759             #    self.create_theory_1D(x, sq_model, page_id, model, data, state, 
    1760             #                          data_description=model.name + " S(q)", 
    1761             #                          data_id=str(page_id) + " " + data.name + " S(q)") 
    1762             #    self.create_theory_1D(x, pq_model, page_id, model, data, state, 
    1763             #                          data_description=model.name + " P(q)", 
    1764             #                          data_id=str(page_id) + " " + data.name + " P(q)") 
     1757                 
     1758            if sq_model is not None and pq_model is not None: 
     1759                self.create_theory_1D(x, sq_model, page_id, model, data, state, 
     1760                                      data_description=model.name + " S(q)", 
     1761                                      data_id=str(page_id) + " " + data.name + " S(q)") 
     1762                self.create_theory_1D(x, pq_model, page_id, model, data, state, 
     1763                                      data_description=model.name + " P(q)", 
     1764                                      data_id=str(page_id) + " " + data.name + " P(q)") 
     1765 
    17651766 
    17661767            current_pg = self.fit_panel.get_page_by_id(page_id) 

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

    r27109e5 rd5aff7f  
    819819 
    820820        attr = newdoc.createAttribute("version") 
    821         from sas import sasview 
     821        import sasview 
    822822        attr.nodeValue = sasview.__version__ 
    823823        # attr.nodeValue = '1.0' 

  • test/corfunc/test/utest_corfunc.py

    r253eb6c6 racefa2b  
    88from sas.sascalc.corfunc.corfunc_calculator import CorfuncCalculator 
    99from sas.sascalc.dataloader.data_info import Data1D 
    10  
     10import matplotlib.pyplot as plt 
    1111 
    1212class TestCalculator(unittest.TestCase): 
    … …  
    6969        self.assertLess(abs(params['max']-75), 2.5) # L_p ~= 75 
    7070 
     71 
    7172    # Ensure tests are ran in correct order; 
    7273    # Each test depends on the one before it 
Note: See TracChangeset for help on using the changeset viewer.