diff --git a/do_makemultimages_tests.sh b/do_makemultimages_tests.sh index 7e707dc..5ecb871 100755 --- a/do_makemultimages_tests.sh +++ b/do_makemultimages_tests.sh @@ -50,32 +50,32 @@ rm temptest/multimage_diff-sizes*.fits rm temptest/multimage-with-imageinfo_*.fits # 3 images, one function block, using --image-info -./makemultimages tests_for_makemultimage/config_for_globalparams.txt -o temptest/multimage-with-imageinfo --image-info=tests_for_makemultimage/imageinfo_3image.txt > temptest/test_dump2 +./makemultimages tests/makemultimages_reference/config_for_globalparams.txt -o temptest/multimage-with-imageinfo --image-info=tests/makemultimages_reference/imageinfo_3image.txt > temptest/test_dump2 -./makemultimages tests_for_makemultimage/config_for_globalparams.txt -o temptest/multimage-with-imageinfo_b --image-info=tests_for_makemultimage/imageinfo_3image_b.txt > temptest/test_dump2b +./makemultimages tests/makemultimages_reference/config_for_globalparams.txt -o temptest/multimage-with-imageinfo_b --image-info=tests/makemultimages_reference/imageinfo_3image_b.txt > temptest/test_dump2b -./makemultimages tests_for_makemultimage/config_for_globalparams.txt -o temptest/multimage-with-imageinfo_c --image-info=tests_for_makemultimage/imageinfo_3image_c.txt > temptest/test_dump2c +./makemultimages tests/makemultimages_reference/config_for_globalparams.txt -o temptest/multimage-with-imageinfo_c --image-info=tests/makemultimages_reference/imageinfo_3image_c.txt > temptest/test_dump2c -./makemultimages tests_for_makemultimage/config_for_globalparams.txt -o temptest/multimage-with-imageinfo_d --image-info=tests_for_makemultimage/imageinfo_3image_d.txt > temptest/test_dump2d +./makemultimages tests/makemultimages_reference/config_for_globalparams.txt -o temptest/multimage-with-imageinfo_d --image-info=tests/makemultimages_reference/imageinfo_3image_d.txt > temptest/test_dump2d -./makemultimages tests_for_makemultimage/config_for_globalparams.txt -o temptest/multimage-with-imageinfo_e --image-info=tests_for_makemultimage/imageinfo_3image_e.txt > temptest/test_dump2d +./makemultimages tests/makemultimages_reference/config_for_globalparams.txt -o temptest/multimage-with-imageinfo_e --image-info=tests/makemultimages_reference/imageinfo_3image_e.txt > temptest/test_dump2d # model with two function blocks, 3 images (offsets only), using --image-info -./makemultimages tests_for_makemultimage/config_for_globalparams_2blocks.txt -o temptest/multimage-with-imageinfo_2blocks --image-info=tests_for_makemultimage/imageinfo_3image.txt > temptest/test_dump3 +./makemultimages tests/makemultimages_reference/config_for_globalparams_2blocks.txt -o temptest/multimage-with-imageinfo_2blocks --image-info=tests/makemultimages_reference/imageinfo_3image.txt > temptest/test_dump3 # model with 2 images, different sizes, using --image-info -./makemultimages tests_for_makemultimage/config_for_globalparams_mult-sizes.txt -o temptest/multimage_diff-sizes --image-info=tests_for_makemultimage/imageinfo_2sizes.txt > temptest/test_dump5 +./makemultimages tests/makemultimages_reference/config_for_globalparams_mult-sizes.txt -o temptest/multimage_diff-sizes --image-info=tests/makemultimages_reference/imageinfo_2sizes.txt > temptest/test_dump5 # model with 3 images, different sizes, 1st and 3rd with PSF, using --image-info -./makemultimages tests_for_makemultimage/config_for_globalparams_mult-sizes.txt -o temptest/multimage_diff-sizes-psf --image-info=tests_for_makemultimage/imageinfo_3sizes-with-psf.txt > temptest/test_dump6 +./makemultimages tests/makemultimages_reference/config_for_globalparams_mult-sizes.txt -o temptest/multimage_diff-sizes-psf --image-info=tests/makemultimages_reference/imageinfo_3sizes-with-psf.txt > temptest/test_dump6 # tests of PSF oversampling [NO COMPARISON WITH REFERENCE YET] -./makemultimages tests/makeimage_reference/config_makeimage_gauss-oversample.dat --image-info tests_for_makemultimage/imageinfo_2sizes-with-oversampled-psf.txt -o temptest/multimage_osamp > temptest/test_dump7a +./makemultimages tests/makeimage_reference/config_makeimage_gauss-oversample.dat --image-info tests/makemultimages_reference/imageinfo_2sizes-with-oversampled-psf.txt -o temptest/multimage_osamp > temptest/test_dump7a # tests of multi-region PSF oversampling [NO COMPARISON WITH REFERENCE YET] -./makemultimages tests/makeimage_reference/config_makeimage_gauss-oversample.dat --image-info tests_for_makemultimage/imageinfo_2sizes-with-2oversampled-psf.txt -o temptest/multimage_2osamp > temptest/test_dump7b +./makemultimages tests/makeimage_reference/config_makeimage_gauss-oversample.dat --image-info tests/makemultimages_reference/imageinfo_2sizes-with-2oversampled-psf.txt -o temptest/multimage_2osamp > temptest/test_dump7b @@ -83,12 +83,12 @@ rm temptest/multimage-with-imageinfo_*.fits echo "" echo -n "*** Diff comparison with archives: printing function list... " -if (diff --brief temptest/test_dump0 tests/makemultimages_textout0) +if (diff --brief temptest/test_dump0 tests/makemultimages_reference/makemultimages_textout0) then echo " OK" else echo "Diff output:" - diff temptest/test_dump0 tests/makemultimages_textout0 + diff temptest/test_dump0 tests/makemultimages_reference/makemultimages_textout0 STATUS+=1 fi @@ -97,7 +97,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_0. if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_0.fits tests/multimagetest_0.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_0.fits tests/makemultimages_reference/multimagetest_0.fits STATUS+=$? fi @@ -105,7 +105,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_1. if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_1.fits tests/multimagetest_1.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_1.fits tests/makemultimages_reference/multimagetest_1.fits STATUS+=$? fi @@ -113,7 +113,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_2. if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_2.fits tests/multimagetest_2.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_2.fits tests/makemultimages_reference/multimagetest_2.fits STATUS+=$? fi @@ -122,7 +122,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_b_ if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_b_2.fits tests/multimagetest_2b.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_b_2.fits tests/makemultimages_reference/multimagetest_2b.fits STATUS+=$? fi @@ -130,7 +130,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_c_ if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_c_2.fits tests/multimagetest_2c.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_c_2.fits tests/makemultimages_reference/multimagetest_2c.fits STATUS+=$? fi @@ -138,7 +138,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_d_ if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_d_2.fits tests/multimagetest_2d.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_d_2.fits tests/makemultimages_reference/multimagetest_2d.fits STATUS+=$? fi @@ -147,7 +147,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_e_ if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_e_1.fits tests/multimagetest_1.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_e_1.fits tests/makemultimages_reference/multimagetest_1.fits STATUS+=$? fi @@ -155,7 +155,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_e_ if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_e_2.fits tests/multimagetest_2d.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_e_2.fits tests/makemultimages_reference/multimagetest_2d.fits STATUS+=$? fi @@ -164,7 +164,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_2b if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_2blocks_0.fits tests/multimagetest_2blocks_0.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_2blocks_0.fits tests/makemultimages_reference/multimagetest_2blocks_0.fits STATUS+=$? fi @@ -172,7 +172,7 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_2b if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_2blocks_1.fits tests/multimagetest_2blocks_offset_1.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_2blocks_1.fits tests/makemultimages_reference/multimagetest_2blocks_offset_1.fits STATUS+=$? fi @@ -180,18 +180,18 @@ echo -n "*** Diff comparison of image with archives: multimage-with-imageinfo_2b if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage-with-imageinfo_2blocks_2.fits tests/multimagetest_2blocks_offset_2.fits + ./python/compare_fits_files.py temptest/multimage-with-imageinfo_2blocks_2.fits tests/makemultimages_reference/multimagetest_2blocks_offset_2.fits STATUS+=$? fi # archive images generated by -# makeimage[v1.4] -c tests_for_makemultimage/config_for_globalparams_2sizes.txt +# makeimage[v1.4] -c tests/makemultimages_reference/config_for_globalparams_2sizes.txt echo -n "*** Diff comparison of image with archives: multimage_diff-sizes_0... " if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage_diff-sizes_0.fits tests/multimagetest_diff-sizes_0.fits + ./python/compare_fits_files.py temptest/multimage_diff-sizes_0.fits tests/makemultimages_reference/multimagetest_diff-sizes_0.fits STATUS+=$? fi @@ -199,7 +199,7 @@ echo -n "*** Diff comparison of image with archives: multimage_diff-sizes_1... " if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage_diff-sizes_1.fits tests/multimagetest_diff-sizes_1.fits + ./python/compare_fits_files.py temptest/multimage_diff-sizes_1.fits tests/makemultimages_reference/multimagetest_diff-sizes_1.fits STATUS+=$? fi @@ -210,7 +210,7 @@ echo -n "*** Diff comparison of image with archives: multimage_diff-sizes-psf_0. if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage_diff-sizes-psf_0.fits tests/multimagetest_diff-sizes-psf_0.fits + ./python/compare_fits_files.py temptest/multimage_diff-sizes-psf_0.fits tests/makemultimages_reference/multimagetest_diff-sizes-psf_0.fits STATUS+=$? fi @@ -218,7 +218,7 @@ echo -n "*** Diff comparison of image with archives: multimage_diff-sizes-psf_1. if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage_diff-sizes-psf_1.fits tests/multimagetest_diff-sizes-psf_1.fits + ./python/compare_fits_files.py temptest/multimage_diff-sizes-psf_1.fits tests/makemultimages_reference/multimagetest_diff-sizes-psf_1.fits STATUS+=$? fi @@ -226,7 +226,7 @@ echo -n "*** Diff comparison of image with archives: multimage_diff-sizes-psf_2. if [ $do_fits_tests = "1" ] then echo "" - ./python/compare_fits_files.py temptest/multimage_diff-sizes-psf_2.fits tests/multimagetest_diff-sizes-psf_2.fits + ./python/compare_fits_files.py temptest/multimage_diff-sizes-psf_2.fits tests/makemultimages_reference/multimagetest_diff-sizes-psf_2.fits STATUS+=$? fi diff --git a/tests/makemultimages_reference/config_for_globalparams.txt b/tests/makemultimages_reference/config_for_globalparams.txt new file mode 100644 index 0000000..2ae1e29 --- /dev/null +++ b/tests/makemultimages_reference/config_for_globalparams.txt @@ -0,0 +1,14 @@ +# first function set: exponential + sersic, at (x0,y0) = (1,1) +X0 31.0 0,4 # x-coordinate +Y0 31.0 0,4 +FUNCTION Exponential # here is a comment +PA 95.0 0,180 # this means we restrict PA to 0 <= PA <= 180 +ell 0.45 0,1 +I_0 90.0 0,1000 +h 15.0 0,1000 +FUNCTION Sersic +PA 90.0 +ell 0.2 +n 2.5 +I_e 10.0 +r_e 10.0 diff --git a/tests/makemultimages_reference/config_for_globalparams_2blocks.txt b/tests/makemultimages_reference/config_for_globalparams_2blocks.txt new file mode 100644 index 0000000..9475938 --- /dev/null +++ b/tests/makemultimages_reference/config_for_globalparams_2blocks.txt @@ -0,0 +1,22 @@ +# first function set: exponential + sersic, at (x0,y0) = (1,1) +X0 31.0 0,4 # x-coordinate +Y0 31.0 0,4 +FUNCTION Exponential # here is a comment +PA 95.0 0,180 # this means we restrict PA to 0 <= PA <= 180 +ell 0.45 0,1 +I_0 90.0 0,1000 +h 15.0 0,1000 +FUNCTION Sersic +PA 90.0 +ell 0.2 +n 2.5 +I_e 10.0 +r_e 10.0 + +X0 50.0 +Y0 45.0 +FUNCTION Gaussian +PA 0 +ell 0.5 +I_0 100.0 +sigma 2.0 diff --git a/tests/makemultimages_reference/config_for_globalparams_mult-sizes.txt b/tests/makemultimages_reference/config_for_globalparams_mult-sizes.txt new file mode 100644 index 0000000..18506ee --- /dev/null +++ b/tests/makemultimages_reference/config_for_globalparams_mult-sizes.txt @@ -0,0 +1,16 @@ +NCOLS 32 +NROWS 32 +# first function set: exponential + sersic, at (x0,y0) = (1,1) +X0 10.0 0,4 # x-coordinate +Y0 20.0 0,4 +FUNCTION Exponential # here is a comment +PA 95.0 0,180 # this means we restrict PA to 0 <= PA <= 180 +ell 0.45 0,1 +I_0 90.0 0,1000 +h 15.0 0,1000 +FUNCTION Sersic +PA 90.0 +ell 0.2 +n 2.5 +I_e 10.0 +r_e 10.0 diff --git a/tests/makemultimages_reference/flatsky_64x64.fits b/tests/makemultimages_reference/flatsky_64x64.fits new file mode 100644 index 0000000..b25fcb9 Binary files /dev/null and b/tests/makemultimages_reference/flatsky_64x64.fits differ diff --git a/tests/makemultimages_reference/imageinfo_2sizes-with-2oversampled-psf.txt b/tests/makemultimages_reference/imageinfo_2sizes-with-2oversampled-psf.txt new file mode 100644 index 0000000..743c007 --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_2sizes-with-2oversampled-psf.txt @@ -0,0 +1,23 @@ +# image-info file for testing makemultimages +# +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +NCOLS 200 +NROWS 200 + +# now we have the second image +IMAGE_START +NCOLS 200 +NROWS 200 +PSF tests/psf_standard.fits +OVERSAMPLED_PSF tests/psf_oversamp.fits +OVERSAMPLED_REGION 100:110,100:110 +OVERSAMPLED_REGION 40:45,30:40 +OVERSAMPLE_SCALE 3 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 1.0 fixed +X0 105.2377 +Y0 105.4582 diff --git a/tests/makemultimages_reference/imageinfo_2sizes-with-oversampled-psf.txt b/tests/makemultimages_reference/imageinfo_2sizes-with-oversampled-psf.txt new file mode 100644 index 0000000..dd8566b --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_2sizes-with-oversampled-psf.txt @@ -0,0 +1,22 @@ +# image-info file for testing makemultimages +# +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +NCOLS 200 +NROWS 200 + +# now we have the second image +IMAGE_START +NCOLS 200 +NROWS 200 +PSF tests/psf_standard.fits +OVERSAMPLED_PSF tests/psf_oversamp.fits +OVERSAMPLED_REGION 100:110,100:110 +OVERSAMPLE_SCALE 3 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 1.0 fixed +X0 105.2377 +Y0 105.4582 diff --git a/tests/makemultimages_reference/imageinfo_2sizes.txt b/tests/makemultimages_reference/imageinfo_2sizes.txt new file mode 100644 index 0000000..4cd492e --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_2sizes.txt @@ -0,0 +1,24 @@ +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +DATA n100_2mass.fit +NCOLS 32 +NROWS 32 +GAIN 2.3 +READNOISE 4.5 +ORIGINAL_SKY 11.344 + +# now we have the second image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS 40 +NROWS 40 +GAIN 1.5 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 10.0 fixed +X0 20 +Y0 30 diff --git a/tests/makemultimages_reference/imageinfo_3image.txt b/tests/makemultimages_reference/imageinfo_3image.txt new file mode 100644 index 0000000..5980e6c --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_3image.txt @@ -0,0 +1,38 @@ +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +DATA n100_2mass.fit +NCOLS 64 +NROWS 64 +GAIN 2.3 +READNOISE 4.5 +ORIGINAL_SKY 11.344 + +# now we have the second image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS 64 +NROWS 64 +GAIN 1.5 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 1.0 fixed +X0 40 +Y0 40 + +# third image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS 64 +NROWS 64 +GAIN 1.0 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed # this image is rotated 22.4 deg CCW w.r.t. reference image +FLUX_SCALE 1.0 10,20 # flux should be multiplied by FLUX_SCALE +X0 10 +Y0 20 diff --git a/tests/makemultimages_reference/imageinfo_3image_3rd-image-32x32.txt b/tests/makemultimages_reference/imageinfo_3image_3rd-image-32x32.txt new file mode 100644 index 0000000..fdb4453 --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_3image_3rd-image-32x32.txt @@ -0,0 +1,41 @@ +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +DATA n100_2mass.fit +GAIN 2.3 +READNOISE 4.5 +ORIGINAL_SKY 11.344 +MASK n100_2mass_mask.fits +ERROR n100_2mass_variance.fits +PSF psf_for_n100_2mass.fits + +# now we have the second image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +GAIN 1.5 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +MASK n100_hst_mask.fits[250:350,200:300] +PSF n100_hst_tinytim_psf.fits +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 1.0 fixed +X0 40 +Y0 40 + +# third image +IMAGE_START +NROWS 32 +NCOLS 32 +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +GAIN 1.0 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +MASK n100_hst_mask.fits[250:350,200:300] +PSF n100_hst_tinytim_psf.fits +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed # this image is rotated 22.4 deg CCW w.r.t. reference image +FLUX_SCALE 1.0 10,20 # flux should be multiplied by FLUX_SCALE +X0 10 +Y0 20 diff --git a/tests/makemultimages_reference/imageinfo_3image_b.txt b/tests/makemultimages_reference/imageinfo_3image_b.txt new file mode 100644 index 0000000..7677d17 --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_3image_b.txt @@ -0,0 +1,38 @@ +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +DATA n100_2mass.fit +NCOLS 64 +NROWS 64 +GAIN 2.3 +READNOISE 4.5 +ORIGINAL_SKY 11.344 + +# now we have the second image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS 64 +NROWS 64 +GAIN 1.5 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 1.0 fixed +X0 40 +Y0 40 + +# third image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS 64 +NROWS 64 +GAIN 1.0 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed # this image is rotated 22.4 deg CCW w.r.t. reference image +FLUX_SCALE 100.0 10,20 # flux should be multiplied by FLUX_SCALE +X0 10 +Y0 20 diff --git a/tests/makemultimages_reference/imageinfo_3image_c.txt b/tests/makemultimages_reference/imageinfo_3image_c.txt new file mode 100644 index 0000000..65ba18a --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_3image_c.txt @@ -0,0 +1,38 @@ +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +DATA n100_2mass.fit +NCOLS 64 +NROWS 64 +GAIN 2.3 +READNOISE 4.5 +ORIGINAL_SKY 11.344 + +# now we have the second image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS 64 +NROWS 64 +GAIN 1.5 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 1.0 fixed +X0 40 +Y0 40 + +# third image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS 64 +NROWS 64 +GAIN 1.0 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 90.0 fixed # this image is rotated 22.4 deg CCW w.r.t. reference image +FLUX_SCALE 1.0 10,20 # flux should be multiplied by FLUX_SCALE +X0 10 +Y0 20 diff --git a/tests/makemultimages_reference/imageinfo_3image_d.txt b/tests/makemultimages_reference/imageinfo_3image_d.txt new file mode 100644 index 0000000..1303e74 --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_3image_d.txt @@ -0,0 +1,38 @@ +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +DATA n100_2mass.fit +NCOLS 64 +NROWS 64 +GAIN 2.3 +READNOISE 4.5 +ORIGINAL_SKY 11.344 + +# now we have the second image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS 64 +NROWS 64 +GAIN 1.5 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 1.0 fixed +X0 40 +Y0 40 + +# third image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS 64 +NROWS 64 +GAIN 1.0 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 10.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed # this image is rotated 22.4 deg CCW w.r.t. reference image +FLUX_SCALE 1.0 10,20 # flux should be multiplied by FLUX_SCALE +X0 10 +Y0 20 diff --git a/tests/makemultimages_reference/imageinfo_3image_e.txt b/tests/makemultimages_reference/imageinfo_3image_e.txt new file mode 100644 index 0000000..9d65d59 --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_3image_e.txt @@ -0,0 +1,35 @@ +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +DATA n100_2mass.fit +NCOLS 64 +NROWS 64 +GAIN 2.3 +READNOISE 4.5 +ORIGINAL_SKY 11.344 + +# now we have the second image +IMAGE_START +DATA n100_hst-acs-wfc_ss.fits[250:350,200:300] 1.0 +NCOLS,NROWS 64,64 +GAIN 1.5 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 1.0 fixed +X0 40 +Y0 40 + +# third image (leaving out NROWS,NCOLS to see whether we get image size from DATA +IMAGE_START +DATA tests/makemultimages_reference/flatsky_64x64.fits +GAIN 1.0 +READNOISE 0.6 +ORIGINAL_SKY 2.359 +PIXEL_SCALE 10.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed # this image is rotated 22.4 deg CCW w.r.t. reference image +FLUX_SCALE 1.0 10,20 # flux should be multiplied by FLUX_SCALE +X0 10 +Y0 20 diff --git a/tests/makemultimages_reference/imageinfo_3sizes-with-psf.txt b/tests/makemultimages_reference/imageinfo_3sizes-with-psf.txt new file mode 100644 index 0000000..945cf30 --- /dev/null +++ b/tests/makemultimages_reference/imageinfo_3sizes-with-psf.txt @@ -0,0 +1,30 @@ +# image-info file for testing makemultimages +# +# First is the reference image, for which we leave things like weight, PIXEL_SCALE, +# FLUX_SCALE, and IMAGE_PA unspecified so they assume their default values +# image-name weight +IMAGE_START +NCOLS 32 +NROWS 32 +PSF tests/psf_moffat_35_n4699z.fits + +# now we have the second image +IMAGE_START +NCOLS 40 +NROWS 40 +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 10.0 fixed +X0 25 +Y0 35 + +# and the third image +IMAGE_START +NCOLS 40 +NROWS 40 +PSF tests/psf_moffat_35_n4699z.fits +PIXEL_SCALE 1.0 fixed # pixels in this image are PIXEL_SCALE * reference image +IMAGE_PA 0.0 fixed +FLUX_SCALE 1.0 fixed +X0 20 +Y0 30 diff --git a/tests/makemultimages_reference/makemultimages_textout0 b/tests/makemultimages_reference/makemultimages_textout0 new file mode 100644 index 0000000..6ada811 --- /dev/null +++ b/tests/makemultimages_reference/makemultimages_textout0 @@ -0,0 +1,33 @@ + +Available function/components: + +BrokenExponential +BrokenExponential2D +BrokenExponentialDisk3D +Core-Sersic +DattathriPeanut3D +EdgeOnDisk +EdgeOnRing +EdgeOnRing2Side +Exponential +ExponentialDisk3D +Exponential_GenEllipse +FerrersBar2D +FerrersBar3D +FlatBar +FlatSky +Gaussian +GaussianRing +GaussianRing2Side +GaussianRing3D +GaussianRingAz +ModifiedKing +ModifiedKing2 +Moffat +PointSource +PointSourceRot +Sersic +Sersic_GenEllipse +TiltedSkyPlane + + diff --git a/tests/makemultimages_reference/multimagetest_0.fits b/tests/makemultimages_reference/multimagetest_0.fits new file mode 100644 index 0000000..b742238 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_0.fits differ diff --git a/tests/makemultimages_reference/multimagetest_1.fits b/tests/makemultimages_reference/multimagetest_1.fits new file mode 100644 index 0000000..0888d28 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_1.fits differ diff --git a/tests/makemultimages_reference/multimagetest_2.fits b/tests/makemultimages_reference/multimagetest_2.fits new file mode 100644 index 0000000..2b6a8a9 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_2.fits differ diff --git a/tests/makemultimages_reference/multimagetest_2b.fits b/tests/makemultimages_reference/multimagetest_2b.fits new file mode 100644 index 0000000..f3bd0d6 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_2b.fits differ diff --git a/tests/makemultimages_reference/multimagetest_2blocks_0.fits b/tests/makemultimages_reference/multimagetest_2blocks_0.fits new file mode 100644 index 0000000..cec4102 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_2blocks_0.fits differ diff --git a/tests/makemultimages_reference/multimagetest_2blocks_offset_1.fits b/tests/makemultimages_reference/multimagetest_2blocks_offset_1.fits new file mode 100644 index 0000000..e3553ad Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_2blocks_offset_1.fits differ diff --git a/tests/makemultimages_reference/multimagetest_2blocks_offset_2.fits b/tests/makemultimages_reference/multimagetest_2blocks_offset_2.fits new file mode 100644 index 0000000..f4aab45 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_2blocks_offset_2.fits differ diff --git a/tests/makemultimages_reference/multimagetest_2c.fits b/tests/makemultimages_reference/multimagetest_2c.fits new file mode 100644 index 0000000..22840b6 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_2c.fits differ diff --git a/tests/makemultimages_reference/multimagetest_2d.fits b/tests/makemultimages_reference/multimagetest_2d.fits new file mode 100644 index 0000000..b363efb Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_2d.fits differ diff --git a/tests/makemultimages_reference/multimagetest_diff-sizes-psf_0.fits b/tests/makemultimages_reference/multimagetest_diff-sizes-psf_0.fits new file mode 100644 index 0000000..a77423a Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_diff-sizes-psf_0.fits differ diff --git a/tests/makemultimages_reference/multimagetest_diff-sizes-psf_1.fits b/tests/makemultimages_reference/multimagetest_diff-sizes-psf_1.fits new file mode 100644 index 0000000..6c4541d Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_diff-sizes-psf_1.fits differ diff --git a/tests/makemultimages_reference/multimagetest_diff-sizes-psf_2.fits b/tests/makemultimages_reference/multimagetest_diff-sizes-psf_2.fits new file mode 100644 index 0000000..bb3bce2 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_diff-sizes-psf_2.fits differ diff --git a/tests/makemultimages_reference/multimagetest_diff-sizes_0.fits b/tests/makemultimages_reference/multimagetest_diff-sizes_0.fits new file mode 100644 index 0000000..1120a68 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_diff-sizes_0.fits differ diff --git a/tests/makemultimages_reference/multimagetest_diff-sizes_1.fits b/tests/makemultimages_reference/multimagetest_diff-sizes_1.fits new file mode 100644 index 0000000..a9f2d84 Binary files /dev/null and b/tests/makemultimages_reference/multimagetest_diff-sizes_1.fits differ