Commit b9427f75 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

atariplot improvements, regex bug

parent ec4fd722

pysen/io/reader.py

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ from .. import ANGSTROM 


# NOTE: if '-' has to be a part of a RE it must be at the end

_RE_COMMENT  = re.compile(r'^c\s')                    # comments start with c and space

_RE_TOKEN    = re.compile(r'[\w\d\.+-][[\w\d\.\/+-]*') # tokens (ignore , = and whitespace)

_RE_TOKEN    = re.compile(r'[\w\d\.+-][\w\d\.\/+-]*') # tokens (ignore , = and whitespace)

_RE_KEYWORD  = re.compile(r'(^|\s)([A-z_]\w*)')       # keyword a token that starts with a letter

pysen/revision.py

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
PySEN revision module

"""

import sys

__version__  = "0.7.1"

__version__  = "0.7.2"

__release__  = "dev1"

__date__     = "Feb 13, 2019"

#

scripts/atariplot.py

+15 −1
Original line number Diff line number Diff line 
#!/usr/bin/env python

"ATARI Plot"



import os.path

import logging



import numpy as np

import h5py
@@ -8,6 +10,7 @@ import matplotlib.pyplot as plt 




from pysen import ANGSTROM, NANOSECOND

from pysen.io import echo_to_hdf

from pysen.atarilib import fit_echo_current, Spectrum
@@ -135,6 +138,7 @@ def main(): 
    import argparse



    parser = argparse.ArgumentParser(description='atari plot')

    parser.set_defaults(outdir='.', loglevel=logging.INFO)

    parser.add_argument('file', metavar='filename', help='file to process', nargs='+')

    parser.add_argument('--echo',  '-e',  dest='echo', type=int,   default=None,

                        help='set echo to display (default=%(default)s)')
@@ -146,9 +150,19 @@ def main(): 
                        help='show only echo (no up/down)')

    args = parser.parse_args()



    logging.basicConfig(level=args.loglevel, format=r'%(message)s')

    log = logging.getLogger()



    kwargs = vars(args)

    for filename in args.file:

        with h5py.File(filename, 'r') as hdf5file:

        basename , ext = os.path.splitext(os.path.basename(filename))

        if ext==".echo":

            log.info('converting %s to HDF', basename)

            hfile = echo_to_hdf(filename, args.outdir)

        else:

            hfile = filename



        with h5py.File(hfile, 'r') as hdf5file:

            atari_plot(hdf5file, iecho=args.echo, **kwargs)

    plt.show()