fixed bug to remove previous runs in init_run

Author: martinkilbinger

docs/source/pipeline_canfar.md

@@ -121,7 +121,7 @@ patchnum=`tr $patch P ''`
 create_final_cat.py -m final_cat_$patch.hdf5 -i . -p $patch/cfis/final_cat.param -P $patchnum -o $patch/n_tiles_final.txt -v
 
 # Star catalogue
-combine_runs.bash  -p $psf -c psf
+combine_runs.bash -p $psf -c psf
 
 ## The following are not necessary, only to get merged catalogue with non-converted quantities
 shapepipe_run -c $SP_CONFIG/config_Ms_$psf.ini
@@ -144,7 +144,7 @@ cd ../star_cat
  convert_psf_pix2world.py -i .. -P $patchnum -v
 
 # Combine previously created files as links within one SP run dir
-# (for the v1.4 setup only one link
+# (for the v1.4 setup only one link)
 cd P$patch
 combine_runs.bash -p psfex -c psf_conv
 

example/cfis/config_Msval_psfex.ini

@@ -0,0 +1,70 @@
+# ShapePipe configuration file for post-processing.
+# merge star cat.
+
+
+## Default ShapePipe options
+[DEFAULT]
+
+# verbose mode (optional), default: True, print messages on terminal
+VERBOSE = True
+
+# Name of run (optional) default: shapepipe_run
+RUN_NAME = run_sp_Msval
+
+# Add date and time to RUN_NAME, optional, default: False
+RUN_DATETIME = False
+
+
+## ShapePipe execution options
+[EXECUTION]
+
+# Module name, single string or comma-separated list of valid module runner names
+MODULE = merge_starcat_runner
+
+# Parallel processing mode, SMP or MPI
+MODE = SMP
+
+
+## ShapePipe file handling options
+[FILE]
+
+# Log file master name, optional, default: shapepipe
+LOG_NAME = log_sp
+
+# Runner log file name, optional, default: shapepipe_runs
+RUN_LOG_NAME = log_run_sp
+
+# Input directory, containing input files, single string or list of names
+INPUT_DIR = $SP_RUN/output
+
+# Output directory
+OUTPUT_DIR = $SP_RUN/output
+
+
+## ShapePipe job handling options
+[JOB]
+
+# Batch size of parallel processing (optional), default is 1, i.e. run all jobs in serial
+SMP_BATCH_SIZE = 4
+
+# Timeout value (optional), default is None, i.e. no timeout limit applied
+TIMEOUT = 96:00:00
+
+
+## Module options
+[MERGE_STARCAT_RUNNER]
+
+INPUT_DIR = last:psfex_interp_runner
+
+PSF_MODEL = psfex
+
+NUMBERING_SCHEME = -0000000-0
+
+# Input file pattern(s), list of strings with length matching number of expected input file types
+# Cannot contain wild cards
+FILE_PATTERN = validation_psf
+
+# FILE_EXT (optional) list of string extensions to identify input files
+FILE_EXT = .fits
+
+HDU = 2

scripts/sh/init_run_exclusive_canfar.sh

@@ -536,15 +536,15 @@ fi
 if [[ $do_job != 0 ]]; then
 
   # Remove previous runs of this job
-  rm -rf run_sp_Ms_20??_*
+  rm -rf run_sp_Ms_20??-*
 
 fi
 
 (( do_job = $job & 512 ))
 if [[ $do_job != 0 ]]; then
 
   # Remove previous runs of this job
-  rm -rf run_sp_Mc_20??_*
+  rm -rf run_sp_Mc_20??-*
 
 fi
 
@@ -561,7 +561,7 @@ if [[ $do_job != 0 ]]; then
 
   # Remove previous runs of this job
   echo "Remove previous Pv jobs"
-  rm -rf run_sp_exp_Pv_20??_*
+  rm -rf `pwd`/run_sp_exp_Pv_20??-*
 fi