Merge branch 'debug' of https://github.itap.purdue.edu/MintonGroup/sw…

…iftest into debug

examples/symba_chambers_2013/aescattermovie.py

@@ -38,8 +38,8 @@ def __init__(self, ds, param):
         self.ax.set_xlim(xmin, xmax)
         self.ax.set_ylim(ymin, ymax)
         fig.add_axes(self.ax)
-        self.ani = animation.FuncAnimation(fig, self.update, interval=1, frames=nframes, init_func=self.setup_plot, blit=True)
-        self.ani.save('aescatter.mp4', fps=30, dpi=300, extra_args=['-vcodec', 'libx264'])
+        self.ani = animation.FuncAnimation(fig, self.update, interval=1, frames=nframes, init_func=self.setup_plot, blit=False)
+        self.ani.save('aescatter.mp4', fps=30, dpi=300, extra_args=['-vcodec', 'mpeg4'])
         print('Finished writing aescattter.mp4')
 
     def scatters(self, pl, radmarker, origin):
@@ -70,7 +70,7 @@ def setup_plot(self):
         self.s1 = slist[1]
         self.s2 = slist[2]
         self.s3 = slist[3]
-        self.ax.legend(loc='upper right')
+        self.ax.legend(loc='lower right')
         return self.s0, self.s1, self.s2, self.s3, self.title
 
     def data_stream(self, frame=0):

examples/symba_clement_2018/aescattermovie.py

@@ -38,8 +38,8 @@ def __init__(self, ds, param):
         self.ax.set_xlim(xmin, xmax)
         self.ax.set_ylim(ymin, ymax)
         fig.add_axes(self.ax)
-        self.ani = animation.FuncAnimation(fig, self.update, interval=1, frames=nframes, init_func=self.setup_plot, blit=True)
-        self.ani.save('aescatter.mp4', fps=30, dpi=300, extra_args=['-vcodec', 'libx264'])
+        self.ani = animation.FuncAnimation(fig, self.update, interval=1, frames=nframes, init_func=self.setup_plot, blit=False)
+        self.ani.save('aescatter.mp4', fps=30, dpi=300, extra_args=['-vcodec', 'mpeg4'])
         print('Finished writing aescattter.mp4')
 
     def scatters(self, pl, radmarker, origin):
@@ -70,7 +70,7 @@ def setup_plot(self):
         self.s1 = slist[1]
         self.s2 = slist[2]
         self.s3 = slist[3]
-        self.ax.legend(loc='upper right')
+        self.ax.legend(loc='lower right')
         return self.s0, self.s1, self.s2, self.s3, self.title
 
     def data_stream(self, frame=0):

examples/symba_mars_disk/aescattermovie.py

@@ -19,7 +19,7 @@ class AnimatedScatter(object):
     def __init__(self, ds, param):
 
         frame = 0
-        nframes = ds['time'].size
+        nframes = int(ds['time'].size / framejump)
         self.ds = ds
         self.param = param
         self.ds['radmarker'] = self.ds['Radius'].fillna(0)
@@ -38,8 +38,8 @@ def __init__(self, ds, param):
         self.ax.set_xlim(xmin, xmax)
         self.ax.set_ylim(ymin, ymax)
         fig.add_axes(self.ax)
-        self.ani = animation.FuncAnimation(fig, self.update, interval=1, frames=nframes, init_func=self.setup_plot, blit=True)
-        self.ani.save('aescatter.mp4', fps=30, dpi=300, extra_args=['-vcodec', 'libx264'])
+        self.ani = animation.FuncAnimation(fig, self.update, interval=1, frames=nframes, init_func=self.setup_plot, blit=False)
+        self.ani.save('aescatter.mp4', fps=30, dpi=300, extra_args=['-vcodec', 'mpeg4'])
         print('Finished writing aescattter.mp4')
 
     def scatters(self, pl, radmarker, origin):