diff --git a/FAD_v7/Application/sandbox/scripts.tar b/FAD_v7/Application/sandbox/scripts.tar index fd15f08e6b4f0bd19be82a0ad13e0780ce4ba0c9..b50eb559d109f1d8caccfbd05742681035fecb0a 100644 Binary files a/FAD_v7/Application/sandbox/scripts.tar and b/FAD_v7/Application/sandbox/scripts.tar differ diff --git a/FAD_v7/Application/sandbox/scripts/avg_dmx_v2.py b/FAD_v7/Application/sandbox/scripts/avg_dmx_v2.py index ef1b69f3f3658b13feb7e69d7e731a41e66b5dd6..5c2afc25d8675fbe4baaedcad2b6c8241b2613d4 100644 --- a/FAD_v7/Application/sandbox/scripts/avg_dmx_v2.py +++ b/FAD_v7/Application/sandbox/scripts/avg_dmx_v2.py @@ -138,11 +138,12 @@ print 'Flag/Avg of:', infile ndppp_fa_parset = infile + '_fa.parset' os.system('rm ' + ndppp_fa_parset) + obsid=infile.split("_")[0] print "OBSID is "+ obsid import infile_script -print "Processing parset:", ndppp_fa_parset +print "Processing parset:", parset, "into ",ndppp_fa_parset if not ".parset" in parset: shutil.copy("parsets/default.parset",ndppp_fa_parset) @@ -153,7 +154,7 @@ if not ".parset" in parset: infile_script.dodmx(ndppp_fa_parset,do_demix) infile_script.selectnl(ndppp_fa_parset,select_nl) else: - shutil.copy("parsets/"+obsid+"_"+parset,ndppp_fa_parset) + shutil.copy("parsets/"+parset,ndppp_fa_parset) infile_script.msinmsout(ndppp_fa_parset,infile) #-------------------------------------------------- diff --git a/fad.py b/fad.py index 536f6bd21f55e07aa3f7fcb5f1a487df9a33f726..9a8c6e98a750253693832b25f5f41810d27b72ea 100644 --- a/fad.py +++ b/fad.py @@ -130,7 +130,7 @@ shutil.copy("srmlist",fadir+"/Staging/datasets/"+obsid) shutil.copy("subbandlist",fadir+"/Staging/datasets/"+obsid) if not ((len(parsetfile)<4) or ("fault" in parsetfile) or parsetfile=="DEFAULT"): - shutil.copy(fadir+"/parsets/"+parsetfile,fadir+"/Application/sandbox/scripts/parsets/"+obsid+"_"+parsetfile) + shutil.copy(fadir+"/parsets/"+parsetfile,fadir+"/Application/sandbox/scripts/parsets/")