merge

Julian Kates-Harbeck · Julian Kates-Harbeck · commit e1d75b7b85a3 · 2017-12-10T17:51:39.000-05:00
diff --git a/data/signals.py b/data/signals.py
@@ -204,12 +204,11 @@ def fetch_nstx_data(signal_path,shot_num,c):
 #}
 
 #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,
-'energydt':energydt,
- 'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr,
+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,
+'energydt':energydt,'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr,
+'etemp_profile':etemp_profile,'edens_profile':edens_profile}
 #'tmamp1':tmamp1,'tmamp2':tmamp2,'tmfreq1':tmfreq1,'tmfreq2':tmfreq2,'pechin':pechin,
 # 'etemp_profile_spatial':etemp_profile_spatial,'edens_profile_spatial':edens_profile_spatial,'etemp':etemp
 'etemp_profile':etemp_profile,'edens_profile':edens_profile,
diff --git a/plasma/conf_parser.py b/plasma/conf_parser.py
@@ -94,9 +94,8 @@ def parameters(input_file):
         elif params['paths']['data'] == 'd3d_data':
             params['paths']['shot_files'] = [d3d_full]
             params['paths']['shot_files_test'] = [] 
-            params['paths']['use_signals_dict'] = {'q95':q95,'li':li,'ip':ip,'lm':lm,'betan':betan,'energy':energy,'dens':dens,'pradcore':pradcore,
-            'pradedge':pradedge,'pin':pin,'torquein':torquein,'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr,
-            'etemp_profile':etemp_profile ,'edens_profile':edens_profile}
+            params['paths']['use_signals_dict'] = {'q95':q95,'li':li,'ip':ip,'lm':lm,'betan':betan,'energy':energy,'dens':dens,'pradcore':pradcore,'pradedge':pradedge,'pin':pin,'torquein':torquein,'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr,
+'etemp_profile':etemp_profile ,'edens_profile':edens_profile}
         elif params['paths']['data'] == 'd3d_data_1D':
             params['paths']['shot_files'] = [d3d_full]
             params['paths']['shot_files_test'] = [] 
@@ -108,8 +107,7 @@ def parameters(input_file):
         elif params['paths']['data'] == 'd3d_data_0D':
             params['paths']['shot_files'] = [d3d_full]
             params['paths']['shot_files_test'] = [] 
-            params['paths']['use_signals_dict'] = {'q95':q95,'li':li,'ip':ip,'lm':lm,'betan':betan,'energy':energy,'dens':dens,'pradcore':pradcore,
-            'pradedge':pradedge,'pin':pin,'torquein':torquein,'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr}
+            params['paths']['use_signals_dict'] = {'q95':q95,'li':li,'ip':ip,'lm':lm,'betan':betan,'energy':energy,'dens':dens,'pradcore':pradcore,'pradedge':pradedge,'pin':pin,'torquein':torquein,'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr}
         elif params['paths']['data'] == 'd3d_data_all':
             params['paths']['shot_files'] = [d3d_full]
             params['paths']['shot_files_test'] = [] 
