diff options
| author | Aaron LI <aaronly.me@outlook.com> | 2016-06-08 21:38:46 +0800 |
|---|---|---|
| committer | Aaron LI <aaronly.me@outlook.com> | 2016-06-08 21:38:46 +0800 |
| commit | 2b0f09e67850089441ce4e3cb9f3aaa28beee067 (patch) | |
| tree | ed63a4739b4edf262b2236c3aa8d8d46fa76ece7 /mass_profile/fit_nfwmass.sh | |
| parent | 1bb88e9d112c21f65a0bf74d57cc19397f9ed29e (diff) | |
| download | chandra-acis-analysis-2b0f09e67850089441ce4e3cb9f3aaa28beee067.tar.bz2 | |
Merge 'coolfunc_calc2.sh' into 'coolfunc_calc.sh'
* Merge 'coolfunc_calc{2,}.sh' to reduce duplications
* Clean up 'coolfunc_calc.sh' a bit
* Use 'cosmo_calc' instead of 'calc_distance' in 'coolfunc_calc.sh'
* Update comments/description of 'coolfunc_calc.sh'
* Update 'fit_{sbp,nfwmass}.sh' accordingly
Diffstat (limited to 'mass_profile/fit_nfwmass.sh')
| -rwxr-xr-x | mass_profile/fit_nfwmass.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mass_profile/fit_nfwmass.sh b/mass_profile/fit_nfwmass.sh index 7cab66a..c6e8b8c 100755 --- a/mass_profile/fit_nfwmass.sh +++ b/mass_profile/fit_nfwmass.sh @@ -134,7 +134,7 @@ mv -fv ${T_dump} ${T_file_center} mv -fv fit_result.qdp ${T_file_center} # temp profile }}} -$base_path/coolfunc_calc2.sh ${T_file_center} $abund $nh $z $cfunc_file cfunc_bolo.dat +$base_path/coolfunc_calc.sh ${T_file_center} $abund $nh $z $cfunc_file cfunc_bolo.dat cfunc_file_center="coolfunc_data_center.txt" cp -f ${cfunc_file} ${cfunc_file_center} mv -fv flux_cnt_ratio.txt flux_cnt_ratio_center.txt @@ -213,7 +213,7 @@ for i in `seq 1 ${MC_TIMES}`; do printf "## ${i} / ${MC_TIMES} ##\n" printf "## `pwd -P` ##\n" - ${base_path}/coolfunc_calc2.sh ${T_file} ${abund} ${nh} ${z} ${cfunc_file} + ${base_path}/coolfunc_calc.sh ${T_file} ${abund} ${nh} ${z} ${cfunc_file} ${base_path}/${SBP_PROG} ${TMP_SBP_CFG} 2> /dev/null cat ${RES_SBPFIT} $base_path/fit_nfw_mass mass_int.dat ${z} ${nfw_rmin_kpc} 2> /dev/null |