added support for zipfit profile data and added path for q95 efit signal

Author: +Julian Kates-Harbeck

data/d3d_signals.py

@@ -33,11 +33,19 @@
 #'pcechpwrf'] #Total ECH Power Not always on!
 
 signal_paths = ['d3d/' + path for path in signal_paths]
+
+### 0D EFIT signals ###
+#signal_paths += ['EFIT02/RESULTS.AEQDSK.Q95']
 
 ### 1D EFIT signals ###
+#signal_paths += [
+#'AOT/EQU.t_e', #electron temperature profile vs rho (uniform mapping over time)
+#'AOT/EQU.dens_e'] #electron density profile vs rho (uniform mapping over time)
+
+#these signals seem to give more reliable data
 signal_paths += [
-'AOT/EQU.t_e', #electron temperature profile vs rho (uniform mapping over time)
-'AOT/EQU.dens_e'] #electron density profile vs rho (uniform mapping over time)
+'ZIPFIT01/PROFILES.ETEMPFIT', #electron temperature profile vs rho (uniform mapping over time)
+'ZIPFIT01/PROFILES.EDENSFIT'] #electron density profile vs rho (uniform mapping over time)
 
 #make into list of lists format to be consistent with jet_signals.py
 signal_paths = [[path] for path in signal_paths]

data/gadata.py

@@ -44,22 +44,28 @@ def __init__(self,signal,shot,tree=None,connection=None,nomds=False):
 				self.zdata  = self.connection.get('_s = '+tag).data()
 				self.zunits = self.connection.get('units_of(_s)').data()  
 				self.rank = numpy.ndim(self.zdata)	
-				self.xdata = self.connection.get('dim_of(_s)').data()
-				self.xunits = self.connection.get('units_of(dim_of(_s))').data()
-				if self.xunits == '' or self.xunits == ' ': 
-   					self.xunits = self.connection.get('units(dim_of(_s))').data()
 				if self.rank > 1:
-					self.ydata 	= self.connection.get('dim_of(_s,1)').data()
-                			self.yunits = self.connection.get('units_of(dim_of(_s,1))').data()
+					self.xdata = self.connection.get('dim_of(_s,1)').data()
+					self.xunits = self.connection.get('units_of(dim_of(_s,1))').data()
+					if self.xunits == '' or self.xunits == ' ': 
+   						self.xunits = self.connection.get('units(dim_of(_s,1))').data()
+
+					self.ydata 	= self.connection.get('dim_of(_s)').data()
+                			self.yunits = self.connection.get('units_of(dim_of(_s))').data()
 					if self.yunits == '' or self.yunits == ' ':
- 						self.yunits     = self.connection.get('units(dim_of(_s,1))').data()
+ 						self.yunits     = self.connection.get('units(dim_of(_s))').data()
+				else:
+					self.xdata = self.connection.get('dim_of(_s)').data()
+					self.xunits = self.connection.get('units_of(dim_of(_s))').data()
+					if self.xunits == '' or self.xunits == ' ': 
+   						self.xunits = self.connection.get('units(dim_of(_s))').data()
 				#print 'zdata: ' + str(self.zdata)
 				self.found = True
 
 				# MDSplus seems to return 2-D arrays transposed.  Change them back.
-				#if numpy.ndim(self.zdata) == 2: self.zdata = numpy.transpose(self.zdata)
-				#if numpy.ndim(self.ydata) == 2: self.ydata = numpy.transpose(self.ydata)
-				#if numpy.ndim(self.xdata) == 2: self.xdata = numpy.transpose(self.xdata)
+				if numpy.ndim(self.zdata) == 2: self.zdata = numpy.transpose(self.zdata)
+				if numpy.ndim(self.ydata) == 2: self.ydata = numpy.transpose(self.ydata)
+				if numpy.ndim(self.xdata) == 2: self.xdata = numpy.transpose(self.xdata)
 
             		except Exception,e:
             	#node not found

data/get_mdsplus_data.py

@@ -39,9 +39,9 @@
 	'efit02/wpdot/']
 
 elif machine == 'd3d':
-#	shot_numbers_files = ['shotlist_JaysonBarr_clear.txt']
-#	shot_numbers_files = ['shotlist_JaysonBarr_disrupt.txt']
-	shot_numbers_files = ['d3d_short_clear.txt']# ,'d3d_clear.txt', 'd3d_disrupt.txt']
+	shot_numbers_files = ['shotlist_JaysonBarr_clear.txt']
+	shot_numbers_files += ['shotlist_JaysonBarr_disrupt.txt']
+	#shot_numbers_files = ['d3d_short_clear.txt']# ,'d3d_clear.txt', 'd3d_disrupt.txt']
 	server_path = 'atlas.gat.com'
 	from d3d_signals import signal_paths	
 	import itertools
@@ -214,7 +214,7 @@ def save_shot(shot_num_queue,c,signal_paths,save_prepath,machine):
 
 
 fn = partial(save_shot,signal_paths=signal_paths,save_prepath=save_prepath,machine=machine)
-num_cores = min(mp.cpu_count(),8) #can only handle 8 connections at once :(
+num_cores = min(mp.cpu_count(),32) #can only handle 8 connections at once :(
 queue = mp.Queue()
 for shot_num in shot_numbers:
 	queue.put(shot_num)