Minor efficiency and visual fixes: Added limitedsize support to expressions. Fixed diff overriding plot and colorbar titles. Fixed diff default title having too many decimal places for dt (now automatically 2). Changed colorbar title fontweight to normal (does not affect regular cb titles, as they go through math formatting). Fixed user-defined cb titles automatically going through math formatting.

Author: plauri

analysator/plot/plot_colormap3dslice.py

@@ -586,7 +586,10 @@ def plot_colormap3dslice(filename=None,
             if datamap_unit_latex:
                 cb_title_use = cb_title_use + r"\,["+datamap_unit_latex+"]"
 
-            datamap = np.reshape(datamap_info.data, np.shape(datamap))
+            if np.ndim(datamap_info.data) == 1: # Scalar variable
+                datamap = np.reshape(datamap_info.data, np.shape(datamap))
+            else: 
+                datamap = np.reshape(datamap_info.data, np.shape(datamap)+(np.shape(datamap_info.data)[1],))
     else:
         # Expression set, use generated or provided colorbar title
         cb_title_use = expression.__name__ + operatorstr
@@ -688,8 +691,12 @@ def plot_colormap3dslice(filename=None,
                         pass_map = np.swapaxes(pass_map, 0,1)
                 else:
                     # vlasov grid, AMR
-                    pass_map = f.read_variable(mapval)
+                    if not limitedsize:
+                        pass_map = f.read_variable(mapval)
+                    else:
+                        pass_map = f.read_variable("CellID")
                     pass_map = pass_map[indexids] # sort
+
                     if pass3d:
                         if np.ndim(pass_map)==1:
                             pass_shape = None
@@ -718,6 +725,15 @@ def plot_colormap3dslice(filename=None,
                         pass_map = pass_map[MaskX[0]:MaskX[-1]+1,...]
                         pass_map = pass_map[:,MaskY[0]:MaskY[-1]+1,...]
 
+                if limitedsize:
+                    ids_list = pass_map.flatten()
+                    passmap_list = f.read_variable(mapval, cellids=ids_list)
+
+                    if np.ndim(passmap_list) == 1: # Scalar variable
+                        pass_map = np.reshape(passmap_list.data, np.shape(pass_map))
+                    else: 
+                        pass_map = np.reshape(passmap_list, np.shape(pass_map)+(np.shape(passmap_list)[1],))
+
                 pass_maps[mapval] = pass_map # add to the dictionary
         else:
             # Or gather over a number of time steps
@@ -819,15 +835,16 @@ def plot_colormap3dslice(filename=None,
         while True:
             diffvar = next(listofkeys)
             if diffvar!="dstep": break
-        cb_title_use = pt.plot.mathmode(pt.plot.bfstring(pt.plot.rmstring("DIFF0~"+diffvar.replace("_",r"\_"))))
+        if cbtitle is None:
+            cb_title_use = pt.plot.mathmode(pt.plot.bfstring(pt.plot.rmstring("DIFF0~"+diffvar.replace("_",r"\_"))))
     # Evaluate time difference
     if diff:
         tvf=pt.vlsvfile.VlsvReader(filename)
         t0 = tvf.read_parameter('time')
         tvf1=pt.vlsvfile.VlsvReader(diff)
         t1 = tvf1.read_parameter('time')
-        if (not np.isclose(t1-t0, 0.0, rtol=1e-6)):
-            plot_title = plot_title + "~dt=" + str(t1-t0)
+        if (not np.isclose(t1-t0, 0.0, rtol=1e-6)) and title is None:
+            plot_title = plot_title + r"$\qquad $" + "~dt=" + str(round(t1-t0,2))
 
     #Optional user-defined expression used for color panel instead of a single pre-existing var
     if expression:
@@ -1320,7 +1337,7 @@ def plot_colormap3dslice(filename=None,
             cbdir="right"
 
         # Colourbar title
-        if len(cb_title_use)!=0:
+        if len(cb_title_use)!=0 and cbtitle is None:
             cb_title_use = pt.plot.mathmode(pt.plot.bfstring(cb_title_use))
 
         # Set flag which affects colorbar decimal precision
@@ -1344,11 +1361,11 @@ def plot_colormap3dslice(filename=None,
         if not cbaxes:
 
             cb.ax.tick_params(labelsize=fontsize3,width=thick,length=3*thick,rotation=30 if cb_horizontal else 0)
-            cb_title = cax.set_title(cb_title_use,fontsize=fontsize3,fontweight='bold', horizontalalignment=horalign)
+            cb_title = cax.set_title(cb_title_use,fontsize=fontsize3,fontweight='normal', horizontalalignment=horalign)
             cb_title.set_position((0.,1.+0.025*scale)) # avoids having colourbar title too low when fontsize is increased
         else:
             cb.ax.tick_params(labelsize=fontsize,width=thick,length=3*thick)
-            cb_title = cax.set_title(cb_title_use,fontsize=fontsize,fontweight='bold', horizontalalignment=horalign)
+            cb_title = cax.set_title(cb_title_use,fontsize=fontsize,fontweight='normal', horizontalalignment=horalign)
 
         # Perform intermediate draw if necessary to gain access to ticks
         if (symlog is not None and np.isclose(vminuse/vmaxuse, -1.0, rtol=0.2)) or (not lin and symlog is None):