From 199b75bdd0c7dc67ff3d7946fec85be400680a2e Mon Sep 17 00:00:00 2001
From: Aaron LI <aaronly.me@outlook.com>
Date: Tue, 7 Feb 2017 10:55:24 +0800
Subject: Add new simplified config files and update HOWTO

* Change config filenames
* Change configuration keys to be more intuitive
* Simplify configuration items
---
 HOWTO_chandra_acis_analysis.txt | 30 ++++++++++++++----------------
 files/mass.conf                 |  7 +++++++
 files/sbp_dbeta.conf            | 14 ++++++++++++++
 files/sbp_sbeta.conf            | 11 +++++++++++
 4 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 files/mass.conf
 create mode 100644 files/sbp_dbeta.conf
 create mode 100644 files/sbp_sbeta.conf

diff --git a/HOWTO_chandra_acis_analysis.txt b/HOWTO_chandra_acis_analysis.txt
index 85ce39b..25d3dbb 100644
--- a/HOWTO_chandra_acis_analysis.txt
+++ b/HOWTO_chandra_acis_analysis.txt
@@ -17,7 +17,7 @@ MASS_PROFILE_DIR="${HOME}/bin/chandra/mass_profile"
 alias fitmass="${MASS_PROFILE_DIR}/fit_mass.sh"
 alias fitnfw="${MASS_PROFILE_DIR}/fit_nfw_mass mass_int.dat"
 alias fitsbp="${MASS_PROFILE_DIR}/fit_sbp.sh"
-alias fitwang="${MASS_PROFILE_DIR}/fit_wang2012_model tcl_temp_profile.txt"
+alias fittp="${MASS_PROFILE_DIR}/fit_wang2012_model"
 alias calclxfx="${MASS_PROFILE_DIR}/calc_lxfx_simple.sh"
 alias getlxfx="${MASS_PROFILE_DIR}/get_lxfx_data.sh"
 ### Settings: }}}
@@ -94,27 +94,25 @@ nH tool: https://heasarc.gsfc.nasa.gov/cgi-bin/Tools/w3nh/w3nh.pl
 (24) $ cd ../mass; clean_massdir.sh;
 (25) check needed linked files:
      * sbprofile.txt
-     * flux_sbp.txt
-     * radius_sbp.txt
      * tprofile.txt
 (26) check needed config files:
+     * mass.conf
      * wang2012_param.txt
-     * fitting_mass.conf
-     * fitting_sbp.conf
-     * fitting_dbeta_mass.conf
-     * fitting_dbeta_sbp.conf
-(27) $ fitwang wang2012_param.txt
-(28) $ qdp fit_result.qdp   # check fitted temperature profile
-(29) $ fitsbp fitting_mass.conf   # single-beta sbp
-     $ fitsbp fitting_dbeta_mass.conf    # double-beta sbp
+     * sbp_sbeta.conf
+     * sbp_dbeta.conf
+(27) $ fittp tprofile.txt wang2012_param.txt
+(28) $ qdp fit_result.qdp
+     (check fitted temperature profile, and adjust parameter accordingly)
+(29) $ fitsbp sbp_sbeta.conf mass.conf   # single-beta sbp
+     $ fitsbp sbp_dbeta.conf mass.conf   # double-beta sbp
 (30) $ qdp sbp_fit.qdp   # check fitted sbp
-(31) $ ln -s fitting_mass.conf global.cfg   # use single-beta
-     $ ln -s fitting_dbeta_mass.conf global.cfg   # use double-beta
+(31) $ ln -s sbp_sbeta.conf sbp.cfg   # use single-beta
+     $ ln -s sbp_dbeta.conf sbp.cfg   # use double-beta
 (32) $ fitnfw <z> [rmin_kpc]
 (33) $ qdp nfw_fit_result.qdp   # check fitted nfw profile, and ajust 'rmin_kpc'
-(34) add 'nfw_rmin_kpc <rmin_kpc>' to 'global.cfg'
-(35) $ fitmass global.cfg c    # calculate the center values
-(36) $ fitmass global.cfg 2>&1 | tee global_<date>.log    # calculate mass data
+(34) add 'nfw_rmin_kpc <rmin_kpc>' to 'mass.conf
+(35) $ fitmass mass.conf c    # calculate the center values
+(36) $ fitmass mass.conf 2>&1 | tee mass_<date>.log    # calculate mass data
 (37) $ collect_infodata.sh
 (38) $ cd ../img;
      $ chandra_update_xcentroid.sh
diff --git a/files/mass.conf b/files/mass.conf
new file mode 100644
index 0000000..4b3caba
--- /dev/null
+++ b/files/mass.conf
@@ -0,0 +1,7 @@
+nh                  <nh>
+abund               <abund>
+nfw_rmin_kpc        0
+tprofile_data       tprofile.txt
+tprofile_cfg        wang2012_param.txt
+sbp_data            sbprofile.txt
+sbp_cfg             sbp.conf
diff --git a/files/sbp_dbeta.conf b/files/sbp_dbeta.conf
new file mode 100644
index 0000000..cfd9fa1
--- /dev/null
+++ b/files/sbp_dbeta.conf
@@ -0,0 +1,14 @@
+sbp_data        sbprofile.txt
+tprofile        tprofile_fitted.txt
+cfunc_profile   coolfunc_profile.txt
+
+z               <z>
+cm_per_pixel    <empty>
+
+n01             0.005
+rc1             30
+beta1           0.7
+n02             0.005
+rc2             300
+beta2           0.7
+bkg             0.0
diff --git a/files/sbp_sbeta.conf b/files/sbp_sbeta.conf
new file mode 100644
index 0000000..c6e21ee
--- /dev/null
+++ b/files/sbp_sbeta.conf
@@ -0,0 +1,11 @@
+sbp_data        sbprofile.txt
+tprofile        tprofile_fitted.txt
+cfunc_profile   coolfunc_profile.txt
+
+z               <z>
+cm_per_pixel    <empty>
+
+n0              0.005
+rc              30
+beta            0.7
+bkg             0.0
-- 
cgit v1.2.2