Skip to content

Commit

Permalink
Changed ParamTable constructor.
Browse files Browse the repository at this point in the history
Signed-off-by: Timothy Click <tcthepoet@yahoo.com>
  • Loading branch information
Timothy Click committed Oct 25, 2017
1 parent 0df0218 commit b246525
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
5 changes: 1 addition & 4 deletions src/fluctmatch/analysis/paramtable.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,17 @@ class ParamTable(object):
"""Create a parameter table time series for distance or coupling strength.
"""
def __init__(self, data_dir, prefix="fluctmatch", tbltype="Kb", ressep=3):
def __init__(self, prefix="fluctmatch", tbltype="Kb", ressep=3):
"""
Parameters
----------
data_dir : str
Parent directory for parameter files
prefix : str, optional
Filename prefix for files
tbltype : {"Kb", "b0"}, optional
Table to create (coupling strength or bond distance)
ressep : int, optional
Number of residues to exclude from interactions.
"""
self._datadir = data_dir
self._prefix = prefix
self._tbltype = tbltype
self._ressep = ressep
Expand Down
4 changes: 2 additions & 2 deletions src/fluctmatch/commands/cmd_diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ def cli(outdir, ressep, table1, table2):
-------
"""
table_1 = paramtable.ParamTable(outdir, ressep=ressep)
table_1 = paramtable.ParamTable(ressep=ressep)
table_1.from_file(table1)

table_2 = paramtable.ParamTable(outdir, ressep=ressep)
table_2 = paramtable.ParamTable(ressep=ressep)
table_2.from_file(table2)

d_table = table_1 - table_2
Expand Down
2 changes: 1 addition & 1 deletion src/fluctmatch/commands/cmd_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
is_flag=True,
)
def cli(data_dir, outdir, prefix, tbltype, ressep, verbose):
pt = paramtable.ParamTable(data_dir, prefix=prefix, tbltype=tbltype, ressep=ressep)
pt = paramtable.ParamTable(prefix=prefix, tbltype=tbltype, ressep=ressep)
pt.run(verbose=verbose)

# Write the various tables to different files.
Expand Down

0 comments on commit b246525

Please sign in to comment.