Skip to content

Commit

Permalink
Merge pull request #60 from JPHammonds/master
Browse files Browse the repository at this point in the history
Add new plugin test for XPCS plugin
  • Loading branch information
prjemian committed Aug 29, 2016
2 parents 37731e9 + 908ead6 commit 3198c2e
Show file tree
Hide file tree
Showing 40 changed files with 208,903 additions and 208,858 deletions.
78 changes: 39 additions & 39 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
*.py[cod]

# output from this program
src/spec2nexus/data/*.hdf5

# C extensions
*.so

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
lib
lib64
__pycache__

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox
nosetests.xml

# Translations
*.mo

# Mr Developer
.mr.developer.cfg
/.settings
/src/spec2nexus/__plots__
*.py[cod]

# output from this program
src/spec2nexus/data/*.hdf5

# C extensions
*.so

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
lib
lib64
__pycache__

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox
nosetests.xml

# Translations
*.mo

# Mr Developer
.mr.developer.cfg
/.settings
/src/spec2nexus/__plots__
18 changes: 8 additions & 10 deletions .pydevproject
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?>

<pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}/src</path>
</pydev_pathproperty>
</pydev_project>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Anaconda-Stock</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}/src</path>
</pydev_pathproperty>
</pydev_project>
182 changes: 91 additions & 91 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,91 +1,91 @@
..
This file describes user-visible changes between the versions.
Change History
##############

Production
**********

:2016.0615.1: `issue #57 <https://github.com/prjemian/spec2nexus/issues/57>`_: keep information from unrecognized control lines,
`issue #56 <https://github.com/prjemian/spec2nexus/issues/56>`_: add *specplot* support,
`issue #55 <https://github.com/prjemian/spec2nexus/issues/55>`_: accept arbitrary number of MCA spectra
:2016.0601.0: match complete keys, use unix EOL internally, do not fail if no metadata
:2016.0216.0: `issue #36 <https://github.com/prjemian/spec2nexus/issues/36>`_: identify NIAC2014-compliant NeXus files
:2016.0210.0: bugfix: eznx.makeGroup() now correctly sets attributes on new group + documentation for NIAC2014 attributes
:2016.0204.0: (`#45 <https://github.com/prjemian/spec2nexus/issues/45>`_) handle case when no data points in scan ,
(`#46 <https://github.com/prjemian/spec2nexus/issues/46>`_) spec.getScan() ensures argument is used as ``str``
:2016.0201.0: added spec.getScanNumbersChronological(), spec.getFirstScanNumber(), and spec.getLastScanNumber()
:2016.0131.0: support new NeXus method for default/signal/axes/_indices,
`issue #43 <https://github.com/prjemian/spec2nexus/issues/43>`_
:2016.0130.0: fixed `issue #44 <https://github.com/prjemian/spec2nexus/issues/44>`_
:2015.1221.1: added versioneer support (`issue #40 <https://github.com/prjemian/spec2nexus/issues/40>`_)
:2015.1221.0: read scans with repeated scan numbers
(`issue #39 <https://github.com/prjemian/spec2nexus/issues/39>`_)
:2015.0822.0: extractSpecScan: add option to report scan heading data, such as positioners and Q
:2015.0214.0: h5toText: handle HDF5 'O' data type (variable length strings)
:2015.0127.0: spec: ignore bad data lines
:2015.0125.0: spec: change handling of #L & #X, refactor detection of scanNum and scanCmd
:2015.0113.0: dropped requirement of *lxml* package
:2014.1228.1: spec: build mne:name cross-references for counters and positioners
:2014.1228.0: show version in documentation
:2014.1028.0: spec: quietly ignore unrecognized scan content *for now*
:2014.1027.1: spec: major changes in SPEC file support: **custom plugins**

* **spec** based on plugins for each control line, users can add plugins
* declared **prjPySpec** module as legacy, code is frozen at *2014.0623.0* release
* added **spec** module to replace **prjPySpec**

:2014.0623.0: updated argparse settings
:2014.0622.2: added extractSpecScan.py to the suite from the USAXS project
:2014.0410.0: restore scan.fileName variable to keep interface the same for some legacy clients
:2014.0404.1: fix sdist utf8 problem, see: http://bugs.python.org/issue11638
:2014.0404.0: tree_api_parser moved back into NeXpy project
:2014.0320.6: handle multiple header sections in SPEC data file
:2014.0320.5: fix the new project URL
:2014.0320.4: Sphinx cannot build PDF with code-block in a footnote
:2014.0320.3: note the new home URL in the packaging, too, drop nexpy requirement, default docs theme
:2014.0320.2: tree_api_parse will go back into nexpy project, remove docs of it here
:2014.0320.1: allow readthedocs to build Sphinx without extra package requirements
:2014.0320.0:

* new home page at http://spec2nexus.readthedocs.org, easier to publish there
* move common methods from __init__.py so docs will build at readthedocs.org
* new test case fails existing SPEC reader, ignore blank lines

:2014.03.11: documentation
:2014.03.09: h5toText: option to suppress printing of attributes, put URLs in command-line usage documentation, better test of is_spec_file()
:2014.03.08: fixed string writer and content display bug in eznx, added h5toText.py, prjPySpec docs improved again
:2014.03.051: prjPySpec now handles SPEC v6 data file header additions, add new getScanCommands() method
:2014.03.04: (2014_Mardi_Gras release) removed nexpy project requirement from setup, prjPySpec raises exceptions now
:2014.03.02: drops nexus tree API (and its dependencies) in favor of native h5py writer

Development: GitHub repository
******************************

:2014.02.20: version number fits PEP440, LICENSE file included in sdist, more documentation and examples
:2014-02-19: reference published documentation (re-posted)
:2014-02-19: add documentation framework
:2014-02-18: fork to GitHub to make generally available

Development: NeXpy branch
*************************

:2014-01: briefly, a branch in https://github.com/nexpy/nexpy

* spec2nexus added during this phase
* relies on nexpy.api.nexus for NeXus support

Production: USAXS livedata
**************************

:2010-2014: production use

* support livedata WWW page of APS USAXS instrument

* (http://usaxs.xray.aps.anl.gov/livedata/),

* https://subversion.xray.aps.anl.gov/trac/small_angle/browser/USAXS/livedata/prjPySpec.py
* converted from Tcl

:2000-2010: Tcl code (*readSpecData.tcl*) in production use at APS sectors 32, 33, & 34
..
This file describes user-visible changes between the versions.
Change History
##############

Production
**********

:2016.0615.1: `issue #57 <https://github.com/prjemian/spec2nexus/issues/57>`_: keep information from unrecognized control lines,
`issue #56 <https://github.com/prjemian/spec2nexus/issues/56>`_: add *specplot* support,
`issue #55 <https://github.com/prjemian/spec2nexus/issues/55>`_: accept arbitrary number of MCA spectra
:2016.0601.0: match complete keys, use unix EOL internally, do not fail if no metadata
:2016.0216.0: `issue #36 <https://github.com/prjemian/spec2nexus/issues/36>`_: identify NIAC2014-compliant NeXus files
:2016.0210.0: bugfix: eznx.makeGroup() now correctly sets attributes on new group + documentation for NIAC2014 attributes
:2016.0204.0: (`#45 <https://github.com/prjemian/spec2nexus/issues/45>`_) handle case when no data points in scan ,
(`#46 <https://github.com/prjemian/spec2nexus/issues/46>`_) spec.getScan() ensures argument is used as ``str``
:2016.0201.0: added spec.getScanNumbersChronological(), spec.getFirstScanNumber(), and spec.getLastScanNumber()
:2016.0131.0: support new NeXus method for default/signal/axes/_indices,
`issue #43 <https://github.com/prjemian/spec2nexus/issues/43>`_
:2016.0130.0: fixed `issue #44 <https://github.com/prjemian/spec2nexus/issues/44>`_
:2015.1221.1: added versioneer support (`issue #40 <https://github.com/prjemian/spec2nexus/issues/40>`_)
:2015.1221.0: read scans with repeated scan numbers
(`issue #39 <https://github.com/prjemian/spec2nexus/issues/39>`_)
:2015.0822.0: extractSpecScan: add option to report scan heading data, such as positioners and Q
:2015.0214.0: h5toText: handle HDF5 'O' data type (variable length strings)
:2015.0127.0: spec: ignore bad data lines
:2015.0125.0: spec: change handling of #L & #X, refactor detection of scanNum and scanCmd
:2015.0113.0: dropped requirement of *lxml* package
:2014.1228.1: spec: build mne:name cross-references for counters and positioners
:2014.1228.0: show version in documentation
:2014.1028.0: spec: quietly ignore unrecognized scan content *for now*
:2014.1027.1: spec: major changes in SPEC file support: **custom plugins**

* **spec** based on plugins for each control line, users can add plugins
* declared **prjPySpec** module as legacy, code is frozen at *2014.0623.0* release
* added **spec** module to replace **prjPySpec**

:2014.0623.0: updated argparse settings
:2014.0622.2: added extractSpecScan.py to the suite from the USAXS project
:2014.0410.0: restore scan.fileName variable to keep interface the same for some legacy clients
:2014.0404.1: fix sdist utf8 problem, see: http://bugs.python.org/issue11638
:2014.0404.0: tree_api_parser moved back into NeXpy project
:2014.0320.6: handle multiple header sections in SPEC data file
:2014.0320.5: fix the new project URL
:2014.0320.4: Sphinx cannot build PDF with code-block in a footnote
:2014.0320.3: note the new home URL in the packaging, too, drop nexpy requirement, default docs theme
:2014.0320.2: tree_api_parse will go back into nexpy project, remove docs of it here
:2014.0320.1: allow readthedocs to build Sphinx without extra package requirements
:2014.0320.0:

* new home page at http://spec2nexus.readthedocs.org, easier to publish there
* move common methods from __init__.py so docs will build at readthedocs.org
* new test case fails existing SPEC reader, ignore blank lines

:2014.03.11: documentation
:2014.03.09: h5toText: option to suppress printing of attributes, put URLs in command-line usage documentation, better test of is_spec_file()
:2014.03.08: fixed string writer and content display bug in eznx, added h5toText.py, prjPySpec docs improved again
:2014.03.051: prjPySpec now handles SPEC v6 data file header additions, add new getScanCommands() method
:2014.03.04: (2014_Mardi_Gras release) removed nexpy project requirement from setup, prjPySpec raises exceptions now
:2014.03.02: drops nexus tree API (and its dependencies) in favor of native h5py writer

Development: GitHub repository
******************************

:2014.02.20: version number fits PEP440, LICENSE file included in sdist, more documentation and examples
:2014-02-19: reference published documentation (re-posted)
:2014-02-19: add documentation framework
:2014-02-18: fork to GitHub to make generally available

Development: NeXpy branch
*************************

:2014-01: briefly, a branch in https://github.com/nexpy/nexpy

* spec2nexus added during this phase
* relies on nexpy.api.nexus for NeXus support

Production: USAXS livedata
**************************

:2010-2014: production use

* support livedata WWW page of APS USAXS instrument

* (http://usaxs.xray.aps.anl.gov/livedata/),

* https://subversion.xray.aps.anl.gov/trac/small_angle/browser/USAXS/livedata/prjPySpec.py
* converted from Tcl

:2000-2010: Tcl code (*readSpecData.tcl*) in production use at APS sectors 32, 33, & 34
60 changes: 30 additions & 30 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
spec2nexus
##########

Converts SPEC data files and scans into NeXus HDF5 files

:author: Pete R. Jemian
:email: prjemian@gmail.com
:copyright: 2014-2016, Pete R. Jemian
:license: Creative Commons Attribution 4.0 International Public License (see *LICENSE.txt*)
:URL: http://spec2nexus.readthedocs.io
:git: https://github.com/prjemian/spec2nexus
:PyPI: https://pypi.python.org/pypi/spec2nexus/
:Ohloh: http://ohloh.net/p/spec2nexus

Provides
########

* **spec2nexus** : command-line tool: Convert SPEC data files to NeXus HDF5
* **h5toText** : command-line tool: Print the structure of an HDF5 file
* **extractSpecScan** : command-line tool: Save columns from SPEC data file scan(s) to TSV files
* **pySpec** : library: python binding to read SPEC [#]_ data files
* **prjPySpec** : library: legacy version of **pySpec**, frozen at version 2014.0623.0
* **eznx** : library: (Easy NeXus) supports writing NeXus [#]_ HDF5 [#]_ files using h5py [#]_
* **specplot** : command-line tool: plot a SPEC scan to an image file
* **specplot_gallery** : command-line tool: call **specplot** for all scans in a list of files, makes a web gallery

.. [#] http://certif.com
.. [#] http://nexusformat.org
.. [#] http://hdfgroup.org
.. [#] http://h5py.org
spec2nexus
##########

Converts SPEC data files and scans into NeXus HDF5 files

:author: Pete R. Jemian
:email: prjemian@gmail.com
:copyright: 2014-2016, Pete R. Jemian
:license: Creative Commons Attribution 4.0 International Public License (see *LICENSE.txt*)
:URL: http://spec2nexus.readthedocs.io
:git: https://github.com/prjemian/spec2nexus
:PyPI: https://pypi.python.org/pypi/spec2nexus/
:Ohloh: http://ohloh.net/p/spec2nexus

Provides
########

* **spec2nexus** : command-line tool: Convert SPEC data files to NeXus HDF5
* **h5toText** : command-line tool: Print the structure of an HDF5 file
* **extractSpecScan** : command-line tool: Save columns from SPEC data file scan(s) to TSV files
* **pySpec** : library: python binding to read SPEC [#]_ data files
* **prjPySpec** : library: legacy version of **pySpec**, frozen at version 2014.0623.0
* **eznx** : library: (Easy NeXus) supports writing NeXus [#]_ HDF5 [#]_ files using h5py [#]_
* **specplot** : command-line tool: plot a SPEC scan to an image file
* **specplot_gallery** : command-line tool: call **specplot** for all scans in a list of files, makes a web gallery

.. [#] http://certif.com
.. [#] http://nexusformat.org
.. [#] http://hdfgroup.org
.. [#] http://h5py.org

0 comments on commit 3198c2e

Please sign in to comment.