diff options
| author | Aaron LI <aaronly.me@outlook.com> | 2017-02-21 23:25:13 +0800 |
|---|---|---|
| committer | Aaron LI <aaronly.me@outlook.com> | 2017-02-21 23:25:13 +0800 |
| commit | a25e7664ae76d699533a5cbd92f38b45c2fba72a (patch) | |
| tree | 10481255c8cf7509a53d05dd268932d8d088ce84 /scripts | |
| parent | d813448c1b9a16d58c8d24d27267893b39c4b908 (diff) | |
| download | chandra-acis-analysis-a25e7664ae76d699533a5cbd92f38b45c2fba72a.tar.bz2 | |
Update to use 'cosmo_calc.py' instead of 'cosmo_calc'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ciao_calc_csb.sh | 2 | ||||
| -rwxr-xr-x | scripts/ciao_calc_ct.sh | 2 | ||||
| -rwxr-xr-x | scripts/ciao_r500avgt.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/ciao_calc_csb.sh b/scripts/ciao_calc_csb.sh index 6749c64..dc2aea5 100755 --- a/scripts/ciao_calc_csb.sh +++ b/scripts/ciao_calc_csb.sh @@ -196,7 +196,7 @@ if [ `echo "${Z} < 0.3" | bc -l` -eq 1 ]; then # exit ${ERR_Z} fi -KPC_PER_PIX=`cosmo_calc ${Z} | \grep 'kpc.*pix' | tr -d 'a-zA-Z_#=(),:/ '` +KPC_PER_PIX=`cosmo_calc.py -b --kpc-per-pix ${Z}` RC_PIX=`echo "scale=2; 0.048 * ${R500} / ${KPC_PER_PIX}" | bc -l` # test counts_in_0.048R500<500? RC_REG="pie(${X},${Y},0,${RC_PIX},0,360)" diff --git a/scripts/ciao_calc_ct.sh b/scripts/ciao_calc_ct.sh index 65f584a..4b47c90 100755 --- a/scripts/ciao_calc_ct.sh +++ b/scripts/ciao_calc_ct.sh @@ -234,7 +234,7 @@ case "${R500_UNI}" in ;; *) printf "## units in \`kpc', convert to \`Chandra pixel'\n" | ${TOLOG} - KPC_PER_PIX=`cosmo_calc ${REDSHIFT} | \grep 'kpc.*pix' | tr -d 'a-zA-Z_#=(),:/ '` + KPC_PER_PIX=`cosmo_calc.py -b --kpc-per-pix ${REDSHIFT}` # convert scientific notation for `bc' KPC_PER_PIX_B=`echo ${KPC_PER_PIX} | sed 's/[eE]/\*10\^/' | sed 's/+//'` printf "## calculated \`kpc/pixel': ${KPC_PER_PIX_B}\n" diff --git a/scripts/ciao_r500avgt.sh b/scripts/ciao_r500avgt.sh index b94554b..b504ebf 100755 --- a/scripts/ciao_r500avgt.sh +++ b/scripts/ciao_r500avgt.sh @@ -243,7 +243,7 @@ case "${R500_UNI}" in ;; *) printf "## units in \`kpc', convert to \`Chandra pixel'\n" | ${TOLOG} - KPC_PER_PIX=`cosmo_calc ${REDSHIFT} | \grep 'kpc.*pix' | tr -d 'a-zA-Z_#=(),:/ '` + KPC_PER_PIX=`cosmo_calc.py -b --kpc-per-pix ${REDSHIFT}` # convert scientific notation for `bc' KPC_PER_PIX_B=`echo ${KPC_PER_PIX} | sed 's/[eE]/\*10\^/' | sed 's/+//'` printf "## calculated \`kpc/pixel': ${KPC_PER_PIX_B}\n" |