diff --git a/plot.sh b/plot.sh index 0735b24..d4ceb99 100755 --- a/plot.sh +++ b/plot.sh @@ -53,7 +53,6 @@ case $1 in "tophat") gnuplot_file=tophat_w_fft.gp - ;; *) diff --git a/pres/final/final.odp b/pres/final/final.odp index b7f0dcb..df7e738 100644 Binary files a/pres/final/final.odp and b/pres/final/final.odp differ diff --git a/pres/final/final.pdf b/pres/final/final.pdf index 2f41a01..e6e50c3 100644 Binary files a/pres/final/final.pdf and b/pres/final/final.pdf differ diff --git a/pres/img/tophat_freqdomain.pdf b/pres/img/tophat_freqdomain.pdf index c343e6d..1760a0c 100644 Binary files a/pres/img/tophat_freqdomain.pdf and b/pres/img/tophat_freqdomain.pdf differ diff --git a/pres/img/tophat_timedomain.pdf b/pres/img/tophat_timedomain.pdf index 3a49c7f..2808ded 100644 Binary files a/pres/img/tophat_timedomain.pdf and b/pres/img/tophat_timedomain.pdf differ diff --git a/scripts/plot_psdlag.sh b/scripts/plot_psdlag.sh index e101758..d06b653 100755 --- a/scripts/plot_psdlag.sh +++ b/scripts/plot_psdlag.sh @@ -54,20 +54,20 @@ do sed "s|%TITLE%|Power Spectrum for Lightcurves $echo_band and $ref_band|"| sed "s|%SUBTITLE%|as reported by Fausnaugh et. al, STORM III, 2016|"| sed "s|%FILE1%|$echoPSD_tabfile|"| - sed "s|%LABEL1%|${echo_band} PSD|"| + sed "s|%LABEL1%|${echo_band}|"| #sed "s|%FILE2%|$refPSD_tabfile|"| - #sed "s|%LABEL2%|${ref_band} PSD|"| + #sed "s|%LABEL2%|${ref_band}|"| sed "s|%YMIN%|$ymin|"|sed "s|%YMAX|$ymax|"| sed "s|%OUTPUTFILE%|$PSD_plotfile|" > tmp.gp gnuplot tmp.gp # Plot time lags and save using gnuplot # read ymin ymax <<< $(ywindow_of $timelag_tabfile) - cat scripts/templates/timelag_freq.gp| + cat scripts/templates/timelag.gp| sed "s|%TITLE%|Time Lag for Lightcurve $echo_band relative to $ref_band|"| sed "s|%SUBTITLE%|as reported by Fausnaugh et. al, STORM III, 2016|"| sed "s|%FILE1%|$timelag_tabfile|"| - sed "s|%LABEL1%|${echo_band} Lag|"| + sed "s|%LABEL1%|${echo_band}|"| sed "s|%YMIN%|$ymin|"|sed "s|%YMAX|$ymax|"| sed "s|%OUTPUTFILE%|$timelag_plotfile|" > tmp.gp gnuplot tmp.gp diff --git a/scripts/templates/psd.gp b/scripts/templates/psd.gp index 4989ffb..ca5b22f 100644 --- a/scripts/templates/psd.gp +++ b/scripts/templates/psd.gp @@ -7,10 +7,7 @@ set termopt enhanced set macros # Placement of the a,b,c,d labels in the graphs - POS = "at graph 0.7,0.92 font 'Times,24'" - - - + POS = "at graph 0.8,0.84 font 'Times,24'" XLABEL = "set xlabel 'Temporal Frequency [days^{-1}]' font 'Times' off 0,1;\ set format x '10^{%+3T}'" YLABEL = "set ylabel 'log_{10} PSD' font 'Times' offset 1,2.5;\ @@ -29,7 +26,7 @@ set ylabel "log_{10} PSD" font "Times,24" set yrange [-5.5:0.5] set ytics auto font 'Times,16' set ytics add ('' -0.5 1,'' -1.5 1,'' -2.5 1,'' -3.5 1,'' -4.5 1) -set yzeroaxis +set xzeroaxis set label 1 '%LABEL1%' @POS diff --git a/scripts/templates/timelag.gp b/scripts/templates/timelag.gp new file mode 100644 index 0000000..731221f --- /dev/null +++ b/scripts/templates/timelag.gp @@ -0,0 +1,36 @@ +set terminal pdf +set output "%OUTPUTFILE%" +set termopt enhanced + +set macros + + # Placement of the a,b,c,d labels in the graphs + POS = "at graph 0.8,0.92 font 'Times,24'" + XLABEL = "set xlabel 'Temporal Frequency [days^{-1}]' font 'Times' off 0,1;\ + set format x '10^{%+3T}'" + YLABEL = "set ylabel 'log_{10} PSD' font 'Times' offset 1,2.5;\ + set format y '%.0t'" + +unset title +unset key + +set xlabel "Temporal Frequency [days^{-1}]" font "Times,24" +set xrange [0.005:0.620] +set xtics auto font 'Times,16' +set logscale x +set xzeroaxis + +set ylabel "Lag [days]" font "Times,24" +set yrange [-2:6] +#set ytics (-1,0,1,2,3,4,5) font 'Times,16' +set ytics auto font 'Times,16' +set ytics add ('' -1.5 1,'' -0.5 1,'' 0.5 1,'' 1.5 1,'' 2.5 1,'' 3.5 1,'' 4.5 1,'' 5.5 1) + + + +# Draw line at origin +#set arrow from 0.005,0 to 0.620,0 nohead lt 3 lc rgb 'black' +#set pointsize 0 + +set label 1 '%LABEL1%' @POS +plot '%FILE1%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .5 lt rgb "black" \ No newline at end of file diff --git a/scripts/templates/timelag_freq.gp b/scripts/templates/timelag_freq.gp deleted file mode 100644 index 19217eb..0000000 --- a/scripts/templates/timelag_freq.gp +++ /dev/null @@ -1,17 +0,0 @@ -set terminal png -set termoption dash -set output "%OUTPUTFILE" - -set title "%TITLE\n{/*0.7 %SUBTITLE}" -set xlabel "Temporal Frequency [days^{-1}]" -set xrange [0.005:0.620] -set logscale x - -set ylabel "Lag [days]" -#set yrange [%YMIN:%YMAX] - -# Draw line at origin -set arrow from 0.005,0 to 0.603,0 nohead lt 3 lc rgb 'black' - - -plot '%FILE1' using 1:2:3:4 with xyerrorbars title "%LABEL1"