From 8c2056041aafea146fa58bb56d65d0789e70e66f Mon Sep 17 00:00:00 2001
From: Alexandar Mechev <apmechev@loui.grid.sara.nl>
Date: Mon, 9 May 2016 12:29:33 +0200
Subject: [PATCH] Fixed bug with custom parset as well as empty lines in custom
parset
---
FAD_v7/Application/sandbox/scripts.tar | Bin 184320 -> 184320 bytes
.../Application/sandbox/scripts/avg_dmx_v2.py | 5 +++--
fad.py | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/FAD_v7/Application/sandbox/scripts.tar b/FAD_v7/Application/sandbox/scripts.tar
index fd15f08e6b4f0bd19be82a0ad13e0780ce4ba0c9..b50eb559d109f1d8caccfbd05742681035fecb0a 100644
GIT binary patch
delta 514
zcmZozz}>KbdqR((iGi7+iLn`jfuWJPp*e$s>EuA3lx9Z8c1A|V?Tm~}-LYUL=B7pr
z28Jdk28K{2+Zp4Tx)}vc3``A-P0bk$49$&9j2ILQK-#x6CNi;ePUq-gs+BM{WB{3L
zVqj)qVq(f*U}$P=WC~Z;$+Sms`kq-#=>i3bMa8KlItogec_sM@N;=z>XEVKGobETD
zNo>3BT&6P|)3TUaB#lkr#z9?eW@uy%H!hoLEu*NFf^uehUVc%kLTYY7Nu@$gW?pLX
z^tZK4Qq%Y3FmX@6(!wM>Jujb0dAegAlgRV~`AodiWpbH#89ApH6f=oWcgSVp0Vxuk
z9+S(YGu^e0NdTmXYx=@mCgJH7bxiWxFXl3tGn#O6auyV2=9PeL;Ns-u%uG|rNzKy$
zS*U4ejNKjj^-TI8cW_K!Sj40^Ju9C{oso0;#C)azM$YMuWlU1jf9EsFGIBzsqjH&K
zc=Jn3e1o;sWAfBBxxh+|rY|U9l8305o37TtWHWtD4O8*<?n0(gvCR{d3Rnpe-OK=f
C@0NoA
delta 411
zcmZozz}>KbdqR((fw_^Pk%2LTfuWJPff<8>>EuA3lx9Z8c1A|V?Tm~}-LZlOCgz4l
zW~K}Vh9)KkhEOHj8RMC{8Ik17jZBOg6bwMxw=*U(v2#x6=wPamG&DD1Ff=kZGys`l
zWWZoxXl7_+3Rl?4w3c!DiwR78)9-dMaZi7<h>3T)z+xuW>1TVHRHiF*GwCp;=1hM$
zfk~7jw>ZDFM9GS4dTuw9!*u0tCdui?yP1T!Qgez^t++TjIXR~nE@Tqk{<E9OoN@Ze
z2~4^mGufw4S-@ljGERB=i|I^8(+_kru}|0PV-lafcOsKME7;WO6BjTUPhZu?qy|yL
z+|MKrl9rl&U<%Ww?H~G?O2wvSF||q<89_Y*3N%9o14C0|Lxiuhnf3@y-&ezww%w$b
g=@lbKeo}E}indbxcA0vnCmfq6C>5|0B)&5P0H)}ETmS$7
diff --git a/FAD_v7/Application/sandbox/scripts/avg_dmx_v2.py b/FAD_v7/Application/sandbox/scripts/avg_dmx_v2.py
index ef1b69f3..5c2afc25 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 536f6bd2..9a8c6e98 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/")
--
GitLab