diff --git a/__pycache__/downloadversionIRdata.cpython-35.pyc b/__pycache__/downloadversionIRdata.cpython-35.pyc index dd04967c8b4f34771ae91084397951b550534f6d..becfcc916a6904c34b4fc234250f9d0902b6aed3 100644 Binary files a/__pycache__/downloadversionIRdata.cpython-35.pyc and b/__pycache__/downloadversionIRdata.cpython-35.pyc differ diff --git a/downloadversionIRdata.py b/downloadversionIRdata.py index 00ab0cbae852e812137b4a72abd8c39bcd8ba657..4f182a922e33e4298b2781ca42d6b1cd63d947ea 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: