Merge branch 'develop' into reuse_pool

jason-neal · Sep 24, 2018 · 1333ca2 · 1333ca2
2 parents 0b1e467 + ff3f54d
commit 1333ca2
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 22 deletions.
diff --git a/eniric_scripts/download_eniric_data.sh b/eniric_scripts/download_eniric_data.sh
@@ -50,5 +50,12 @@ fi
 
 
 # This should download the PHOENIX spectra
-download_test_PHOENIX_spec.sh
+# download_test_PHOENIX_spec.sh
 
+# FTP on travis gives several delays when getting phoenix data.
+# So putting Phoenix data in dropbox now also.
+(cd $DIRECTORY2
+    wget "https://www.dropbox.com/s/raw/skg8zwi7vnxgesj/data_raw.tar.gz"
+    ../../eniric_scripts/untar_here.py data_raw.tar.gz
+    rm data_raw.tar.gz
+)
diff --git a/eniric_scripts/ps_download_eniric_data.ps1 b/eniric_scripts/ps_download_eniric_data.ps1
@@ -37,32 +37,41 @@ Write-Host "$DIRECTORY is not present. Creating"
 mkdir $DIRECTORY
 }
 
+
 cd $DIRECTORY
 dir
-# Phoenix-raw data 
-wget "https://www.dropbox.com/s/raw/09fqard9l5s87zo/phoenix-raw.tar.gz" -UseBasicParsing -OutFile "phoenix-raw.tar.gz"
-dir
-python ..\..\eniric_scripts\untar_here.py ".\phoenix-raw.tar.gz"
-del "phoenix-raw.tar.gz"
-# obsolete data 
+# obsolete data
 wget "https://www.dropbox.com/s/raw/oq2x7dsjeuxrf7t/obsolete.tar.gz" -UseBasicParsing -OutFile "obsolete.tar.gz"
 python ..\..\eniric_scripts\untar_here.py ".\obsolete.tar.gz"
 del "obsolete.tar.gz"
 
-cd $HOMEDIR
-
-
-# BTsettl
-
-$DIRECTORY = ".\data\test_data\btsettl-raw\"
+# Phoenix-raw data  and BT-settl raw data
+wget "https://www.dropbox.com/s/raw/skg8zwi7vnxgesj/data_raw.tar.gz" -UseBasicParsing -OutFile "phoenix-raw.tar.gz"
+dir
+python ..\..\eniric_scripts\untar_here.py ".\data_raw.tar.gz"
+del "data_raw.tar.gz"
 
-Write-Host $DIRECTORY
+cd $HOMEDIR
 
-if ( -not (Test-Path $DIRECTORY -PathType Container))
-{
-Write-Host "$DIRECTORY is not present. Creating"
-mkdir $DIRECTORY
-}
-cd $DIRECTORY
-wget https://phoenix.ens-lyon.fr/Grids/BT-Settl/CIFIST2011_2015/FITS/lte039.0-4.5-0.0a+0.0.BT-Settl.spec.fits.gz -UseBasicParsing -OutFile "lte039.0-4.5-0.0a+0.0.BT-Settl.spec.fits.gz"
-cd $HOMEDIR
+# # Phoenix-raw data
+# wget "https://www.dropbox.com/s/raw/09fqard9l5s87zo/phoenix-raw.tar.gz" -UseBasicParsing -OutFile "phoenix-raw.tar.gz"
+# dir
+# python ..\..\eniric_scripts\untar_here.py ".\phoenix-raw.tar.gz"
+# del "phoenix-raw.tar.gz"
+#
+# cd $HOMEDIR
+#
+# # BTsettl
+#
+# $DIRECTORY = ".\data\test_data\btsettl-raw\"
+#
+# Write-Host $DIRECTORY
+#
+# if ( -not (Test-Path $DIRECTORY -PathType Container))
+# {
+# Write-Host "$DIRECTORY is not present. Creating"
+# mkdir $DIRECTORY
+# }
+# cd $DIRECTORY
+# wget https://phoenix.ens-lyon.fr/Grids/BT-Settl/CIFIST2011_2015/FITS/lte039.0-4.5-0.0a+0.0.BT-Settl.spec.fits.gz -UseBasicParsing -OutFile "lte039.0-4.5-0.0a+0.0.BT-Settl.spec.fits.gz"
+# cd $HOMEDIR