psfval: special summary (not enough stars); combine runs

Author: martinkilbinger

docs/source/pipeline_canfar.md

@@ -125,6 +125,10 @@ combine_runs.bash  -p $psf -c psf
 shapepipe_run -c $SP_CONFIG/config_Ms_$psf.ini
 shapepipe_run -c $SP_CONFIG/config_Pl_$psf.ini
 
+# With fourth-order moment, additional psf interpol validation runs
+combine_runs.bash  -p $psf -c psf_val
+
+
 # Convert star cat to WCS
 ## Convert all input validation psf files and create directories par patch
 ## psf_conv_all/P?

pyproject.toml

@@ -58,6 +58,7 @@ include-package-data = true
     "scripts/sh/curl_canfar_local.sh",
     "scripts/sh/functions.sh",
     "scripts/sh/stats_jobs_canfar.sh",
+    "scripts/sh/combine_runs.sh",
     "scripts/python/update_runs_log_file.py",
     "scripts/python/summary_run.py",
     "scripts/python/summary_params_pre_v2.py",

scripts/python/summary_params_pre_v2.py

@@ -251,15 +251,16 @@ def set_jobs_v2_pre_v2(patch, verbose):
     # PSF validation
     jobs["1024"] = job_data(
         1024,
-        ["run_sp_exp_Pv"],
-        ["psfex_interp_runner"],
+        "run_sp_exp_Pv",
+        ["psfex_interp_runner"] * 2,
         "shdus",
-        n_mult=[1],
+        n_mult=[1] * 2,
         path_main=path_main,
         path_left="exp_runs",
         output_subdirs="shdus",
         path_right="output",
-        path_output="output",
+        path_output=["output", "logs"],
+        special=[False, True],
         verbose=verbose,
     )
 

scripts/sh/combine_runs.bash

@@ -20,7 +20,7 @@ usage="Usage: $(basename "$0") [OPTIONS]
     \tPSF model, allowed are 'psfex', 'mccd', 'setools', default='$psf'\n
    -c, --cat TYPE\n
     \tCatalogue type, allowed are 'final', 'flag_tile', 'flag_exp', \n
-    \t'psf', 'psf_conv', 'image', 'shdu', default='$cat'\n
+    \t'psf', 'psf_val', 'psf_conv', 'image', 'shdu', default='$cat'\n
 "
 
 ## Parse command line
@@ -53,10 +53,11 @@ if [ "$cat" != "final" ] \
   && [ "$cat" != "tile_detection" ] \
   && [ "$cat" != "flag_exp" ] \
   && [ "$cat" != "psf" ] \
+  && [ "$cat" != "psf_val" ] \
   && [ "$cat" != "psf_conv" ] \
   && [ "$cat" != "image" ] \
   && [ "$cat" != "shdu" ]; then
-  echo "cat (option -c) needs to be 'final', 'tile_detection', 'flag_tile', 'flag_exp', 'psf', 'psf_conv', 'shdu', or 'image'"
+  echo "cat (option -c) needs to be 'final', 'tile_detection', 'flag_tile', 'flag_exp', 'psf', 'psf_val', 'psf_conv', 'shdu', or 'image'"
   exit 2
 fi
 
@@ -163,9 +164,14 @@ elif [ "$cat" == "psf" ]; then
     module="mccd_interp_runner"
   fi
 
+elif [ "$cat" == "psf_val" ]; then
+
+  run_in="$pwd/exp_runs/*/$out_base/run_sp_exp_Pv_*"
+  pattern="validation_psf-*"
+  module="psfex_interp_runner"
+
 elif [ "$cat" == "psf_conv" ]; then
 
-  #run_in="$pwd/../P?"
   run_in="$pwd"
   pattern="validation_psf_conv-*"
   module="psfex_interp_runner"

src/shapepipe/utilities/summary.py

@@ -198,6 +198,15 @@ def check_special_one(module, path):
                     msg = "found array of size 0"
                     return msg, code
 
+                m = re.search(
+                    "Not enough stars to interpolate the psf",
+                    line,
+                )
+                if m:
+                    code = 8
+                    msg = "not enough stars"
+                    return msg, code
+
             if module == "mask_runner":
                 m = re.search("Empty or corrupt FITS file", line)
                 if m: