4bins and 7bins mostly successful

This commit is contained in:
caes 2017-06-22 09:28:23 -04:00
parent d4a11cb367
commit 851ce89ac9
5 changed files with 43 additions and 28 deletions

View File

@ -36,6 +36,9 @@ do
scripts/process_output.pl $echo_band scripts/process_output.pl $echo_band
# So if one fails we don't read the previous output
rm *.out
# saves the tables to data/tables/ # saves the tables to data/tables/
mv -v tmp.echopsd $echopsd_tabfile mv -v tmp.echopsd $echopsd_tabfile
mv -v tmp.refpsd $refpsd_tabfile mv -v tmp.refpsd $refpsd_tabfile

View File

@ -45,8 +45,8 @@ case $1 in
rm $gnuplot_file rm $gnuplot_file
;; ;;
"twolags"|"2lags") "twolags"|"2lags"|"overlay")
gnuplot_file=lag_overlay_atlas.gp gnuplot_file=lag_atlas_overlay.gp
gnuplot_input=$(cat scripts/templates/${gnuplot_file}|perl -pe 's|\n|␤|g') gnuplot_input=$(cat scripts/templates/${gnuplot_file}|perl -pe 's|\n|␤|g')
for tabfile in data/tables/${2}/lag_*.tab; for tabfile in data/tables/${2}/lag_*.tab;
do do
@ -56,7 +56,7 @@ case $1 in
sed 's|lag_[0-9]\{4\}A_\([0-9]\{4\}A\).tab|\1|') sed 's|lag_[0-9]\{4\}A_\([0-9]\{4\}A\).tab|\1|')
if [[ "$echo_band" == "$ref_band" ]] ; then continue; fi if [[ "$echo_band" == "$ref_band" ]] ; then continue; fi
gnuplot_input_edit=$(echo "$gnuplot_input"| gnuplot_input_edit=$(echo "$gnuplot_input"|
sed "s|%FILE%|$tabfile|"| sed "s|%FILEA%|$tabfile|"|
sed "s|%LABEL%|$echo_band|") sed "s|%LABEL%|$echo_band|")
gnuplot_input="${gnuplot_input_edit}" gnuplot_input="${gnuplot_input_edit}"
done done
@ -68,7 +68,7 @@ case $1 in
sed 's|lag_[0-9]\{4\}A_\([0-9]\{4\}A\).tab|\1|') sed 's|lag_[0-9]\{4\}A_\([0-9]\{4\}A\).tab|\1|')
if [[ "$echo_band" == "$ref_band" ]] ; then continue; fi if [[ "$echo_band" == "$ref_band" ]] ; then continue; fi
gnuplot_input_edit=$(echo "$gnuplot_input"| gnuplot_input_edit=$(echo "$gnuplot_input"|
sed "s|%FILE%|$tabfile|"| sed "s|%FILEB%|$tabfile|"|
sed "s|%LABEL%|$echo_band|") sed "s|%LABEL%|$echo_band|")
gnuplot_input="${gnuplot_input_edit}" gnuplot_input="${gnuplot_input_edit}"
done done

View File

@ -30,8 +30,11 @@ t1, l1, l1e = np.loadtxt(ref_file).T
# 0.10747115, 0.62032418]) # 0.10747115, 0.62032418])
#C #C
fqL = np.array([0.0049999999, 0.044733049, 0.10747115, #fqL = np.array([0.0049999999, 0.044733049, 0.10747115,
0.22, 0.56]) # 0.22, 0.56])
#D
fqL = np.logspace(np.log10(0.0049999999),np.log10(0.340002000),5)
nfq = len(fqL) - 1 nfq = len(fqL) - 1
fqd = 10**(np.log10( (fqL[:-1]*fqL[1:]) )/2.) fqd = 10**(np.log10( (fqL[:-1]*fqL[1:]) )/2.)

15
scripts/psdlag_7bin.py Normal file → Executable file
View File

@ -21,11 +21,20 @@ dt = 0.01
t1, l1, l1e = np.loadtxt(ref_file).T t1, l1, l1e = np.loadtxt(ref_file).T
# errorbar(t1, l1, yerr=l1e, fmt='o') # errorbar(t1, l1, yerr=l1e, fmt='o')
#A
fqL = np.logspace(np.log10(0.0049999999),np.log10(0.340002000),8)
#B
#fqL = np.array([0.0049999999, 0.018619375, 0.044733049,
# 0.069336227, 0.10747115, 0.16658029,
# 0.25819945, 0.40020915])
fqL = np.array([0.0049999999, 0.018619375, 0.044733049, 0.069336227, 0.10747115, 0.16658029, #C
0.25819945, 0.40020915]) #fqL = np.array([0.0049999999, 0.018619375, 0.044733049,
#fqL = np.logspace(np.log10(0.005),np.log10(0.4),8) # 0.069336227, 0.10747115, 0.16658029,
# 0.25819945, 0.40020915])
nfq = len(fqL) - 1 nfq = len(fqL) - 1
fqd = 10**(np.log10( (fqL[:-1]*fqL[1:]) )/2.) fqd = 10**(np.log10( (fqL[:-1]*fqL[1:]) )/2.)

View File

@ -1,5 +1,5 @@
set terminal pdf size 3.5,5 set terminal pdf size 3.5,5
set output "lag_atlas.pdf" set output "lag_atlas_overlay.pdf"
set termopt enhanced set termopt enhanced
set macros set macros
@ -50,109 +50,109 @@ set multiplot layout 6,3 rowsfirst
@VSET_1; @HSET_1 @VSET_1; @HSET_1
@NOXNUMS; @YNUMS @NOXNUMS; @YNUMS
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH b # --- GRAPH b
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_1; @HSET_2 @VSET_1; @HSET_2
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
#-- GRAPH c #-- GRAPH c
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_1; @HSET_3 @VSET_1; @HSET_3
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH d # --- GRAPH d
@NOXNUMS; @YNUMS @NOXNUMS; @YNUMS
@VSET_2; @HSET_1 @VSET_2; @HSET_1
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_2; @HSET_2 @VSET_2; @HSET_2
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_2; @HSET_3 @VSET_2; @HSET_3
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @YNUMS @NOXNUMS; @YNUMS
@VSET_3; @HSET_1 @VSET_3; @HSET_1
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_3; @HSET_2 @VSET_3; @HSET_2
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_3; @HSET_3 @VSET_3; @HSET_3
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @YLABEL @NOXNUMS; @YLABEL
@VSET_4; @HSET_1 @VSET_4; @HSET_1
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_4; @HSET_2 @VSET_4; @HSET_2
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_4; @HSET_3 @VSET_4; @HSET_3
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @YNUMS @NOXNUMS; @YNUMS
@VSET_5; @HSET_1 @VSET_5; @HSET_1
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_5; @HSET_2 @VSET_5; @HSET_2
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@NOXNUMS; @NOYNUMS @NOXNUMS; @NOYNUMS
@VSET_5; @HSET_3 @VSET_5; @HSET_3
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@XNUMS; @YNUMS @XNUMS; @YNUMS
@VSET_6; @HSET_1 @VSET_6; @HSET_1
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@XLABEL; @NOYNUMS @XLABEL; @NOYNUMS
@VSET_6; @HSET_2 @VSET_6; @HSET_2
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
# --- GRAPH a # --- GRAPH a
@XNUMS; @NOYNUMS @XNUMS; @NOYNUMS
@VSET_6; @HSET_3 @VSET_6; @HSET_3
set label 1 '%LABEL%' @POS set label 1 '%LABEL%' @POS
plot '%FILE%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black" plot '%FILEA%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "black", '%FILEB%' using 1:2:($2-$4):($2+$4) with yerrorbars pt 7 ps .3 lt rgb "red"
unset multiplot unset multiplot