added new way to store missing signals as text files. removed spatial profiles as they would be saved under the same name as the jet profiles mapped to rho

jnkh · jnkh · commit 91cbab05c1d6 · 2017-12-14T03:24:20.000-05:00
diff --git a/data/signals.py b/data/signals.py
@@ -211,8 +211,8 @@ def fetch_nstx_data(signal_path,shot_num,c):
 'pradedge':pradedge,'pradtot':pradtot,'pin':pin,
 '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_profile_spatial':etemp_profile_spatial,'edens_profile_spatial':edens_profile_spatial,'etemp':etemp
+'tmamp1':tmamp1,'tmamp2':tmamp2,'tmfreq1':tmfreq1,'tmfreq2':tmfreq2,'pechin':pechin,
+ '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
@@ -5,7 +5,7 @@
 from scipy.interpolate import UnivariateSpline
 
 from plasma.utils.processing import get_individual_shot_file
-from plasma.utils.downloading import format_save_path
+from plasma.utils.downloading import format_save_path,get_missing_value_array
 
 # class SignalCollection:
 #   """GA Data Obj"""
@@ -265,10 +265,4 @@ def __str__(self):
     def __repr__(self):
         return self.__str__()
 
-def create_missing_value_filler():
-    time = np.linspace(0,100,100)
-    vals = np.zeros_like(time)
-    return time,vals
 
-def get_missing_value_array():
-    return np.array([-1.0])
diff --git a/plasma/utils/downloading.py b/plasma/utils/downloading.py
@@ -25,7 +25,6 @@
 from multiprocessing import Queue
 import os
 import errno
-from plasma.primitives.data import get_missing_value_array
 
 # import gadata
 
@@ -35,10 +34,9 @@
 
 #print("Importing numpy version"+np.__version__)
 
-def create_missing_value_filler():
-    time = np.linspace(0,100,100)
-    vals = np.zeros_like(time)
-    return time,vals
+
+def get_missing_value_array():
+    return np.array([-1.0])
 
 def makedirs_process_safe(dirpath):
     try: #can lead to race condition
@@ -108,8 +106,8 @@ def save_shot(shot_num_queue,c,signals,save_prepath,machine,sentinel=-1):
                     makedirdepth_process_safe(save_path_full)
                     if success:
                         np.savetxt(save_path_full,data_two_column,fmt = '%.5e')#fmt = '%f %f')
-                    else
-                        np.savetxt(save_path_full,get_missing_value_array())
+                    else:
+                        np.savetxt(save_path_full,get_missing_value_array(),fmt = '%.5e')
                     print('.',end='')
                 except:
                     print('Could not save shot {}, signal {}'.format(shot_num,signal_path))
