fix to 'ciao_expcorr.sh' & removed versions in filenames

9 files changed, 14 insertions, 8 deletions

diff --git a/scripts/ciao_bkg_spectra_v4.sh b/scripts/ciao_bkg_spectra.sh
index b4dbbbd..b4dbbbd 100755
--- a/scripts/ciao_bkg_spectra_v4.sh
+++ b/scripts/ciao_bkg_spectra.sh
diff --git a/scripts/ciao_blanksky_v4.sh b/scripts/ciao_blanksky.sh
index da1d6f6..da1d6f6 100755
--- a/scripts/ciao_blanksky_v4.sh
+++ b/scripts/ciao_blanksky.sh
diff --git a/scripts/ciao_deproj_spectra_v8.sh b/scripts/ciao_deproj_spectra.sh
index abebc7c..abebc7c 100755
--- a/scripts/ciao_deproj_spectra_v8.sh
+++ b/scripts/ciao_deproj_spectra.sh
diff --git a/scripts/ciao_expcorr_only.sh b/scripts/ciao_expcorr.sh
index f4d390b..701ba01 100755
--- a/scripts/ciao_expcorr_only.sh
+++ b/scripts/ciao_expcorr.sh
@@ -306,7 +306,7 @@ printf "generate skyfov ...\n"
 SKYFOV="_skyfov.fits"
 [ -e "${SKYFOV}" ] && rm -fv ${SKYFOV}
 punlearn skyfov
-skyfov infile="${EVT}" outfile="${SKYFOV}" clobber=yes
+skyfov infile="${EVT}" outfile="${SKYFOV}" aspect="@${ASOLIS}" clobber=yes
 
 ## filter by energy band & make image
 printf "filter out events in energy band: \`${ENG_RANGE}' ...\n"
@@ -375,11 +375,11 @@ else
         maskfile="${MSK}" clobber=yes
     ## make symbolic links
     # clipped counts image
-    ln -sv "${ROOTNAME}*band*thresh.img" "${IMG_ORIG%.fits}_thresh.fits"
+    ln -svf ${ROOTNAME}*band*thresh.img ${IMG_ORIG%.fits}_thresh.fits
     # clipped exposure map
-    ln -sv "${ROOTNAME}*band*thresh.expmap" "${EXPMAP}"
+    ln -svf ${ROOTNAME}*band*thresh.expmap ${EXPMAP}
     # exposure-corrected image
-    ln -sv "${ROOTNAME}*band*flux.img" "${IMG_EXPCORR}"
+    ln -svf ${ROOTNAME}*band*flux.img ${IMG_EXPCORR}
 fi
 
 ## main }}}
diff --git a/scripts/ciao_expcorr_sbp_v4.sh b/scripts/ciao_expcorr_sbp.sh
index 861c6dd..fc1e5ed 100755
--- a/scripts/ciao_expcorr_sbp_v4.sh
+++ b/scripts/ciao_expcorr_sbp.sh
@@ -4,9 +4,12 @@ export LC_COLLATE=C
 
 #####################################################################
 ## make exposure map and exposure-corrected image
-## extract surface brightness profile (revoke 'ciao_sbp_v3.1.sh')
+## extract surface brightness profile (revoke 'ciao_sbp.sh')
 ##
 ## ChangeLogs:
+## v4.1, 2014/10/30, Weitian LI
+##   updated 'EXPCORR_SCRIPT' & 'EXTRACT_SBP_SCRIPT',
+##   removed version number in scripts filename.
 ## v4, 2013/10/12, LIweitiaNux
 ##   split out the 'generate regions' parts -> 'ciao_genreg_v1.sh'
 ## v3, 2013/05/03, LIweitiaNux
@@ -15,8 +18,8 @@ export LC_COLLATE=C
 
 SCRIPT_PATH=`readlink -f $0`
 SCRIPT_DIR=`dirname ${SCRIPT_PATH}`
-EXPCORR_SCRIPT="ciao_expcorr_only.sh"
-EXTRACT_SBP_SCRIPT="ciao_sbp_v3.1.sh"
+EXPCORR_SCRIPT="ciao_expcorr.sh"
+EXTRACT_SBP_SCRIPT="ciao_sbp.sh"
 
 ## about, used in `usage' {{{
 VERSION="v4"
diff --git a/scripts/ciao_genregs_v1.sh b/scripts/ciao_genregs.sh
index 643acba..643acba 100755
--- a/scripts/ciao_genregs_v1.sh
+++ b/scripts/ciao_genregs.sh
diff --git a/scripts/ciao_procevt_v2.sh b/scripts/ciao_procevt.sh
index 6cfe45d..d73bfaf 100755
--- a/scripts/ciao_procevt_v2.sh
+++ b/scripts/ciao_procevt.sh
@@ -19,6 +19,9 @@
 
 ###########################################################
 ## ChangeLogs:
+## v2.2, 2014/10/30, Weitian LI
+##  small fix to the generation of chips script:
+##  changed '>>' to '>'
 ## v2.1, 2012/08/16, LIweitiaNux
 ##   improve invoke `chips', run it in a separate terminal
 ###########################################################
@@ -160,7 +163,7 @@ dmextract infile="${EVT2_RMSRCS}[exclude sky=region(${LC_REG})][bin time=::200]"
 LC_SCRIPT="_${LC%.lc}.chips"
 LC_SCALE=1.2
 GTI="${LC%.lc}.gti"
-cat >> ${LC_SCRIPT} << _EOF_
+cat > ${LC_SCRIPT} << _EOF_
 from lightcurves import *
 lc_clean("${LC}")
 lc_clean("${LC}", scale=${LC_SCALE}, outfile="${GTI}")
diff --git a/scripts/ciao_r500avgt_v3.sh b/scripts/ciao_r500avgt.sh
index 9a8dffd..9a8dffd 100755
--- a/scripts/ciao_r500avgt_v3.sh
+++ b/scripts/ciao_r500avgt.sh
diff --git a/scripts/ciao_sbp_v3.1.sh b/scripts/ciao_sbp.sh
index d111b7f..d111b7f 100755
--- a/scripts/ciao_sbp_v3.1.sh
+++ b/scripts/ciao_sbp.sh