Makefile: stupid fixes

diff --git a/Makefile b/Makefile
index 45ccbbaeb0f974db026de214c8f6ec6d2ccc4589..142348e7448a4f0ab921c8735f08ff43e8cffd7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,7 @@ $(CXX_PROGRAMS): % : $$($$(*)_OBJECTS)
 # where plot.gp was a gnuplot script for plotting data generated by
 # RUN_PROGRAM.
 run: angle-vs-y0.png time-vs-y0.png trajectories.png \
-       angle-vs-y0-E.png angle-vs-y0-E.png
+       angle-vs-y0-E.png time-vs-y0-E.png
 
 .SECONDEXPANSION:
 final-vs-y0.data: scatter
@@ -168,13 +168,11 @@ trajectories.data: scatter
                echo '' >> "$@"; \
        done
 
-#      for y0 in $$(seq 0.0 0.00078125 0.8); do \
-#              for E in $$(seq 0.1 0.00107421875 1.2); do 
 .SECONDEXPANSION:
 final-vs-y0-E.data: scatter
        printf "# y0\tinitial energy\ttime\tangle\tenergy\n" > "$@"
-       for y0 in $$(seq 0.0 0.1 0.8); do \
-               for E in $$(seq 0.1 0.1 1.2); do \
+       for y0 in $$(seq 0.0 0.00078125 0.8); do \
+               for E in $$(seq 0.1 0.00107421875 1.2); do \
                        printf "%s\t%s\t" "$$y0" "$$E" >> "$@"; \
                        ./scatter --y0 "$$y0" --vx0-energy "$$E" --final >> "$@"; \
                done \
@@ -190,10 +188,10 @@ trajectories.png: trajectories.gp trajectories.data
        gnuplot "$<" > "$@"
 
 time-vs-y0-E.png: plot_image.py final-vs-y0-E.data
-       cut -d '        ' -f 1,2,3 final-vs-y0-E.data | python2.7 ./plot_image.py --xyz -t 'Time vs impact parameter and energy'
+       cut -d '        ' -f 1,2,3 final-vs-y0-E.data | python2.7 ./plot_image.py --xyz -t 'Time vs impact parameter and energy' -o "$@"
 
 angle-vs-y0-E.png: plot_image.py final-vs-y0-E.data
-       cut -d '        ' -f 1,2,4 final-vs-y0-E.data | python2.7 ./plot_image.py --xyz -t 'Angle vs impact parameter and energy'
+       cut -d '        ' -f 1,2,4 final-vs-y0-E.data | python2.7 ./plot_image.py --xyz -t 'Angle vs impact parameter and energy' -o "$@"
 
 # Pattern rule for compiling object files from C++ source
 # There is an implicit rule for this in GNU make