Skip to content

Commit

Permalink
Merge branch 'refactored-loaders' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
markjonestx committed Jul 24, 2017
2 parents 542ed54 + cbfed15 commit ef31a27
Show file tree
Hide file tree
Showing 15 changed files with 877 additions and 360 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -10,13 +10,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
- Process Plugin support for List Data
- Adds Exception handling to Processes
- PyMask support for multiple masking files.
- PyFit will now filter out events if the Bin value is 0
### Changed
- Removed previous_event from Process Interface
- Duplex Pipes are used over Simplex Pipes for Duplex Processes
- Changes get_file_length to using a binary buffered search.
- Moved PyPWA.core.shared to PyPWA.libs
- Split interface's plugins and internals to their own separate file based
on the interfaces purpose.
- PyFit no longer assumes bins are named 'BinN' you must specify Bin names
in 'internal data'.
### Fixed
- PyFit will now shutdown correctly when killed with Ctrl-C or other
interrupt.
Expand Down
2 changes: 1 addition & 1 deletion PyPWA/progs/shell/__init__.py
Expand Up @@ -21,7 +21,7 @@
---------------------------------------
- fit - The package that contains PyFit
- simulate - The package that contains PySimulate
- loaders - Module that loads the data and functions for both programs
- loaders - Package that loads the data and functions for both programs
- pyshell_functions - Contains the example functions for PyFit and PySimulate
- shell types - The static typing information for the expected user's
functions.
Expand Down
295 changes: 0 additions & 295 deletions PyPWA/progs/shell/loaders.py

This file was deleted.

32 changes: 32 additions & 0 deletions PyPWA/progs/shell/loaders/__init__.py
@@ -0,0 +1,32 @@
# coding=utf-8
#
# PyPWA, a scientific analysis toolkit.
# Copyright (C) 2016 JLab
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

"""
Data and Function Loading for the PyShell
-----------------------------------------
- data_loader - Loads in all data for PyShell
- function_loading - loads in the users functions.
"""

from PyPWA import AUTHOR, VERSION
from PyPWA.progs.shell.loaders.data_loader.load import DataLoading
from PyPWA.progs.shell.loaders._function_loading import FunctionLoader

__credits__ = ["Mark Jones"]
__author__ = AUTHOR
__version__ = VERSION

0 comments on commit ef31a27

Please sign in to comment.