adding tolerance for equilibrium signals not being available before disruption

Julian Kates-Harbeck · Julian Kates-Harbeck · commit 8019ba0be8d7 · 2017-11-13T01:33:28.000-05:00
diff --git a/data/signals.py b/data/signals.py
@@ -136,16 +136,16 @@ def fetch_nstx_data(signal_path,shot_num,c):
 all_machines = [d3d,jet]
 
 profile_num_channels = 64
-etemp_profile = ProfileSignal("Electron temperature profile",["ZIPFIT01/PROFILES.ETEMPFIT"],[d3d],causal_shifts=[10],mapping_range=(0,1),num_channels=profile_num_channels)
-edens_profile = ProfileSignal("Electron density profile",["ZIPFIT01/PROFILES.EDENSFIT"],[d3d],causal_shifts=[10],mapping_range=(0,1),num_channels=profile_num_channels)
+etemp_profile = ProfileSignal("Electron temperature profile",["ZIPFIT01/PROFILES.ETEMPFIT"],[d3d],causal_shifts=[10],mapping_range=(0,1),num_channels=profile_num_channels,data_avail_tolerance=0.02)
+edens_profile = ProfileSignal("Electron density profile",["ZIPFIT01/PROFILES.EDENSFIT"],[d3d],causal_shifts=[10],mapping_range=(0,1),num_channels=profile_num_channels,data_avail_tolerance=0.02)
 
 # epress_profile_spatial = ProfileSignal("Electron pressure profile",["ppf/hrts/pe/"],[jet],causal_shifts=[25],mapping_range=(2,4),num_channels=profile_num_channels)
-etemp_profile_spatial = ProfileSignal("Electron temperature profile",["ppf/hrts/te"],[jet],causal_shifts=[25],mapping_range=(2,4),num_channels=profile_num_channels)
-edens_profile_spatial = ProfileSignal("Electron density profile",["ppf/hrts/ne"],[jet],causal_shifts=[25],mapping_range=(2,4),num_channels=profile_num_channels)
-etemp = Signal("electron temperature",["ppf/hrtx/te0"],[jet],causal_shifts=[25])
+etemp_profile_spatial = ProfileSignal("Electron temperature profile",["ppf/hrts/te"],[jet],causal_shifts=[25],mapping_range=(2,4),num_channels=profile_num_channels,data_avail_tolerance=0.05)
+edens_profile_spatial = ProfileSignal("Electron density profile",["ppf/hrts/ne"],[jet],causal_shifts=[25],mapping_range=(2,4),num_channels=profile_num_channels,data_avail_tolerance=0.05)
+etemp = Signal("electron temperature",["ppf/hrtx/te0"],[jet],causal_shifts=[25],data_avail_tolerance=0.05)
 # epress = Signal("electron pressure",["ppf/hrtx/pe0/"],[jet],causal_shifts=[25])
 
-q95 = Signal("q95 safety factor",['ppf/efit/q95',"EFIT01/RESULTS.AEQDSK.Q95"],[jet,d3d],causal_shifts=[15,10],normalize=False)
+q95 = Signal("q95 safety factor",['ppf/efit/q95',"EFIT01/RESULTS.AEQDSK.Q95"],[jet,d3d],causal_shifts=[15,10],normalize=False,data_avail_tolerance=0.03)
 
 ip = Signal("plasma current",["jpf/da/c2-ipla","d3d/ipspr15V"],[jet,d3d],is_ip=True) #"d3d/ipsip" was used before, ipspr15V seems to be available for a superset of shots.
 iptarget = Signal("plasma current target",["d3d/ipsiptargt"],[d3d])
diff --git a/plasma/primitives/data.py b/plasma/primitives/data.py
@@ -15,7 +15,7 @@
 #           self.signals.append(Signal(signal_descriptions[i],signal_paths[i]))
 
 class Signal(object):
-    def __init__(self,description,paths,machines,tex_label=None,causal_shifts=None,is_ip=False,normalize=True):
+    def __init__(self,description,paths,machines,tex_label=None,causal_shifts=None,is_ip=False,normalize=True,data_avail_tolerance=0):
         assert(len(paths) == len(machines))
         self.description = description
         self.paths = paths
@@ -26,6 +26,7 @@ def __init__(self,description,paths,machines,tex_label=None,causal_shifts=None,i
         self.is_ip = is_ip
         self.num_channels = 1
         self.normalize = normalize
+        self.data_avail_tolerance = data_avail_tolerance
 
     def is_ip(self):
         return self.is_ip
diff --git a/plasma/primitives/shots.py b/plasma/primitives/shots.py
@@ -394,19 +394,27 @@ def get_signals_and_times_from_file(self,conf):
                 assert(len(t.shape) == 1)
                 assert(len(t) > 1)
                 t_min = max(t_min,np.min(t))
-                t_max = min(t_max,np.max(t))
                 signal_arrays.append(sig)
                 time_arrays.append(t)
+                if self.is_disruptive and self.t_disrupt > np.max(t):
+                    if self.t_disrupt > np.max(t) + signal.data_avail_tolerance:
+                        print('Shot {}: disruption event is not contained in valid time region of signal {} by {}s, omitting.'.format(self.number,signal,self.t_disrupt - np.max(t)))
+                        valid = False 
+                    else:
+                        t_max = np.max(t) + signal.data_avail_tolerance
+                else:
+                    t_max = min(t_max,np.max(t))
+
         assert(t_max > t_min or not valid)
         #make sure the shot is long enough.
         dt = conf['data']['dt']
         if (t_max - t_min)/dt <= (2*conf['model']['length']+conf['data']['T_min_warn']):
             print('Shot {} contains insufficient data, omitting.'.format(self.number))
             valid = False
 
-        if self.is_disruptive and self.t_disrupt > t_max:
-            print('Shot {}: disruption event is not contained in valid time region by {}s, omitting.'.format(self.number,self.t_disrupt - t_max))
-            valid = False 
+        # if self.is_disruptive and self.t_disrupt > t_max+conf['data']['data_avail_tolerance']:
+        #     print('Shot {}: disruption event is not contained in valid time region by {}s, omitting.'.format(self.number,self.t_disrupt - t_max))
+        #     valid = False 
                 
         
         if self.is_disruptive:
