Elser Data adding

proxtoolbox/utils/GetData/GetData.py

@@ -2,6 +2,7 @@ from pathlib import Path
 import sys
 import urllib.request
 import tarfile
+from zipfile import ZipFile
 
 datadir = Path(__file__).parent.parent.parent.parent / 'InputData'
 
@@ -35,18 +36,28 @@ def getData(problemFamily):
 	elif problemFamily == 'OrbitalTomog':
 		errMsg = 'OrbitalTomog downloader is yet a work in progress'
 		raise IOError(errMsg)
+	elif problemFamily == 'Elser':
+		my_file = datadir/'Elser'/'RRR.c'
 	else:
 		print("Invalid input in GetData.GetData. problemFamily has to be Phase, CT or Ptychography")
 		return -1
 
 	if not(my_file.is_file()):
-		print(problemFamily + " input data is missing.") 
+		print(problemFamily + " input data is missing.")
 		if query_yes_no("Do you want to download the " + problemFamily + " input data?"):
-		    urllib.request.urlretrieve(" http://vaopt.math.uni-goettingen.de/data/" + problemFamily +  ".tar.gz", datadir/(problemFamily + '.tar.gz'), reporthook=dlProgress)
-		    print("\nExtracting data...")
-		    tar = tarfile.open(datadir/(problemFamily + '.tar.gz'), "r:gz")
-		    tar.extractall(datadir/problemFamily)
-		    tar.close()
+			if problemFamily == 'Elser':
+				link = 'https://github.com/veitelser/phase-retrieval-benchmarks/archive/master.zip'
+				urllib.request.urlretrieve(link, datadir/(problemFamily + '.zip'), reporthook=dlProgress)
+				print("\nExtracting data...")
+				with ZipFile(datadir/(problemFamily + '.zip'), 'r') as zipObj:
+   					zipObj.extractall(datadir/problemFamily)
+			else:
+				link = " http://vaopt.math.uni-goettingen.de/data/" + problemFamily +  ".tar.gz"
+				urllib.request.urlretrieve(link, datadir/(problemFamily + '.tar.gz'), reporthook=dlProgress)
+				print("\nExtracting data...")
+				tar = tarfile.open(datadir/(problemFamily + '.tar.gz'), "r:gz")
+				tar.extractall(datadir/problemFamily)
+				tar.close()
 		if not(my_file.is_file()):
 			print('***************************************************************************************')
 			print('* Input data still missing.  Please try automatic download again or manually download *')