Skip to content

following a few pylinter suggestions #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LightSoar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

following a few pylinter suggestions #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions convert_gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@

author: Rohan Isaac
"""
# pylint: disable=too-many-instance-attributes, invalid-name

from __future__ import division, absolute_import, unicode_literals, print_function
from Tkinter import Tk, StringVar, DISABLED, NORMAL, END, W, E, N, S
from Tkinter import Tk, StringVar, W, E, N, S
from ttk import Frame, Label, Button, Radiobutton, Entry
import tkFileDialog
import spc
import os

import spc


class ConvertSPC:
class ConvertSPC(object):
def __init__(self, master):
self.master = master
master.title("Convert SPC files")
Expand Down
51 changes: 27 additions & 24 deletions spc/spc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@

author: Rohan Isaac
"""
# pylint: disable=too-many-instance-attributes, invalid-name

from __future__ import division, absolute_import, unicode_literals, print_function
import struct
import numpy as np

from .sub import subFile, subFileOld
from .sub import SubFile, SubFileOld
from .global_fun import read_subheader, flag_bits


class File:
class File(object):
"""
Starts loading the data from a .SPC spectral file using data from the
header. Stores all the attributes of a spectral file:
Expand Down Expand Up @@ -166,10 +167,9 @@ def __init__(self, filename):
# if global x data is given
x_dat_pos = self.head_siz
x_dat_end = self.head_siz + (4 * self.fnpts)
self.x = np.array(
[struct.unpack_from(
'f', content[x_dat_pos:x_dat_end], 4 * i)[0]
for i in range(0, self.fnpts)])
content_to_unpack = content[x_dat_pos:x_dat_end]
unpack = lambda i: struct.unpack_from('f', content_to_unpack, 4 * i)[0]
self.x = np.array([unpack(i) for i in range(0, self.fnpts)])
sub_pos = x_dat_end
else:
# otherwise generate them
Expand All @@ -183,10 +183,11 @@ def __init__(self, filename):
self.directory = True
# loop over entries in directory
for i in range(0, self.fnsub):
ssfposn, ssfsize, ssftime = struct.unpack(
'<iif'.encode('utf8'), content[self.fnpts + (i * 12):self.fnpts + ((i + 1) * 12)])
# add sufile, load defaults for npts and exp
self.sub.append(subFile(content[ssfposn:ssfposn + ssfsize], 0, 0, True, self.tsprec, self.tmulti))
unpack_fmt = '<iif'.encode('utf8')
unpack_content = content[self.fnpts + (i * 12):self.fnpts + ((i + 1) * 12)]
ssfposn, ssfsize, ssftime = struct.unpack(unpack_fmt, unpack_content)
# add subfile, load defaults for npts and exp
self.sub.append(SubFile(content[ssfposn:ssfposn + ssfsize], 0, 0, True, self.tsprec, self.tmulti))

else:
# don't have directory, for each subfile
Expand All @@ -205,7 +206,7 @@ def __init__(self, filename):

sub_end = sub_pos + dat_siz
# read into object, add to list
self.sub.append(subFile(content[sub_pos:sub_end],
self.sub.append(SubFile(content[sub_pos:sub_end],
self.fnpts, self.fexp, self.txyxys, self.tsprec, self.tmulti))
# update positions
sub_pos = sub_end
Expand Down Expand Up @@ -253,7 +254,7 @@ def __init__(self, filename):
elif self.fversn == b'\x4c':
# new MSB 1st
print("New MSB 1st, yet to be implemented")
pass # To be implemented
# TODO To be implemented

# --------------------------------------------
# OLD FORMAT
Expand Down Expand Up @@ -347,7 +348,7 @@ def __init__(self, filename):

# read into object, add to list
# send it pts since we have already figured that out
self.sub.append(subFileOld(
self.sub.append(SubFileOld(
content[sub_pos:sub_end], pts, self.oexp, self.txyxys))
# update next subfile postion, and index
sub_pos = sub_end
Expand Down Expand Up @@ -575,8 +576,10 @@ def data_txt(self, delimiter='\t', newline='\n'):
dat += newline
return dat

# Writes out data to a stream (significantly faster than appending to a string)
def stream_data_txt(self, stream, delimiter='\t', newline='\n'):
"""Writes out data to a stream
(significantly faster than appending to a string)
"""
if self.fnsub == 1:
if self.dat_fmt.endswith('-xy'):
x = self.sub[0].x
Expand Down Expand Up @@ -652,6 +655,15 @@ def plot(self):
plt.ylabel(self.ylabel)
return plt.gcf()

@staticmethod
def version_character_to_string(char):
"""Returns a string representation of the file version"""
ordinal = ord(char)
return "new LSB 1st" if ordinal == 0x4b else \
"new MSB 1st" if ordinal == 0x4c else \
"old format" if ordinal == 0x4d else \
"unknown version"

def debug_info(self):
"""
Interpret flags and header information to debug more about the file
Expand Down Expand Up @@ -683,16 +695,7 @@ def debug_info(self):

print('----\n')
# spc format version
if self.fversn == chr(0x4b):
self.pr_versn = "new LSB 1st"
elif self.fversn == chr(0x4c):
self.pr_versn = "new MSB 1st"
elif self.fversn == chr(0x4d):
self.pr_versn = "old format"
else:
self.pr_versn = "unknown version"

print("Version:", self.pr_versn)
print("Version:", self.version_character_to_string(self.fversn))

# subfiles
if self.fnsub == 1:
Expand Down
12 changes: 5 additions & 7 deletions spc/sub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

author: Rohan Isaac
"""
# pylint: disable=too-many-instance-attributes, invalid-name

from __future__ import division, absolute_import, unicode_literals, print_function

Expand All @@ -12,7 +13,7 @@
from .global_fun import read_subheader


class subFile:
class SubFile(object):
"""
Processes each subfile passed to it, extracts header information and data
information and places them in data members
Expand Down Expand Up @@ -52,13 +53,10 @@ def __init__(self, data, fnpts, fexp, txyxy, tsprec, tmulti):
# Choosing exponent
# -----------------
# choose local vs global exponent depending on tmulti
if not tmulti:
exp = fexp
else:
exp = self.subexp
exp = fexp if not tmulti else self.subexp

# Make sure it is reasonable, if it out of range zero it
if not (-128 < exp <= 128):
if not -128 < exp <= 128:
exp = 0

# --------------------------
Expand Down Expand Up @@ -103,7 +101,7 @@ def __init__(self, data, fnpts, fexp, txyxy, tsprec, tmulti):
self.y = (2**(exp - 32)) * y_raw


class subFileOld:
class SubFileOld(object):
"""
Processes each subfile passed to it, extracts header information and data
information and places them in data members.
Expand Down