Merge branch 'canfar_new' of github.com:martinkilbinger/shapepipe into canfar_new

Author: martinkilbinger

example/GOLD/default.param

@@ -2,6 +2,7 @@ NUMBER                   #Running object number
 EXT_NUMBER               #FITS extension number                                    
 
 FLUX_AUTO                #Flux within a Kron-like elliptical aperture               [count]
+FLUX_APER
 FLUXERR_AUTO             #RMS error for AUTO flux                                   [count]
 MAG_AUTO                 #Kron-like elliptical aperture magnitude                   [mag]
 MAGERR_AUTO              #RMS error for AUTO magnitude                              [mag]
@@ -64,4 +65,4 @@ VIGNET(51,51)            #Pixel data around detection
 
 #SPREAD_MODEL
 #SPREADERR_MODEL
-#FWHMPSF_IMAGE
+#FWHMPSF_IMAGE

scripts/sh/canfar_prep_tiles.sh

@@ -18,7 +18,7 @@ function link_s () {
 
 pwd=`pwd`
 out_base="output"
-run_dir="run_combined"
+run_dir="run_sp_combined"
 log_path="$pwd/$out_base/log_run_sp_tile.txt"
 INPUT="$pwd/$out_base/run_sp_*"
 OUTPUT="$pwd/$out_base/$run_dir"