From 2284dbff3cea8d25fb1e54ec6070a8025953d26e Mon Sep 17 00:00:00 2001 From: Wouter Klijn <klijn@astron.nl> Date: Wed, 11 Mar 2015 14:47:26 +0000 Subject: [PATCH] Task #7491: Use correct comparison for longbaseline. Add some comment in the target pipeline test. Why choices were made --- .../long_baseline_pipeline_test.py | 4 ++-- .../test/regression_tests/target_pipeline.py | 2 ++ CEP/Pipeline/visual_studio/Pipeline.v12.suo | Bin 59392 -> 69120 bytes 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CEP/Pipeline/test/regression_tests/long_baseline_pipeline_test.py b/CEP/Pipeline/test/regression_tests/long_baseline_pipeline_test.py index 4daa3d5fad0..df873f32d29 100644 --- a/CEP/Pipeline/test/regression_tests/long_baseline_pipeline_test.py +++ b/CEP/Pipeline/test/regression_tests/long_baseline_pipeline_test.py @@ -8,12 +8,12 @@ def load_and_compare_data_sets(ms1, ms2): ms2 = pt.table(ms2) #get the amount of rows in the dataset - n_row = len(ms1.getcol('DATA')) + n_row = len(ms1.getcol('CORRECTED_DATA')) n_complex_vis = 4 # create a target array with the same length as the datacolumn div_array = numpy.zeros((n_row, 1, n_complex_vis), dtype=numpy.complex64) - ms1_array = ms1.getcol('DATA') + ms1_array = ms1.getcol('CORRECTED_DATA') ms2_array = ms2.getcol('CORRECTED_DATA') div_max = 0 diff --git a/CEP/Pipeline/test/regression_tests/target_pipeline.py b/CEP/Pipeline/test/regression_tests/target_pipeline.py index 4979b9dfb7c..35bedbbc18f 100644 --- a/CEP/Pipeline/test/regression_tests/target_pipeline.py +++ b/CEP/Pipeline/test/regression_tests/target_pipeline.py @@ -14,6 +14,8 @@ def load_and_compare_data_sets(ms1, ms2): # create a target array with the same length as the datacolumn div_array = numpy.zeros((n_row, 1, n_complex_vis), dtype=numpy.complex64) ms1_array = ms1.getcol('DATA') + # TODO: WHy are different collomns compared? + # is this an issue in the test dataset?? ms2_array = ms2.getcol('CORRECTED_DATA') div_max = 0 diff --git a/CEP/Pipeline/visual_studio/Pipeline.v12.suo b/CEP/Pipeline/visual_studio/Pipeline.v12.suo index 56f3673a5e8797278d3ad9d191e0d5b096c34799..fb2c7d5189a0e21f45af1bd459ae481ab5cb9050 100644 GIT binary patch delta 5278 zcmc&&3sjWH75-;|b)T?+E&>Y6Lqz1UJd_2|EG%qLL>>XO2`G;&0wR!QHzHsF<0B>> zD|=Nmk_0!NYB3`CrzdUCNrak*uSB3Wr#U%IqsKNmY15-d8%?Y9-euQp6jE){b~xY8 z+&lBn%zezgGqex8w0FDijGQIlIF4W|3XYRvgXlYBV`Ic~K?Ff;MBqT_PG%7-Wpg1& z5GYo^+!iP)9%h+f7A%vqU>r3afgg>5=h9HN0&WO$WJJ=0ciBl`cFB=3WO+ET+hUNI zil8D!+@=rgMTGQRL?VJVMexElElETC?KQQjOhMWQAwi%#oC>i9;ft7on2qp8&{$8b zaouDt1RHJ$l3^x-HV}YyC?X6&gTt|&gP4XWwDW|dna)xLOB-*<m=Xrue8dgdzXVZa zXP1;Cu^h1i@e{=3h$j%mh!Vs~#41E7q6|@ikReD~1J;#@)rcxYHKGQw7Ey~Z!hqB} zsRLUy+Jv<k@ibx`q6x7c(Tr$8v?4Yjo<X!B?!ax9gH|08s6;Pze6LYU9>%D?&PFBu zQLz~pu8O_eh?<4VlNtRGWJZUXBe6~WWJao~sIX0DB)@T(k@zIC-HbLX%CUbkE0Rl) z6{9##X)_~DK>p&6h(HvMn@jZnH>c)5HK#=~RY9IidLhxM29-pmASKbcA>X$#b0sqr z)F6<r+nBAA$mtFys)>uXci1`yaT-UbqlPPz>3Kw?<H!tz-u^`<){7Bz45)u8*4c<< zb~+d9JVd^oF2I_ORS{x2to88kEKPxask*a3q3A`P!(ZF6ZBgjpq#zcwpSePlBFolR z3tZu*B1_K5%A^5Yb37I;;LV=Pm>U;}ObGZW7}Np@T=&YM&sYkWy~hI;1t7;aLNyXH z0emw%9D-wl<SZF!(%#(xk0Ig8FxJI@YN<a2L<M85vLj#;+Rx(tIvayuxGzx9L{v`T zJntYZBQw~Y&OCq6c$~6?rOPzPBVVR5wul-D=CB+Y1uCI4doJ7vYh!_6p8bMFmMKy? z^$8o1_|g}eWlLltY*IXNOb6Fx?QX>UE3B6<ku&lN@(@RVBrQUwpyIH#qyAs}m*GeE zFS}6RiNxbR7e1NKS^Wh6b+?m_yPZwx{8;Q_CW^<l!zN&wX7gDgB@uUKb51KcXA;sW zP6LH+AtA93m=-LXkK_WUez!-FxCysr&jD+65FG=zEad#%#t9D0cgsQQI)5v~M*s?? zMnvJ!u?aR4%*q@Y?MvXyo&h(Mco7Ifp05*M_#_g2-q7sR>_!Ld3%E7&A56#JSSDrG z2od!6HP0=_jMvB+I3uD0vs(k!(fGTb>zAz52X6^mw7kYM^sNE;2#3klTdYn^jfzXs zrw#*4?10=SBc&#s!HD_Mz?mSg&)0L`j=hbWMu-38mnCezo>ZG{`%bFoV!3&k`=YrI z_@US-0+FlpMvoyuN|pb*vtR}cyQ{wUh*~v5OMVl}=GW)9FbT!EJ#=s2V3EcOJqJ~m z#0yaHNT^t2E4qYH7)l#~XtR*tn^wi9kv2Et@MjU55StN!lzawCdst^_q$T(yob*{} z3Bfq$vk=-t+QDme8p>M5_huHc<BQrEyNu$uS(KR*nTIU?kmixv%){_Qj^oFEo610& z89l86HCu}|DM$U5aVBilb9Ja=Z>Z~1cxI*^Giv@>)LXLR;Dr+1qHdd>;mqOrkg!z& zxrzCce(&oUdaUY=kn@Tf>G|T;#5YaXY~RY`&^l_o6%}zh?h}W7LHltLbRQ0b)?WAN zjkuEv9I+*D$lO(Q*{t(By5*yi$c4P(!z)a2KezV^vxEo31057H%flZOJT~V=bcdnO zDOU5>!)448aGmMkMgSfPy3aWK8klmnv(N3)Re65B?NrCczvNyOhcDi8sAKD<aV-wD z#N8(ibZ*vw->1RQd!)#bBq)eG7H0oGNmxr27VUWUY(M16H))?^$Ky^hk#nvQkDmpc z7;a0mCe0}%(!=BwsZ&mYr}A2$ZmkB+4FvGRPpdtS>v0owJ#@$-`wR);xIc1`x9$n_ zes{k5xh}Wk0dF&SJ151WQn7eA5ECqC<nP}}&-MuTkm>pO(jew}(R9bEdt=zM&yVXl z?J;(e;e*E?va{nsn_UDSW=F8uJj)$pmVPhj+p2<7PmRK8<wlZb=H#IaZ@O@`YL<1c z60UA5ogixYvsuv5^%y8JS5A6r=+t?!P@WZz31DZMh!+*#WR~SJkd=nQ=+<aZ?0yD% zDrNBej;U~Atri+EoLmA{%kw+SWiGJNat>T`^>E1$%8ynC3)nDtuIYe=a@C|u`m+$+ z_s8H`sD<1$b$ArxT<}c<EO#+@)r7*XJy%eAEol9A!HzvbXz2SKHg&Z^Pk|cLeOlbb zr{LOv{R6$C-*D;p)+*+#?+V~rVKem9>*4jf8rznX>%u^BU^(=^<{kJZ-bAEmQ8Yf| z6uI`4Kw+p3L%cs9*mO~D{k^M`Q#{VtE?^gSv%~oNbM{O8{gt4b!Ph6wun+K{9hg); zUnqQ`5K4bG6V4u;#}5uA3;Yvs=@u@Pi^IEY2EIEJ@HZA84QX5=>>ipsMUQ+P7Y_@! z&w+1Fra<YdQ(<IVJ4I)o6pW9Qzv{R}czu)D1ulf4h*x>*pI0*JmzW(DxPXXzAAY+3 z8C+E<G?f`w8%z+<oxsi^bBDB|thTz`SZ1oOuOn{q?^t@W8vj~S<MbJc2^q0bX^9E( zQL(Y<>ZsI=*wiSsI#sPpQtS14UHpdDl<exp3Vn60p>Yx9?MtOKU{$x$ZI#K;XoAxH zbCZXE=!7xht*tGZw0KP%{zc7?Q^(P6Vxu&gL^bY4t=4N2=Orek$87+1;0*j>-!P(W zR;96QtzligaZPb;ePx-kp}N6P+-PoSs5hF5%gY)KMngq)0}Sko6uie^(0W?V;k~`T z{^hQ$z|GnTb+Zt4{KKW0^PtlB!o{P$tRC1qfw1a85UMsF(yd-Od(fngLQhnRTj@Wx z*;oLXQEW3~bi;a+(=MD1{KsxzrDHEt(}O4ikv^dUeSMs~Z53Ihwz|%M)33HqALU(M zT~~b1AUJU_fZhyu%Qb9a4uS3aJ09H19`d_JrxmLm0zKdipLF|qci!Cr$88&L^V|2= zGEcERbzou`Orka~eksI7TvL)T@VBp?)lPK!Tm@YEMEt2<<0sTvJ5`Ro(&>_X+kc;8 z=v9Rm0Di1zIg3bi+AUp^sZa`~yBd|R=H+ewqJE?HJ;o1Om9CI|NQ$r3DZcdosC(~= zTX1~-w|B;H$lKgRd4)ps)O+I)O%Cb<O2***BP!_M8wlD%1u*ntBtLlQk^oM;6kxj! z+s5_25+gPh)az^O%S>68BfUO4v(ad%GZp6-=yHp7_2p%?rs79)DKUD(g;yeNs;1k( z8oN^PUjN#N^C>y2g^sh&L&v@ZHxidYhP6d>MMwD__tkk?1KM{7q5ZO$2|=Qn|1aTG Br;`8x delta 3278 zcmdUxe^6Z2702IwEM&9$7Iyg^f?<P12_bYbELjkfM<9`eAImDiSTO~fUnoQxSp{Nb zaWoUhv<-V?QXO^Ts=+WxL-tMos6ho|C`PKW6Q_w&Ta(GCojOySLI<73?e{GE2&T2u zY5(fo`ON)s&b{y6bIv_?ea{(uXQK|}E*6p`$sk;;l4L-G``?5@As&l5;W;k)+6{iW zO31WW&X_+GbE4tX+OuK_dF2{9^%Eye%T>xU=$Zkhh3Eq%OEi)<%B^rWVa{;R570>j zT;jo1)`*lC^s$BTw|P<qhy&4pRTf5SZu9;Ypq~OvzzFQ%e!%kdNIegA3$Ouvw>m6j zg-i@A1~-B%kOt<1wSeVIBXthy<&idze=pK@pr#R1YHINuAuI6CN?7=%DbZFI5tgH7 zL1mvOWoZ>U)u0BrK`rorJHVZw4r~O?eV!FU>GLeK+=pHgXa&2l1f?5|^vD9oHLv(K zzBb1zWlFwygQjHnf8`fG1sB~v>{s>+kLk|jHv5GS#eQL5ahuCrzgRGC2ke(rz<!AZ z>=)LZ^$Yuf9mRgRAtFphy(rTDzw(QnO>sRO-aN*kN_Lao${n^b+m!DF)tb_+Y#=^A zpPP+JkC<{(m!XjhI1uvy2Vo=t?baf6ZUwwtB=AyuIPf^=*lg>-?Vtjz2OB^o&^O3& z$nEcn!+OZ?0-M0y;QK(IdoS9X=kz1vOG7`z;1;kIYy;cD4!{Z=&KwY(fQHPD8@kZw z2D<?(45EG%^Z*}SO{%0t7c$8qn_@U#HpWtS@&<*&NCD6fryQD0_C<4CJw#n88!X{) zV|85~&GA}KU)fHIZ|E2Cw_0CE{|)da;IH}<68pAfkt<=`uasE?M`9Gv=ac%GfjX5+ zi!fo7^F>(Vv1QY=Qb~O0nl!JaMpy(pjy*a%bu!j%5!~Z^tB;Bn^2WIhd|hVG*No0n zg1*jphZm$td#xdVj+{E2bw&;#eGT(*bYgi`ED~C>-pChD7m8}~-sGlor$bcH)J-+K zWDJMOppCk3?l$nDY1%ey{5i&kd4=Klg0NXw!f?4}mOz^9k3IE29M3#+JbX!#w9t=F z3ndOMJ-6_?L6bktC3|)@RXB60Bil`<?D=Atrn2AvCsl<ruYs3B@vl2YWlk7u9SmKF z0T%G?!;5y@zCV~{mC2e|K;?=<G>|uO=5gXnsjG>5XezNsxXGLJ6!})CQ~IW(Mt&o7 z1#NPZBB*)DuGw=wnHMY=7yrf=x2;t;r*Y8f^P_oF`P8-QU1bGY{M_gw>R9bF-;9A0 z4hOc*dLd{;J!d=pn?*nRy5q_#AE$rx{-LMaKa~1B2~?Y747g%~8+^jL*E8xpSby1D zmUe9Kg?n>vquSE)@0{dsFN+qObM$~C-+)2uY~LqnO<J*5yk-m^eY=7xN~Tk;UpTMB zy{7t){Q0B?X{Yo6uJ=~yL8$?0yG?46wo_=JRD4dOE1I;-y@!R7v$uXc^JnP9M8edz zy^LzN?9c`)>V-eA!swi%sCDG+7eW7GL0PgDH!hBRR8PIX%<*4R{n^;qOjuY%0VeUy z(7zytwW(~g5Sf~IIwbt7Iz_(LwQ9F8uY}SU{CKia`=f;xIR1AzxEH>gn>@a?!O-&c zMs|?Cc6d`Sy%3b=ZY;x#1Z0L5P9-F3EzHmkgS4XFi8`4wI$sPlTBA8pT&DcSV-)w8 zkq$IFw7UKw-o;x&oF`jT7ZtDBOoxLLw5z|HcDA`l$x7AEJX9D*yR<8Gu1%%(#`nnc z@I5eEtk$ycU^Hd6JW7YQDcX3`xhN`rZGsF3AEWkWJ54-XK(B7UM3XztV@#!y(PuU5 z{jDPKvt%0Wc7(S89qseh2_fFX*L&&E1C3<gSV#wo+UdR1IYOe+<|OLfmZJT(^FD=o z1FK1WVuVH>Z=sfbiu|!eZ~ozo_4@PDri=Bdc#}%;;y9&3{L1m}<fFYu%A+2-i|Q}u z1TPiKG<3Nn>zbVsa6kC|&zLbvijB(pFzZiyR4H0BKYv&R#$@fp3%iAO^<{X@cho2R zV=9#%x|@cMCQ<w0I|9EF3Ae0uu5=XcVRy>mr4Zf;?&Zdra6@N&%th)z9o4xO(w|*6 z8W~VYEgJF14=KkmffL<n)U(;|+mAwe`Z$E|fHUA-FadrIeh=_msNt8KSGkCRFL-cY zLiQ3phwAlTAh-hl3MRo6_#3q?SVq0RH1h4tvz_cOn`ry$V*e3G|L>lSf8zD<Rc|dx z6mQe0`V2gtYm;l1g-$*`@5s^%|KW8MX{&=Zs?gL|RhfKu`U2+-0oT9C8fOO_Y!iyF z>!j%;gE9Q~LX!GF5UCbD$BtH<_-K%-X~jIY>=2G=Ya*)rB%R+w6!tacQzF&v&((dU zuvcas(R-!9_+=UAJxumIlMOH8l8>qI;z89So)iW$xk^P8Rk>~qd#b^e5L0-|N@t9b eJg!Caokc|j=B>LPY|zxAM1hE}(E^`t7XJVNXKfY$ -- GitLab