Changeset 3444492 in sasview


Ignore:
Timestamp:
Apr 5, 2017 9:42:59 AM (7 years ago)
Author:
krzywon
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:
54557b5
Parents:
0d8ee36 (diff), 98c44f3 (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 batch_slicer

Files:
1 added
1 deleted
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • .travis.yml

    r4636f57 rbb1cb38  
    1 # Test Travis CL 
    2  
    31language: python 
    4  
    52matrix: 
    63  include: 
    7     - os: linux 
    8       env: 
    9         - PY=2.7 
    10         - NUMPYSPEC=numpy 
    11     - os: osx 
    12       language: generic 
    13       env: 
    14         - PY=2.7 
    15         - NUMPYSPEC=numpy 
    16  
    17 # whitelist 
     4  - os: linux 
     5    env: 
     6    - PY=2.7 
     7    - NUMPYSPEC=numpy 
     8  - os: osx 
     9    language: generic 
     10    env: 
     11    - PY=2.7 
     12    - NUMPYSPEC=numpy 
    1813branches: 
    1914  only: 
    20     - master 
    21  
     15  - master 
    2216addons: 
    2317  apt: 
    2418    packages: 
    25       - opencl-headers 
    26       - fglrx 
    27       - libblas-dev 
    28       - libatlas-dev 
    29       - libatlas-base-dev 
    30       - liblapack-dev 
    31       - gfortran 
    32       - libhdf5-serial-dev 
    33  
     19    - opencl-headers 
     20    - fglrx 
     21    - libblas-dev 
     22    - libatlas-dev 
     23    - libatlas-base-dev 
     24    - liblapack-dev 
     25    - gfortran 
     26    - libhdf5-serial-dev 
    3427before_install: 
    35   - echo $TRAVIS_OS_NAME 
    36   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
    37         wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; 
    38         sudo apt-get update; sudo apt-get install python-pyopencl; 
    39     elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
    40         wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh; 
    41     fi 
    42  
    43   - bash miniconda.sh -b -p $HOME/miniconda 
    44   - export PATH="$HOME/miniconda/bin:$PATH" 
    45   - hash -r 
    46   - conda update --yes conda 
    47  
    48   # Useful for debugging any issues with conda 
    49   - conda info -a 
    50  
    51   # could install other dependencies, but they're locked to specific 
    52   # versions in build/requirements.txt 
    53   - conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython 
    54  
     28- echo $TRAVIS_OS_NAME 
     29- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh 
     30  -O miniconda.sh; sudo apt-get update; sudo apt-get install python-pyopencl; elif 
     31  [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh 
     32  -O miniconda.sh; fi 
     33- bash miniconda.sh -b -p $HOME/miniconda 
     34- export PATH="$HOME/miniconda/bin:$PATH" 
     35- hash -r 
     36- conda update --yes conda 
     37- conda info -a 
     38- conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython 
    5539install: 
    56   - pip install -r build_tools/requirements.txt 
    57   - pip install matplotlib 
    58  
    59 #before_script: 
    60 #  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
    61 #        "export DISPLAY=:99.0"; "sh -e /etc/init.d/xvfb start"; sleep 3; # give xvfb some time to start 
    62 #    fi 
    63  
     40- pip install -r build_tools/requirements.txt 
     41- pip install matplotlib 
    6442script: 
    65   - cd .. 
    66   # this should be the directory above the sasview directory, where we want to 
    67   # clone the sasmodels 
    68   - export WORKSPACE=$(pwd) 
    69   - git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels 
    70  
    71   # required for documentation 
    72   - git clone --depth=50 --branch=master https://github.com/bumps/bumps.git 
    73  
    74   - ls -ltr 
    75   - if [ ! -d "utils" ]; then mkdir utils; fi 
    76   - /bin/sh -xe sasview/build_tools/travis_build.sh 
    77   - export LC_ALL=en_US.UTF-8 
    78   - export LANG=en_US.UTF-8 
    79 #  - python setup.py docs; echo 0 
    80 #  - python setup.py bdist_egg --skip-build 
    81  
     43- cd .. 
     44- export WORKSPACE=$(pwd) 
     45- git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels 
     46- git clone --depth=50 --branch=master https://github.com/bumps/bumps.git 
     47- ls -ltr 
     48- if [ ! -d "utils" ]; then mkdir utils; fi 
     49- /bin/sh -xe sasview/build_tools/travis_build.sh 
     50- export LC_ALL=en_US.UTF-8 
     51- export LANG=en_US.UTF-8 
     52notifications: 
     53  slack: 
     54    secure: TlsEpZiMLmOOgnmdG0I/oB4tq3bbQYeBBQi6S5qLlkYE9EjUTbbfg7oz0JYUsQ56FAsdFR8zswpBsX7PebZerzrq0ZmvfHSiJhOFIdBfY5Nb7bmLW8/9pUNWV57ON/8Gw2fE5ytc7FgvCGR64yb2QISI/150SIUwvdL5HXTxRWI= 
  • src/sas/sasgui/guiframe/media/data_formats_help.rst

    r48b8f6d r98c44f3  
    44.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 
    55.. WG Bouwman, DUT, added during CodeCamp-V in Oct 2016 the SESANS data format 
     6.. WG Bouwman, DUT, updated during CodeCamp-VI in Apr 2017 the SESANS data format 
    67 
    78.. _Formats: 
     
    8283The file format has a list of name-value pairs at the top of the file which detail the general experimental parameters necessary for fitting and analyzing data. This list should contain all the information necessary for the file to be 'portable' between users. 
    8384 
    84 Following the header is a 6 column list of instrument experimental variables: 
     85Following the header is a 8 (only the first 4 are really needed) column list of instrument experimental variables: 
    8586 
    8687- Spin echo length (z, in Angstroms) 
     88- depolarization (:math:`log(P/P_0)/(lambda^2 * thickness)`, in Angstrom^-1 cm^-1) 
     89- depolarization error in the same unit) (measurement error) 
    8790- Spin echo length error (:math:`\Delta`\ z, in Angstroms) (experimental resolution) 
    88 - Neutron wavelength (:math:`\lambda`, in Angstroms) (essential for ToF instruments) 
     91- Neutron wavelength (:math:`\lambda`, in Angstroms) 
    8992- Neutron wavelength error (:math:`\Delta \lambda`, in Angstroms) 
    9093- Normalized polarization (:math:`P/P_0`, unitless) 
     
    9396.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    9497 
    95 .. note::  This help document was last changed by Steve King, 07Oct2016 
     98.. note::  This help document was last changed by Wim Bouwman, 05Apr2017 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py

    r9a5097c r0d8ee36  
    359359                if self.slicer.__class__.__name__ != "BoxSum": 
    360360                    wx_id = ids.next() 
    361                     slicerpop.Append(wx_id, '&Edit Slicer Parameters') 
     361                    name = '&Edit Slicer Parameters and Batch Slicing' 
     362                    slicerpop.Append(wx_id, name) 
    362363                    wx.EVT_MENU(self, wx_id, self._onEditSlicer) 
    363364            slicerpop.AppendSeparator() 
     
    530531 
    531532        """ 
    532         ## Clear current slicer 
     533        # Clear current slicer 
    533534        if not self.slicer == None: 
    534535            self.slicer.clear() 
    535         ## Create a new slicer 
     536        # Create a new slicer 
    536537        self.slicer_z += 1 
    537538        self.slicer = slicer(self, self.subplot, zorder=self.slicer_z) 
    538539        self.subplot.set_ylim(self.data2D.ymin, self.data2D.ymax) 
    539540        self.subplot.set_xlim(self.data2D.xmin, self.data2D.xmax) 
    540         ## Draw slicer 
     541        # Draw slicer 
    541542        self.update() 
    542543        self.slicer.update() 
     
    570571        npt = math.floor(npt) 
    571572        from sas.sascalc.dataloader.manipulations import CircularAverage 
    572         ## compute the maximum radius of data2D 
     573        # compute the maximum radius of data2D 
    573574        self.qmax = max(math.fabs(self.data2D.xmax), 
    574575                        math.fabs(self.data2D.xmin)) 
     
    576577                        math.fabs(self.data2D.ymin)) 
    577578        self.radius = math.sqrt(math.pow(self.qmax, 2) + math.pow(self.ymax, 2)) 
    578         ##Compute beam width 
     579        # Compute beam width 
    579580        bin_width = (self.qmax + self.qmax) / npt 
    580         ## Create data1D circular average of data2D 
     581        # Create data1D circular average of data2D 
    581582        Circle = CircularAverage(r_min=0, r_max=self.radius, 
    582583                                 bin_width=bin_width) 
     
    597598        new_plot.name = "Circ avg " + self.data2D.name 
    598599        new_plot.source = self.data2D.source 
    599         #new_plot.info = self.data2D.info 
     600        # new_plot.info = self.data2D.info 
    600601        new_plot.interactive = True 
    601602        new_plot.detector = self.data2D.detector 
    602603 
    603         ## If the data file does not tell us what the axes are, just assume... 
     604        # If the data file does not tell us what the axes are, just assume... 
    604605        new_plot.xaxis("\\rm{Q}", "A^{-1}") 
    605606        if hasattr(self.data2D, "scale") and \ 
     
    613614        new_plot.id = "Circ avg " + self.data2D.name 
    614615        new_plot.is_data = True 
    615         self.parent.update_theory(data_id=self.data2D.id, \ 
    616                                        theory=new_plot) 
     616        self.parent.update_theory(data_id=self.data2D.id, theory=new_plot) 
    617617        wx.PostEvent(self.parent, 
    618618                     NewPlotEvent(plot=new_plot, title=new_plot.name)) 
     
    627627 
    628628        """ 
    629         if self.slicer != None: 
    630             from SlicerParameters import SlicerParameterPanel 
     629        if self.slicer is not None: 
     630            from parameters_panel_slicer import SlicerParameterPanel 
    631631            dialog = SlicerParameterPanel(self, -1, "Slicer Parameters") 
    632632            dialog.set_slicer(self.slicer.__class__.__name__, 
     
    666666        params = self.slicer.get_params() 
    667667        ## Create a new panel to display results of summation of Data2D 
    668         from slicerpanel import SlicerPanel 
     668        from parameters_panel_boxsum import SlicerPanel 
    669669        win = MDIFrame(self.parent, None, 'None', (100, 200)) 
    670670        new_panel = SlicerPanel(parent=win, id=-1, 
     
    717717        Clear the slicer on the plot 
    718718        """ 
    719         if not self.slicer == None: 
     719        if self.slicer is not None: 
    720720            self.slicer.clear() 
    721721            self.subplot.figure.canvas.draw() 
     
    733733        """ 
    734734        event_id = str(evt.GetId()) 
    735         if self.parent != None: 
     735        if self.parent is not None: 
    736736            self._default_save_location = self.parent._default_save_location 
    737737        default_name = self.plots[self.graph.selected_plottable].label 
     
    756756        if default_name.count('.') > 0: 
    757757            default_name = default_name.split('.')[0] 
    758         #default_name += "_out" 
    759         if self.parent != None: 
     758        if self.parent is not None: 
    760759            self.parent.show_data2d(data, default_name) 
    761760 
    762761    def modifyGraphAppearance(self, e): 
    763         self.graphApp = graphAppearance(self, 'Modify graph appearance', legend=False) 
     762        self.graphApp = graphAppearance(self, 'Modify graph appearance', 
     763                                        legend=False) 
    764764        self.graphApp.setDefaults(self.grid_on, self.legend_on, 
    765765                                  self.xaxis_label, self.yaxis_label, 
Note: See TracChangeset for help on using the changeset viewer.