Rename 'coolfunc_calc.sh' and 'coolfunc_calc_erg.sh'

* coolfunc_calc.sh -> calc_coolfunc.sh
* coolfunc_calc_erg.sh -> calc_coolfunc_bands.sh

5 files changed, 9 insertions, 14 deletions

diff --git a/mass_profile/coolfunc_calc.sh b/mass_profile/calc_coolfunc.sh
index ab6b4d3..f67f8c2 100755
--- a/mass_profile/coolfunc_calc.sh
+++ b/mass_profile/calc_coolfunc.sh
@@ -9,6 +9,7 @@
 ##
 ## Change logs:
 ## 2017-02-17, Weitian LI
+##   * Rename from 'coolfunc_calc.sh' to 'calc_coolfunc.sh'
 ##   * Clean up that do not calculate and output <coolfunc_bolo>
 ## 2017-02-16, Weitian LI
 ##   * Do not calculate and output 'flux_cnt_ratio.txt'
@@ -36,7 +37,7 @@ fi
 
 ## specify variable name outside while loop
 ## otherwise the inside vars invisible
-XSPEC_CF_XCM="_coolfunc_calc.xcm"
+XSPEC_CF_XCM="_calc_coolfunc.xcm"
 [ -e "${XSPEC_CF_XCM}" ] && rm -f ${XSPEC_CF_XCM}
 
 ## generate xspec script {{{
diff --git a/mass_profile/coolfunc_calc_erg.sh b/mass_profile/calc_coolfunc_bands.sh
index 02db453..9fa0196 100755
--- a/mass_profile/coolfunc_calc_erg.sh
+++ b/mass_profile/calc_coolfunc_bands.sh
@@ -31,7 +31,7 @@ fi
 
 ## specify variable name outside while loop
 ## otherwise the inside vars invisible
-XSPEC_CF_XCM="_coolfunc_calc.xcm"
+XSPEC_CF_XCM="_calc_coolfunc_bands.xcm"
 [ -e "${XSPEC_CF_XCM}" ] && rm -f ${XSPEC_CF_XCM}
 
 ## generate xspec script {{{
diff --git a/mass_profile/calc_lxfx.sh b/mass_profile/calc_lxfx.sh
index a86acc2..a8cb053 100755
--- a/mass_profile/calc_lxfx.sh
+++ b/mass_profile/calc_lxfx.sh
@@ -17,12 +17,6 @@
 # Weitian LI
 # 2016-06-07
 #
-# Change logs:
-# 2017-02-17, Weitian LI
-#   * Remove useless call of 'coolfunc_calc.sh'
-# 2017-02-07, Weitian LI
-#   * Update to use the new style configuration files
-#
 
 if [ $# -eq 2 ] || [ $# -eq 3 ]; then
     :
@@ -85,7 +79,7 @@ bolo
 0.1 2.4
 _EOF_
 
-${base_path}/coolfunc_calc_erg.sh ${tprofile} ${abund} \
+${base_path}/calc_coolfunc_bands.sh ${tprofile} ${abund} \
             ${nh} ${z} "cfunc_" ${BLIST}
 
 PROG="calc_lx_${MODEL}"
@@ -144,7 +138,7 @@ for i in `seq 1 ${MC_TIMES}`; do
 
     echo "### `pwd -P`"
     echo "### ${i} / ${MC_TIMES} ###"
-    ${base_path}/coolfunc_calc_erg.sh ${tprofile} ${abund} \
+    ${base_path}/calc_coolfunc_bands.sh ${tprofile} ${abund} \
                 ${nh} ${z} "cfunc_" ${BLIST}
     ${base_path}/${PROG} ${TMP_SBP_CFG} ${rout} \
                 cfunc_bolo.dat \
diff --git a/mass_profile/fit_mass.sh b/mass_profile/fit_mass.sh
index a5fadce..f349f24 100755
--- a/mass_profile/fit_mass.sh
+++ b/mass_profile/fit_mass.sh
@@ -94,8 +94,8 @@ cp -fv ${tprofile_dump} ${tprofile}
 mv -fv ${tprofile_dump} ${tprofile_center}
 mv -fv fit_result.qdp ${tprofile_fit_center}
 
-$base_path/coolfunc_calc.sh ${tprofile_center} \
-                            ${abund} ${nh} ${z} ${cfunc_profile}
+${base_path}/calc_coolfunc.sh ${tprofile_center} \
+            ${abund} ${nh} ${z} ${cfunc_profile}
 cfunc_profile_center="coolfunc_profile_center.txt"
 cp -f ${cfunc_profile} ${cfunc_profile_center}
 
@@ -163,7 +163,7 @@ for i in `seq 1 ${MC_TIMES}`; do
 
     printf "## ${i} / ${MC_TIMES} ##\n"
     printf "## `pwd -P` ##\n"
-    ${base_path}/coolfunc_calc.sh ${tprofile} ${abund} ${nh} ${z} ${cfunc_profile}
+    ${base_path}/calc_coolfunc.sh ${tprofile} ${abund} ${nh} ${z} ${cfunc_profile}
     ${base_path}/${PROG_SBPFIT} ${TMP_SBP_CFG} 2> /dev/null
     cat ${RES_SBPFIT}
     ${base_path}/fit_nfw_mass mass_int.dat ${z} ${nfw_rmin_kpc} 2> /dev/null
diff --git a/mass_profile/fit_sbp.sh b/mass_profile/fit_sbp.sh
index 02ee0d0..5989ff1 100755
--- a/mass_profile/fit_sbp.sh
+++ b/mass_profile/fit_sbp.sh
@@ -53,7 +53,7 @@ ${base_path}/fit_wang2012_model ${tprofile_data} ${tprofile_cfg} \
             ${cm_per_pixel} 2> /dev/null
 cp wang2012_dump.qdp ${tprofile}
 if [ ! -f ${cfunc_profile} ]; then
-    ${base_path}/coolfunc_calc.sh ${tprofile} ${abund} ${nh} ${z} \
+    ${base_path}/calc_coolfunc.sh ${tprofile} ${abund} ${nh} ${z} \
                 ${cfunc_profile}
 fi
 ${base_path}/${PROG} ${sbp_cfg}