From 17eee222af89fd7d71991df39e46c8a955d0e12a Mon Sep 17 00:00:00 2001 From: caes Date: Thu, 22 Jun 2017 06:19:42 -0400 Subject: [PATCH] updates --- scripts/{propagate_tables.sh => compute_psdlags.sh} | 10 +++++++--- scripts/plot_psdlag_grid.sh | 2 +- scripts/psdlag_4bin.py | 9 +++++---- 3 files changed, 13 insertions(+), 8 deletions(-) rename scripts/{propagate_tables.sh => compute_psdlags.sh} (72%) diff --git a/scripts/propagate_tables.sh b/scripts/compute_psdlags.sh similarity index 72% rename from scripts/propagate_tables.sh rename to scripts/compute_psdlags.sh index 8cebd43..661d237 100755 --- a/scripts/propagate_tables.sh +++ b/scripts/compute_psdlags.sh @@ -7,11 +7,15 @@ ref_band="1367A" for lightcurve in data/lc/*.lc do - echo_band=$(basename $lightcurve|sed 's|[^≺]*[_ ]≺[_ ]\([^≺_ ]*\)[_ ]{[^_ ]*}|\1|') + echo_band=$(basename $lightcurve|sed 's|\([0-9]????A\).lc|\1|') if [[ $ref_band == $echo_band ]]; then continue; fi - err_str=$(basename $lightcurve|sed 's|[^≺]*[_ ]≺[_ ][^≺_ ]*[_ ]{[^_ ]*;\(σ∊[CLM][MFC]\)}|\1|') + err_str="LF" + +echo -n "Running psdlag using ref band ${ref_band}" +echo " and echo band $echo_band{${err_str}}." + +scripts/psdlag_4bin.py -echo "Tabling PSD and time lags referred to ${ref_band} for $echo_band{${err_str}}." # Propagate tables into analyses/tables echoPSD_tabfile=analyses/tables/PSD_${echo_band}_\{${err_str}\}.tab diff --git a/scripts/plot_psdlag_grid.sh b/scripts/plot_psdlag_grid.sh index aacce58..f012430 100644 --- a/scripts/plot_psdlag_grid.sh +++ b/scripts/plot_psdlag_grid.sh @@ -27,7 +27,7 @@ scripts/fix_thor_names.sh for table in analyses/* do # Grab and determine labels of analyses, skip if over the same band. - ref_band=$(basename $table|sed 's|\([^≺]*\)[_ ]≺[_ ][^≺_ ]*[_ ]{[^_ ]*}|\1|') + ref_band=$(basename $table|sed 's|[_ ]≺[_ ][^≺_ ]*[_ ]{[^_ ]*}|\1|') echo_band=$(basename $table|sed 's|[^≺]*[_ ]≺[_ ]\([^≺_ ]*\)[_ ]{[^_ ]*}|\1|') err_str=$(basename $table|sed 's|[^≺]*[_ ]≺[_ ][^≺_ ]*[_ ]{[^_ ]*;\(σ∊[CLM][MFC]\)}|\1|') diff --git a/scripts/psdlag_4bin.py b/scripts/psdlag_4bin.py index 3bf3d3d..fc2e248 100644 --- a/scripts/psdlag_4bin.py +++ b/scripts/psdlag_4bin.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python import numpy as np from scipy.stats import norm from scipy.stats import lognorm @@ -9,11 +10,11 @@ import matplotlib # %pylab inline -ref_file="data/lc/1367A.lc" -echo_file="data/lc/2246A.lc" +#ref_file="data/lc/1367A.lc" +#echo_file="data/lc/2246A.lc" -#ref_file = str(sys.argv[1]) -#echo_file = str(sys.argv[2]) +ref_file = str(sys.argv[1]) +echo_file = str(sys.argv[2]) dt = 0.01