Changed the storage location in the data folder for the TAR file with…

… the BT-Settl spectra
tomasstolker · Jul 31, 2020 · 152c60f · 152c60f
1 parent b7325cb
commit 152c60f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/species/data/btsettl.py b/species/data/btsettl.py
@@ -52,22 +52,21 @@ def add_btsettl(input_path: str,
         os.makedirs(input_path)
 
     input_file = 'bt-settl.tgz'
-    label = '(130 MB)'
 
     data_folder = os.path.join(input_path, 'bt-settl/')
-    data_file = os.path.join(data_folder, input_file)
+    data_file = os.path.join(input_path, input_file)
 
     if not os.path.exists(data_folder):
         os.makedirs(data_folder)
 
     url = 'https://people.phys.ethz.ch/~ipa/tstolker/bt-settl.tgz'
 
     if not os.path.isfile(data_file):
-        print(f'Downloading Bt-Settl model spectra {label}...', end='', flush=True)
+        print('Downloading Bt-Settl model spectra (130 MB)...', end='', flush=True)
         urllib.request.urlretrieve(url, data_file)
         print(' [DONE]')
 
-    print(f'Unpacking BT-Settl model spectra {label}...', end='', flush=True)
+    print('Unpacking BT-Settl model spectra (130 MB)...', end='', flush=True)
     tar = tarfile.open(data_file)
     tar.extractall(data_folder)
     tar.close()

diff --git a/species/data/btsettl_cifist.py b/species/data/btsettl_cifist.py
@@ -52,22 +52,21 @@ def add_btsettl(input_path: str,
         os.makedirs(input_path)
 
     input_file = 'bt-settl-cifist.tgz'
-    label = '(578 MB)'
 
     data_folder = os.path.join(input_path, 'bt-settl-cifist/')
-    data_file = os.path.join(data_folder, input_file)
+    data_file = os.path.join(input_path, input_file)
 
     if not os.path.exists(data_folder):
         os.makedirs(data_folder)
 
     url = 'https://people.phys.ethz.ch/~ipa/tstolker/bt-settl-cifist.tgz'
 
     if not os.path.isfile(data_file):
-        print(f'Downloading Bt-Settl model spectra {label}...', end='', flush=True)
+        print('Downloading Bt-Settl model spectra (578 MB)...', end='', flush=True)
         urllib.request.urlretrieve(url, data_file)
         print(' [DONE]')
 
-    print(f'Unpacking BT-Settl model spectra {label}...', end='', flush=True)
+    print('Unpacking BT-Settl model spectra (578 MB)...', end='', flush=True)
     tar = tarfile.open(data_file)
     tar.extractall(data_folder)
     tar.close()