diff --git a/requirements.txt b/requirements.txt index 7e45fe779..bf39cccbe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -astropy>=3.1.1 +astropy==4.1 joblib>=0.13.1 matplotlib>=3.0.2 modopt>=1.2.0 diff --git a/scripts/sh/job_sp.bash b/scripts/sh/job_sp.bash index 2740a7363..b77419f88 100755 --- a/scripts/sh/job_sp.bash +++ b/scripts/sh/job_sp.bash @@ -361,17 +361,20 @@ if [[ $do_job != 0 ]]; then ### The following are very a bad hacks to get additional input file paths if [ "$psf" == "psfex" ]; then - input_psfex=`find . -name star_split_ratio_80-*.psf | head -n 1` + #input_psfex=`find . -name star_split_ratio_80-*.psf | head -n 1` + input_psfex=``ls -1 ./output/*/psfex_runner/output/star_split_ratio_80*.psf | head -n 1` command_sp "ln -s `dirname $input_psfex` input_psfex" "Link psfex output" else input_psf_mccd=`find . -name "fitted_model*.npy" | head -n 1` command_sp "ln -s `dirname $input_psf_mccd` input_psf_mccd" "Link MCCD output" fi - input_split_exp=`find output -name flag-*.fits | head -n 1` + #input_split_exp=`find output -name flag-*.fits | head -n 1` + input_split_exp=`ls -1 ./output/*/split_exp_runner/output/flag*.fits | head -n 1` command_sp "ln -s `dirname $input_split_exp` input_split_exp" "Link split_exp output" - input_sextractor=`find . -name sexcat_sexcat-*.fits | head -n 1` + #input_sextractor=`find . -name sexcat_sexcat-*.fits | head -n 1` + input_sextractor=`ls -1 ./output/*/sextractor_runner/output/sexcat_sexcat*.fits | head -n 1` command_sp "ln -s `dirname $input_sextractor` input_sextractor" "Link sextractor output" fi