Fix typos in sine plots

- Use `C1` instead of `orange` to match other plots.
- Remove extra plot in `sine-logscale.pdf`, which causes a bit of
  artifacting around the line.
- Ensure text matches what is actually plotted for `markevery` settings;
  note I divided by 10 so that the text would fit in the block.

Fixes #133

Author: QuLogic

handout-beginner.tex

@@ -83,7 +83,7 @@ \section*{\LARGE \rmfamily
 %
 \fbox{2} \textbf{Prepare}
 \begin{lstlisting}
- X = np.linspace(0, 4*np.pi, 1000)
+ X = np.linspace(0, 10*np.pi, 1000)
  Y = np.sin(X)
 \end{lstlisting}
 %

handout-intermediate.tex

@@ -130,7 +130,7 @@ \subsection*{\rmfamily Lines \& markers}
 \begin{lstlisting}
  X = np.linspace(0.1, 10*np.pi, 1000)
  Y = np.sin(X)
- ax.plot(X, Y, "C1o:", markevery=25, mec="1.0")
+ ax.plot(X, Y, "C1o:", markevery=50, mec="1.0")
 \end{lstlisting}
 \includegraphics[width=\linewidth]{sine-marker.pdf}
 
@@ -140,7 +140,7 @@ \subsection*{\rmfamily Scales \& projections}
 \begin{lstlisting}
  fig, ax = plt.subplots()
  ax.set_xscale("log")
- ax.plot(X, Y, "C1o-", markevery=25, mec="1.0")
+ ax.plot(X, Y, "C1o-", markevery=50, mec="1.0")
 \end{lstlisting}
 \includegraphics[width=\linewidth]{sine-logscale.pdf}
 

scripts/sine.py

@@ -16,36 +16,42 @@
     ROOT_DIR / 'styles/sine-plot.mplstyle',
 ])
 
-X = np.linspace(0.1, 10*np.pi, 10000)
+X = np.linspace(0, 10*np.pi, 1000)
 Y = np.sin(X)
 
-(fig, ax) = plt.subplots(figsize=(5.7/2.54, 1.2/2.54))
+
+fig, ax = plt.subplots(figsize=(5.7/2.54, 1.2/2.54))
 ax.set_yticks(np.linspace(-1, 1, 5))
-ax.plot(X, Y, color="orange")
+ax.plot(X, Y, color="C1")
 fig.savefig(ROOT_DIR / "figures/sine.pdf")
 
-(fig, ax) = plt.subplots(figsize=(5.7/2.54, 1.0/2.54))
-ax.plot(X, Y, "C1o:", markevery=500, mec="1.0")
+
+X = np.linspace(0.1, 10*np.pi, 1000)
+Y = np.sin(X)
+
+
+fig, ax = plt.subplots(figsize=(5.7/2.54, 1.0/2.54))
+ax.plot(X, Y, "C1o:", markevery=50, mec="1.0")
 ax.set_ylim(-1.5, 1.5)
 fig.savefig(ROOT_DIR / "figures/sine-marker.pdf")
 
+
 fig, ax = plt.subplots(figsize=(5.7/2.54, 1.0/2.54))
 ax.set_xscale("log")
-ax.plot(X, Y, "-")
-ax.plot(X, Y, "C1o-", markevery=500, mec="1.0")
+ax.plot(X, Y, "C1o-", markevery=50, mec="1.0")
 ax.set_ylim(-1.5, 1.5)
 fig.savefig(ROOT_DIR / "figures/sine-logscale.pdf")
 
 
-(fig, ax) = plt.subplots(figsize=(5.7/2.54, 1.0/2.54))
+fig, ax = plt.subplots(figsize=(5.7/2.54, 1.0/2.54))
 ax.plot(X, Y, "C1")
 ax.fill_betweenx([-1.5, 1.5], [0], [2*np.pi], color=".9")
 ax.text(0, -1, r" Period $\Phi$", va="top")
 ax.set_ylim(-1.5, 1.5)
 fig.savefig(ROOT_DIR / "figures/sine-period.pdf")
 
 
-(fig, ax) = plt.subplots(figsize=(5.7/2.54, 1.0/2.54))
+fig, ax = plt.subplots(figsize=(5.7/2.54, 1.0/2.54))
 ax.plot(X, np.sin(X), "C0", label="Sine")
 ax.plot(X, np.cos(X), "C1", label="Cosine")
 ax.legend(bbox_to_anchor=(0.0, .9, 1.02, 0.1),
@@ -56,7 +62,7 @@
 fig.savefig(ROOT_DIR / "figures/sine-legend.pdf")
 
 
-(fig, ax) = plt.subplots(figsize=(5.7/2.54, 1.0/2.54))
+fig, ax = plt.subplots(figsize=(5.7/2.54, 1.0/2.54))
 X = np.linspace(0, 10*np.pi, 1000)
 Y = np.sin(X)
 ax.plot(X, Y, "C1o-", markevery=50, mec="1.0")