aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/fit_mass.sh2
-rwxr-xr-xbin/fit_sbp.sh2
-rwxr-xr-xscripts/ciao_calc_csb.sh2
-rwxr-xr-xscripts/ciao_calc_ct.sh2
-rwxr-xr-xscripts/ciao_r500avgt.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/bin/fit_mass.sh b/bin/fit_mass.sh
index f349f24..8df5966 100755
--- a/bin/fit_mass.sh
+++ b/bin/fit_mass.sh
@@ -71,7 +71,7 @@ sbp_data=`grep '^sbp_data' ${sbp_cfg} | awk '{ print $2 }'`
tprofile=`grep '^tprofile' ${sbp_cfg} | awk '{ print $2 }'`
cfunc_profile=`grep '^cfunc_profile' ${sbp_cfg} | awk '{ print $2 }'`
z=`grep '^z' ${sbp_cfg} | awk '{ print $2 }'`
-cm_per_pixel=`cosmo_calc ${z} | grep 'cm/pixel' | awk -F':' '{ print $2 }'`
+cm_per_pixel=`cosmo_calc.py -b --cm-per-pixel ${z}`
sed -i'' "s/^cm_per_pixel.*$/cm_per_pixel ${cm_per_pixel}/" ${sbp_cfg}
if grep -q '^beta2' $sbp_cfg; then
diff --git a/bin/fit_sbp.sh b/bin/fit_sbp.sh
index 5989ff1..9e98bc4 100755
--- a/bin/fit_sbp.sh
+++ b/bin/fit_sbp.sh
@@ -36,7 +36,7 @@ tprofile_data=`grep '^tprofile_data' ${mass_cfg} | awk '{ print $2 }'`
tprofile_cfg=`grep '^tprofile_cfg' ${mass_cfg} | awk '{ print $2 }'`
z=`grep '^z' ${sbp_cfg} | awk '{ print $2 }'`
-cm_per_pixel=`cosmo_calc ${z} | grep 'cm/pixel' | awk -F':' '{ print $2 }'`
+cm_per_pixel=`cosmo_calc.py -b --cm-per-pixel ${z}`
sed -i'' "s/^cm_per_pixel.*$/cm_per_pixel ${cm_per_pixel}/" ${sbp_cfg}
cfunc_profile=`grep '^cfunc_profile' ${sbp_cfg} | awk '{ print $2 }'`
tprofile=`grep '^tprofile' ${sbp_cfg} | awk '{ print $2 }'`
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"