Changeset 642

Timestamp:

Apr 30, 2012, 6:15:33 PM (13 years ago)

Author:

tnavarro

Message:

Correction for histogram of difference. Write both variable and axis for 1D txt output - useful for gnuplot or sparse.py

File:

• trunk/UTIL/PYTHON/planetoplot.py (modified) (3 diffs)

trunk/UTIL/PYTHON/planetoplot.py

@@ -536 +536 @@
                         if nplot > 1: legend(loc='best')
                         if indextime is None and axtime is not None and xlab is None:    xlabel(axtime.upper()) ## define the right label
-                        if save == 'txt':  writeascii(np.transpose(what_I_plot),'profile'+str(nplot*1000+imov)+'.txt')
+                        if save == 'txt':  writeascii(np.transpose([x,np.transpose(what_I_plot)]),'profile'+str(nplot*1000+imov)+'.txt')
 
                     elif which == "regular":
@@ -581 +581 @@
                         if ope == '-' and nplot == numplot: # this should work as long as ope is '-' guarantees 3 plots for 4 panels without contour
                             subplot(subv,subh,nplot+1)
+                            rcParams["legend.fontsize"] = 'xx-large'
                             if indexlat is None:
                                 latmin = -50.; latmax = 50. # latitude range for histogram of difference
                                 zeindexlat = (lat<latmax)*(lat>latmin)
-                                if (len(lat) == len(x)) and (len(lat) == len(y)): errormess('PLANETOPLOT.PY: I cant find which axis is lat for histogram.')
-                                elif len(lat) == len(x) : what_I_plot_frame = what_I_plot_frame[:,zeindexlat]
-                                elif len(lat) == len(y) : what_I_plot_frame = what_I_plot_frame[zeindexlat,:]
-                                else: errormess('PLANETOPLOT.PY: indexlat is None, but I cant find the lat axis.')
+                                # this follows the define_axis logic in myplot.py:
+                                if indextime is None or indexlon is None: what_I_plot_frame = what_I_plot_frame[zeindexlat,:]
+                                else: what_I_plot_frame = what_I_plot_frame[:,zeindexlat]
                             toplot = np.ravel(what_I_plot_frame[np.isnan(what_I_plot_frame)==False])
                             zebins = np.linspace(zevmin,zevmax,num=30)
@@ -595 +595 @@
                             zebins = np.linspace(zevmin,zevmax,num=300)
                             zegauss = (1./(zestd * np.sqrt(2 * np.pi)) * np.exp( - (zebins - zemean)**2 / (2 * zestd**2) ) )
-                            text(zebins[2],np.max(zegauss),'mean: '+str(zemean)[0:5]+'\nstd: '+str(zestd)[0:5],fontsize = 12)
-                            plot(zebins, zegauss, linewidth=1, color='r')
+                            plot(zebins, zegauss, linewidth=1, color='r',label="mean: "+str(zemean)[0:5]+"\nstd: "+str(zestd)[0:5])
+                            legend(loc=0,frameon=False)
                             title("Histogram fig(1) "+ope+" fig(2)")
                             subplot(subv,subh,nplot) # go back to last plot for title of contour difference
-
+                            
                     elif which == "contour":
                         zevminc, zevmaxc = calculate_bounds(what_I_plot_frame, vmin=min(what_I_plot_frame), vmax=max(what_I_plot_frame))