new set of signals

jnkh · jnkh · commit 19ed7b897182 · 2017-11-10T01:05:14.000-05:00
diff --git a/data/signals.py b/data/signals.py
@@ -175,17 +175,30 @@ def fetch_nstx_data(signal_path,shot_num,c):
 
 #for downloading #modify this to preprocess shots with only a subset of signals. This may produce more shots
 #since only those shots that contain all_signals contained here are used.
+#all_signals = {'q95':q95,'li':li,'ip':ip,
+#'betan':betan,'energy':energy,'lm':lm,'dens':dens,
+#'pradcore':pradcore,'pradedge':pradedge,'pradtot':pradtot,
+#'pin':pin,'torquein':torquein,
+#'tmamp1':tmamp1,'tmamp2':tmamp2,'tmfreq1':tmfreq1,'tmfreq2':tmfreq2,
+#'pechin':pechin,'energydt':energydt,
+#'etemp_profile':etemp_profile,'edens_profile':edens_profile,
+# 'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr,
+# 'etemp_profile_spatial':etemp_profile_spatial,'edens_profile_spatial':edens_profile_spatial,
+# 'etemp':etemp
+#}
+
+#Restricted subset to those signals that are present for most shots. The idea is to remove signals that cause many shots to be dropped from the dataset.
 all_signals = {'q95':q95,'li':li,'ip':ip,
 'betan':betan,'energy':energy,'lm':lm,'dens':dens,
 'pradcore':pradcore,'pradedge':pradedge,'pradtot':pradtot,
 'pin':pin,'torquein':torquein,
-'tmamp1':tmamp1,'tmamp2':tmamp2,'tmfreq1':tmfreq1,'tmfreq2':tmfreq2,
-'pechin':pechin,'energydt':energydt,
+'energydt':energydt,
 'etemp_profile':etemp_profile,'edens_profile':edens_profile,
- 'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr,
- 'etemp_profile_spatial':etemp_profile_spatial,'edens_profile_spatial':edens_profile_spatial,
- 'etemp':etemp
+ 'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr
+#'tmamp1':tmamp1,'tmamp2':tmamp2,'tmfreq1':tmfreq1,'tmfreq2':tmfreq2,'pechin':pechin,
+# 'etemp_profile_spatial':etemp_profile_spatial,'edens_profile_spatial':edens_profile_spatial,'etemp':etemp
 }
+
 #new signals are not downloaded yet
 
 
