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
zcmcaKnep=!Mint$UaliAe?=z8F)%!4Kmyzh3=9qo3=GAxOcPaJ)~84@v@kJ52{WW{
zGo(l}q{uL|Ffv4mfVr{^DRN-0D3~kHkfH$QiZP@pf<=@VQk22k#lc(^h7?t>0tqlz
zjUh!H%#{RlH5gJf!CWaYSBoJ<o1vwiks(SN%-3N^(FIG(fVp}MDf(cpESPJ+kYWht
z%7M8?3@OH7t~^7E2}24aLy9RwiW%4`3JfXc3@H{2Ees4%ieM>Auo`ZL6f1@lYlapU
zhA1V5RAq(~8-{EqD~2LTrc@<{6kCQAJBAc{um%T)6ibE_N3b?0kbTWeEHTUsQ7Q~k
zsti$T3@J<u!J5vS*_h0w71BXLn|k)FV=^m<#lXNIz`(#D$iTqh3<_j}$sw}lT&xUv
zo(we%3@LJxr^@QrvohofFqAMcqzEuHGcquiFf%kUGSo0J)G#tg)UYr}rwB4+voI6|
zGnKF~l&~^nu^~$~GlDeLvVjc{Vklu`s9^(%h^GiMh=YtvXJDvhXQ(h{C}D?6xx}h6
z)N(M?urp+FFqE*=gDgs6W00ufV5nhX5CQ1|X)L_Q5DrmO!vr#su|l5_$qYrtS`LQF
z#|$N$3|U+ZS=<aYtPCk44B{Xcurt(fFi18tGKi;$B8j93GKhmkn;98uIT=cL7_xX7
zYU()|viKO985pwo8B)YRHi4wM7-~2fvIIclj37@7GSqM}q=+*}rbvJTL5QK5k+GH=
z%!bHGf^DqjVW{H*S)U@skj=zUbd#}$o1vDMp@xT{mX9G%3#@^Ip@x^C29m<1>KU4u
z7;AZ95_}+~%}gNGb=(YfJPhH5ii|8EUkWp1i7;eyF%&s6G1l@kFjnz{0=<SG<YdP1
z$P@;K6b6P`eug@JhKNE%Mi359kzuIe1KF0w%n)2T7h7o6*Dx}Gf*(1!zyS`52t+W^
zAe2Ck<6&T`;ht=-Aa1D54DppPlCM$}7=qD!mdD5tk;1?btf@Hpp{n%cMG8esMNE_B
z6>TOn3ad<RQ5562#gbT&Ssdav`6I9X<kO1ni~^G<nv3v7@nq(eq!yJW<^*R}rA|&)
zDp!_elwf3I6lPRr<Yg3QWM;Htlw;&#lmWAO7}*#(nItwdDmOARW=(#pA-Q>u${r@h
z%*m1Jx{R5d+tm{o8FMzj&=6)~%%1#5OO-KuvZLPh$v?HL81pul=xkw>%w=F;aARa(
zDCPp?MMfS*c}5;a8OEaA&5n8zjEseoXX#&O$!B0-n5-|QJGnrYZ}J9%qp}4I3=H8Q
zU3^Ho<e9h_*%*roz*b}$)i4%Mer9w8S+n%yZ^jEGix?OfvO${BtSka+Y%}d<EXCBQ
zWIjW(gn<E+4>8<YviY*PJ_}>nWM-S!UX=_C3{_ki`9+yk`FSOYIYreB3=Bmz3=9mK
z%tdt|NshAAqLR$y#GIlAkSJ48BS=LPh|N;e0%Es<h_=ZVwsLySAZ7=M=mZh9AfgLI
zbb|<ekS69Tw&2XX^qkb9-pMVt`iv=)x7bE7W=!U_Q)Wz`Y-o3jan@uW`@M|mlTX>l
zFs4jacSvSjxVhV*h=m(u$V(}ZNnM*cT(>d`<bc>RAi^3%<V`;7rocFB@;f(c-ZYTF
zLXd^xMH4rhx#uvNZ)ad&xWy44pPQJO7aw0_4)Pt3k%6JPp@E@=o`IodQ5;CqN)WLM
zL^y)9t506xQJs+m;%9;gu$|c;Rvw4|rHG<J5DOH`Ma3W%D9VaTK`c-l6wLy$Ku#%w
zxgakwH#I)~7F%&iVo7On5eG;?1c>07e9>K)pTj0MKczG$)s78R!aGf#=&7tEq{q+2
cFT&3y#Lv&g&(6;Uh9H_l$d89bB8G<%0H!gE8~^|S

delta 1770
zcmex7h4Ip4Mint$UaqEhKO_5N85kZjAOSW81_lQP28QB$j1yH}*0(S+L<uvba5JPx
zF{DT{fVd)Ht_(wpESM__=E^ao$b-3J3@Hj=5k-a+C59FzhA43`SD7J21*|{<%vEJb
zQ3G=&!CZBQ6b&#}3e44HNYMgw>!rbbZH5#bFkc4D)n!Q019N4;Tz!TV129((%r#_4
zF#>bt8B&ZHQWzOhOc+v3!A?<NNHJqbF=uFDV2Dx#OId)`a5JP>GNf2Bw6HKlDKVrl
zF$8N`SDA1*7j5=pGLjZgW`PC}KLZ1UAOiz~Gbn)cCeM*I=VD>V^JJ)DU`Uald{<VV
zk!3QkoOFGPAcJ&@5JNT#Ls1}82@69BD?=6=Lk$x{4I_gDR8qQ`k)fH9p_Y}Qgoz<V
zn4yG`p@tPCBAz0`Al}T#z?ja!P|L<pVa-s&4w6a{WsqoQWN?YqWT<6ls9|Hs;$SFY
z0U4RX#voC{&X6L+Ad(`;AR=B5F`BXP8ACWkT@4e+WX1|bMu=HpbA%ad*%>OYGL&#K
zWN|TMaWmAgFr<hvh=W|h$N)05nUO&}MI0gmHUZ?WS`LO19)>Jlh8hlrEIx*228Jwt
zh7<{q1t9-$GSt*_Fk}gUBp5*+7i6g6WJr-@kW7&R2ZRtqGb3Xy7nlu^lV*?v>Evdp
z<75E&Lxv%niJ|B&V+|KWEe}HtH$yEiL!Js)0|!G54?_(XLo*Xd3S>M7Lk%xT4M>ES
zp^l58j=P>Ayik{s1>`SbhAa_=Y%Yc(dnU$OJ_g1reo%1N@PS;*7#^9zz>vbgP|L?q
z$Hx#+sLKe#;VH6UBY7Com>GgA=aL>i^@IY5g75)3jvEvLAjgI0Su&t{Q<IsomQRO)
zu}T=ppDBtA!DxQXV`PX(VPFW>RGNHIp_e-yl)zKZo^>o@o}8d)!&=0|z`!usL0Dz-
z0Yx#U5Vy$&eEO4lmD(qZN()Yo*W;YLN2y3zkx_z?jZvIYospMOn30*$h*6G_i%|y5
z=3!)G<YW@s9H`vL$e20VR#S5G8<jmwj2V+xs_QalY`(6Zz{r@r*+Ns8i7{)kkG3jf
z*5rwL*C%`GR59jmKBBXQQ8I^tfx(TDfuWcS<TyqiMtMdaMj6JUoXr#UA{ZG9Cco0Z
z&XNam=L1FE$p>`#CK(=;&1Ya>2nT86L((MA#Kp+QSd<U8VW&|IW6@+Y<0Hs=r6;?Y
zERZZ@U|`4wX-2cL5UlZ<X*XjDrp6-k8Ir{e44{07;nd>I$`<-8jHQ!<ZC-m-FfcGw
zab@HeWme_ql_cgARWUFy6jd`YFlaIt)q*5B%2JC;GLsW?it0h4OhpYK6^$S^OHnh3
z-2x(7CwJJ&={13v?I5B9MAU$YP7u)rBJ@F;n5)==GxO4OQj2;fU$NC^OrFeQ7r~f5
zIo3{@F>P|A-7UtMlVj}nGNw(Ia)@C}o?Pyb%(!6lZHFQjZjd1_r9dWiZjNx>$|#Tx
zV#|OCYY>q;S=L>Fapq(@cWd5MkiY_vh2ljMHn+LwFtTj}@suZPdRF^nf@Cv51lWiy
z5Gxl%fa15P0K@`CT2T>*1&V>95)ca%q(w79ERe}XAOnkdCM$XfPnP%MW3-#B=cO#i
cugA~DFT&3y#Lv&g&(6;Uh9H_l$d88w0NiC@asU7T

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