small bug fix with checking for no-content

Julian Kates-Harbeck · Julian Kates-Harbeck · commit 7b2d8b66125d · 2017-12-15T00:49:25.000-05:00
diff --git a/data/signals.py b/data/signals.py
@@ -214,7 +214,7 @@ def fetch_nstx_data(signal_path,shot_num,c):
 'torquein':torquein,
 'energydt':energydt,'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr,
 'tmamp1':tmamp1,'tmamp2':tmamp2,'tmfreq1':tmfreq1,'tmfreq2':tmfreq2,'pechin':pechin,
- 'rho_profile_spatial':rho_profile_spatial,'etemp':etemp,
+# 'rho_profile_spatial':rho_profile_spatial,'etemp':etemp,
 'etemp_profile':etemp_profile,'edens_profile':edens_profile,
 'itemp_profile':itemp_profile,'zdens_profile':zdens_profile,
 'trot_profile':trot_profile,'pthm_profile':pthm_profile,
diff --git a/plasma/primitives/data.py b/plasma/primitives/data.py
@@ -66,10 +66,11 @@ def load_data_from_txt_safe(self,prepath,shot,dtype='float32'):
             return None,False
         try:
             data = np.loadtxt(file_path,dtype=dtype)
-            if data == get_missing_value_array():
+            if np.all(data == get_missing_value_array()):
                 print('Signal {}, shot {} contains no data'.format(self.description,shot.number))
                 return None,False
-        except:
+        except Exception as e:
+            print(e)
             print('Couldnt load signal {} shot {}. Removing.'.format(file_path,shot.number))
             os.remove(file_path)
             return None, False
diff --git a/plasma/primitives/shots.py b/plasma/primitives/shots.py
@@ -17,6 +17,7 @@
 import numpy as np
 
 from plasma.utils.processing import train_test_split,cut_and_resample_signal
+from plasma.utils.downloading import makedirs_process_safe
 
 class ShotListFiles(object):
     def __init__(self,machine,prepath,paths,description=''):
@@ -455,14 +456,7 @@ def convert_to_ttd(self,tr,conf):
         return ttd
 
     def save(self,prepath):
-        if not os.path.exists(prepath):
-            try: #can lead to race condition
-                os.makedirs(prepath)
-            except OSError as e:
-                if e.errno == errno.EEXIST:# File exists, and it's a directory, another process beat us to creating this dir, that's OK.
-                    pass
-                else:# Our target dir exists as a file, or different error, reraise the error!
-                    raise
+        makedirs_process_safe(prepath)
         save_path = self.get_save_path(prepath)
         np.savez(save_path,valid=self.valid,is_disruptive=self.is_disruptive,
             signals_dict=self.signals_dict,ttd=self.ttd)
