Skip to content

Commit

Permalink
clean: move code between legacy comment blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
gschnabel committed Mar 18, 2022
1 parent e79557d commit ee5f7b9
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions source/GMAP.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@
def run_GMA_program(dbfile='data.gma', resfile='gma.res', plotfile='plot.dta',
dbtype='legacy', format_dic={}):

# BEGIN LEGACY
file_IO4 = open(resfile, 'w')
file_IO5 = open(plotfile, 'w')
# END LEGACY

LABL = init_labels()
compmap = CompoundMap()

if dbtype == 'legacy':
Expand Down Expand Up @@ -115,19 +116,21 @@ def run_GMA_program(dbfile='data.gma', resfile='gma.res', plotfile='plot.dta',
upd_vals = upd_res['upd_vals']
upd_covmat = upd_res['upd_covmat']


# BEGIN LEGACY
fismask = priortable['NODE'] == 'fis'
invfismask = np.logical_not(fismask)
red_upd_covmat = upd_covmat[np.ix_(invfismask, invfismask)]
red_upd_vals = upd_vals[invfismask]

# BEGIN LEGACY
for datablock in datablock_list:
add_compinfo_to_datablock(datablock, APR, MPPP)

update_effDCS_values(datablock_list, effuncs)
gauss = create_gauss_structure(APR, datablock_list,
red_upd_vals, red_upd_covmat)

LABL = init_labels()
write_iteration_info(APR, datablock_list, gauss,
priortable, exptable,
MODREP, MODAP, MPPP, IPP, LABL, file_IO4, file_IO5)
Expand Down

0 comments on commit ee5f7b9

Please sign in to comment.