From 88da2fdcd55d78487600c8e3da9456457f8ca958 Mon Sep 17 00:00:00 2001 From: Holger Niemann <holger.niemann@ipp.mpg.de> Date: Thu, 2 Nov 2017 10:51:39 +0100 Subject: [PATCH] bugfixes in download_raw_by_times --- .../downloadversionIRdata.cpython-35.pyc | Bin 18898 -> 19059 bytes downloadversionIRdata.py | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/__pycache__/downloadversionIRdata.cpython-35.pyc b/__pycache__/downloadversionIRdata.cpython-35.pyc index dd04967c8b4f34771ae91084397951b550534f6d..becfcc916a6904c34b4fc234250f9d0902b6aed3 100644 GIT binary patch delta 1944 zcmcIlOKe+36g~6&;<*0AX`IG!{*Dt;w@n<UwC*S07E;QBjVmR!3L(n4sXuX=@k?o4 zJEo0kp%IH{KtdHrlohZ-auFNYl?|v1U{R3;5~_r#5J(6K3B-aslOinIEl%dVIrq+) z`<XZP*OLAA2J36_c${}0{CRre1>invJ}#P1(#Urjn|%+;ybTot2_Lu%ydAs)6^2B! zrk&tjn(orH8@xx;7Vx09^n!=9+^=aLc)woIs_7Hp1DXaj-3=brv`y1J;CoRiQ!t83 zvG;)wYIldGL*NljDGBlpgGV*((sTrTzowMali&>e0Qf<jN)LDp{17TYg0dvnVZDYn zIRbtZ6%&bGBtzh%$QVZ;0!EVR7y};%pU{Fyt(nrYV=CUdVV<!e(T7Ao5>%Ffc=&kL zZp7Mq7FBDLckfOu)TtSL8fomLahyheSf1*PIqQ%+i6W?-^3BdjnP?*{1H2LI49v3O zDnrpgk)gF{qMh$V#)OC)mI<p4X?v}c6!c%R>kXP<k<zX#e(r-`ZATfE>Tz*Dtonzp zr=IUe$$?@$(hgW=Sq0*DibXaP%}S+&E8k&edky8H3>PD;W{)7FJucmcwF7A<(k>M1 zz?<P$8Bin#0;KWtT{RXe#ILR7DeZveM%sg7nKo#^I*|5)x2Q<U?L?96)DciesOX(2 zI>G%2@K)V~CR)WxE<NA&1$4xc8*8L>fZpVc0r4#>x=^ApZj>63+oJ_kC|S1O@U}9Y zC!-ZA3OO3o(se_vUUOm1jhU4oGgXy7q??g(LQK(mFId5=nqKtk=FFVtbfDC0FV?)6 zC5;+0bb-{49-Orye(9aZb*uca{k84V4Oa*8Z=3#yE~(_)Fp4fY(c_QqwQX1BtEq}^ zc>F(=<rrqE&UiQ|zwd9C@AU{n7_vJ!Dw(fOR)Q^#Epz^2Dt~HP{_2UyFN4=vquh)& zHzeGtoRt(8=CkosAt@JoUkY`yR%T~D7GfSk8#}_fn3HwrxtlyYjMgd(U12OOf8HIa zzTNk!!BX<{z#vOiuMfP)Sho7(ZlA$2@~=Jpgi}NJ<R5zrELXMm-DZI$x^mNuuAP%6 zU~bk;ql1a1>eSFIV=MAz<es@qE*WVXl;;N<<VVAwcb+H1j8Zk!sJaa&<s;7P5UG(O z%gY}|?$nCg<?s974G7X?9urb%;k5%BZ1quLZ|tprMM8QJ9?8|JeiMtB?1Hq7{`Bl6 zT2yeJTNbIpa?YC1ipyjW^i6`WO{^)W<3dtcsReSqtgME(LJx6O%}qhyfe^1KxF!#c zbq&$of_PQIYYIvVZYbDL5FrTL3ify^x0p?e*JWia!nnLWHp|XQ&v=L}%INqOyD8lh zpV9n_i8JIKm|S4DsvDESbg4}qw5gqLR2@%$%o?+5-l5>Af}FfN-9z$UrjL5gD#I;; zuwQIe51z=f*eArc9CLF^^Qqk2oQM%ExJQPgvFLF0(9m%7u%MqZhz}Hes9=g9JRskH z=JL6;;wc3>W=73&3e+1RRurgH7I_8g$i%7wbq3<50+ovRCxhJlQgUu?%bvI9t<}76 zDBr9CxBTja&+8anTIQ?S<hY$|`D1ePWT>}k$m{erd!0>Qde+lWf9mOIdd_XOo^i9k E0j4pF8~^|S delta 1770 zcmbtUO>9(E6#mZZ>$H9IM?0m{Vfw>#igl!&f%0#m)Sw^@F(EZ+X&_>HOWSEXrI%4* zc+(N6@}oxax{ySZZe5R>m|(&Jmn<|Yi3Ve0VuBhsuH1RfEiqM0jB#e}ch7guJ-_$8 z`RyJ0!ccchIP6{g_4i|Mo&bKpnooe`Azo*`qwC%GE6arO7*r5y15^@1n=NgFYPWQ~ zr5#Y6mbO4`w3-xD7nU82$1P1mb=w22mTrQ2#L|SNJy4HY%2_y92I?_OD@n^YL-ktD zS=rnNm9@0p(j3$lOSuTPZiVW%v=eF@6hUo=+F?uK%63BS!ZI+<^|5KUJ;PpmpdQDv zi}5Zf2P2t*(su8Ft`0l>$@ql(U_epc8+jd&0cFj5?Yle|g~RZ{?VEe;IdV<7BUw?6 zNUA2xy3j|RqKjfJ@&Wh`d_wC3WAYM#f8|;f9jF+J1iw}^an+1C?=%IJ12{W?Vx5@O zdbG0o$rBlrSrI_K9vquPssLL3I&j8j4&EHE@G%Ln_#;MF&v9x|oK4YcEE^|A9Ov9u zC^jJPAs>YALbV_+m8=HkV{sK<)z}D9SDDj>kPpMJM?Qi}Kt2l9Dhb5e0KdY9bz&fC zyb*o_R00WpgoHQoF)DjjUbQ8W5YHf%*qQri!>j{+k9-g15d0v@VHCQpLp^-fc(~+< zNy4#)O9@&{7)u_Of)$J|_K_=n#gK2ttOvc{p>hONipscsE}O?OdQ9=f@suN2ieQX= zWR3EJEg?fVRfCap@BjDtRQ_#1|6@K<9N&~@iyJNM!C%|V)Nq@<+$TR!fA*<T82MYT z1;QA2K9cD&pKp94$d4K@dFRd(y2hML?XA@gb2Aj{Hn&nO&a(&2mPpQoyDppc$wu>B zw!z%&(&-enQh?&rLt%<h4fRt8dDLd*5L+6Yrs~o31)>?VFO#VL(tXpRY4br(A5B;9 z_M9Y|t?tgm9Lk#`n>R6D&)zkMdrLH5z1{mECFZz<gTybIC&f{SI(fB`o~vHZjuD+U zKjrSa1*!A<RG+!k7kPW@XYC8jN5v_!#;McsxE#G;GkntTlQuiI-CpaPGzYh@Bo^6c z_8&4XTF0+<yhg=`9rdnv6KB|wUzvwWJyT8Z&bjo08QJ^u@L4`o@}?K`OlhG|e11-s zSfS4|WNLI-jP);0>f+1<n<}Dp^vk^I3nIIkUnl5gfmh6xeI410B3>4_BEWw^&{qYn z3FH_uHKoAFOkrwnQonA#+?S&X;|`9|lsPe&rc>s^;5T%`9N+&b%NvG{v-PE+30kRs zJEYy91i8OKB3-SHJ@pZ-n-#fDU_fBrv>)2Y?t_O0!jqy{VaUYwTh&(&%~9ZEVQG^& zeE!IcSf>SSh`dPi0&>6lw18Zi)&g<^x+owc)i(rI1SFsinbgxU(>WZWL6aR$cSN&M WFWMaSnxeed@sh9X^-a%&+&=)^Wngju diff --git a/downloadversionIRdata.py b/downloadversionIRdata.py index 00ab0cb..4f182a9 100644 --- a/downloadversionIRdata.py +++ b/downloadversionIRdata.py @@ -7,7 +7,7 @@ Created on Wed Oct 25 15:51:46 2017 import numpy as np #import holn.archivedb as AKF_2 -import read_restdb as AKF_1 +import W7Xrest.read_restdb as AKF_1 #import holn.functions as fu import datetime import urllib @@ -224,10 +224,10 @@ def download_raw_images_by_times(port,starttime,stoptime,version=1,intervalSize= nrinterv=int(np.ceil((stoptime-starttime)/intervalSize)) print("timewindow to large, put it into smaller fractions ("+str(nrinterv)+")") intervalls=[] - for i in range(nrinterv-1): + for i in range(nrinterv): intervalls.append(int(starttime-10+i*intervalSize)) intervalls.append(stoptime) - for i in range(nrinterv-1): + for i in range(nrinterv): try: res = urllib.request.urlopen(larchivepath+"/_signal.json?from="+str(intervalls[i])+"&upto="+str(intervalls[i+1])) signal_list = json.loads(res.read().decode('utf-8')) @@ -239,7 +239,7 @@ def download_raw_images_by_times(port,starttime,stoptime,version=1,intervalSize= ressignal=signal time=t else: - ressignal=np.append(ressignal,signal) + ressignal=np.append(ressignal,signal,axis=0) time=np.append(time,t) del signal,t except urllib.error.URLError as e: -- GitLab