diff --git a/pipeline/ref_maker.py b/pipeline/ref_maker.py index 88c4b1e1..acef3a7d 100644 --- a/pipeline/ref_maker.py +++ b/pipeline/ref_maker.py @@ -790,7 +790,7 @@ def run(self, *args, do_not_build=False, **kwargs ): SCLogger.info( f"RekMaker only found {len(match_count[0])} images overlapping the center of the " f"desired field, which is less than the minimum of {self.pars.min_number}" ) return None - elif ( not self.pars.min_only_center ) and any( c < self.pars.min.number for c in match_count ): + elif ( not self.pars.min_only_center ) and any( c < self.pars.min_number for c in match_count ): SCLogger.info( f"RefMaker didn't find enough references at at least one point on the image; " f"match_count={match_count}, min_number={self.mars.min_number}" ) return None diff --git a/tests/fixtures/decam.py b/tests/fixtures/decam.py index 87cf73bb..5876d22f 100644 --- a/tests/fixtures/decam.py +++ b/tests/fixtures/decam.py @@ -417,7 +417,7 @@ def decam_datastore_through_preprocessing( decam_exposure, 'S3', cache_dir=decam_cache_dir, - cache_base_name='007/c4d_20230702_080904_S3_r_Sci_NBXRIO', + cache_base_name='007/c4d_20230702_080904_S3_r_Sci_IDDLGQ', overrides={ 'subtraction': { 'refset': 'test_refset_decam' } }, save_original_image=True, provtag='decam_datastore', @@ -451,7 +451,7 @@ def decam_datastore_through_extraction( decam_exposure, 'S3', cache_dir=decam_cache_dir, - cache_base_name='007/c4d_20230702_080904_S3_r_Sci_NBXRIO', + cache_base_name='007/c4d_20230702_080904_S3_r_Sci_IDDLGQ', overrides={ 'subtraction': { 'refset': 'test_refset_decam' } }, save_original_image=True, provtag='decam_datastore', @@ -485,7 +485,7 @@ def decam_datastore_through_bg( decam_exposure, 'S3', cache_dir=decam_cache_dir, - cache_base_name='007/c4d_20230702_080904_S3_r_Sci_NBXRIO', + cache_base_name='007/c4d_20230702_080904_S3_r_Sci_IDDLGQ', overrides={ 'subtraction': { 'refset': 'test_refset_decam' } }, save_original_image=True, provtag='decam_datastore', @@ -519,7 +519,7 @@ def decam_datastore_through_wcs( decam_exposure, 'S3', cache_dir=decam_cache_dir, - cache_base_name='007/c4d_20230702_080904_S3_r_Sci_NBXRIO', + cache_base_name='007/c4d_20230702_080904_S3_r_Sci_IDDLGQ', overrides={ 'subtraction': { 'refset': 'test_refset_decam' } }, save_original_image=True, provtag='decam_datastore', @@ -552,7 +552,7 @@ def decam_datastore_through_zp( decam_exposure, 'S3', cache_dir=decam_cache_dir, - cache_base_name='007/c4d_20230702_080904_S3_r_Sci_NBXRIO', + cache_base_name='007/c4d_20230702_080904_S3_r_Sci_IDDLGQ', overrides={ 'subtraction': { 'refset': 'test_refset_decam' } }, save_original_image=True, provtag='decam_datastore', @@ -585,7 +585,7 @@ def decam_datastore_through_subtraction( decam_exposure, 'S3', cache_dir=decam_cache_dir, - cache_base_name='007/c4d_20230702_080904_S3_r_Sci_NBXRIO', + cache_base_name='007/c4d_20230702_080904_S3_r_Sci_IDDLGQ', overrides={ 'subtraction': { 'refset': 'test_refset_decam' } }, save_original_image=True, provtag='decam_datastore', @@ -618,7 +618,7 @@ def decam_datastore_through_detection( decam_exposure, 'S3', cache_dir=decam_cache_dir, - cache_base_name='007/c4d_20230702_080904_S3_r_Sci_NBXRIO', + cache_base_name='007/c4d_20230702_080904_S3_r_Sci_IDDLGQ', overrides={ 'subtraction': { 'refset': 'test_refset_decam' } }, save_original_image=True, provtag='decam_datastore', @@ -651,7 +651,7 @@ def decam_datastore_through_cutouts( decam_exposure, 'S3', cache_dir=decam_cache_dir, - cache_base_name='007/c4d_20230702_080904_S3_r_Sci_NBXRIO', + cache_base_name='007/c4d_20230702_080904_S3_r_Sci_IDDLGQ', overrides={ 'subtraction': { 'refset': 'test_refset_decam' } }, save_original_image=True, provtag='decam_datastore', diff --git a/tests/fixtures/ptf.py b/tests/fixtures/ptf.py index 5a18b087..acfa77b6 100644 --- a/tests/fixtures/ptf.py +++ b/tests/fixtures/ptf.py @@ -191,7 +191,7 @@ def ptf_datastore_through_zp( datastore_factory, ptf_exposure, ptf_ref, ptf_cach ptf_exposure, 11, cache_dir=ptf_cache_dir, - cache_base_name='187/PTF_20110429_040004_11_R_Sci_BNKEKA', + cache_base_name='187/PTF_20110429_040004_11_R_Sci_LYQY3W', overrides={'extraction': {'threshold': 5}, 'subtraction': {'refset': 'test_refset_ptf'}}, bad_pixel_map=ptf_bad_pixel_map, provtag='ptf_datastore', @@ -221,7 +221,7 @@ def ptf_datastore(datastore_factory, ptf_exposure, ptf_ref, ptf_cache_dir, ptf_b ptf_exposure, 11, cache_dir=ptf_cache_dir, - cache_base_name='187/PTF_20110429_040004_11_R_Sci_BNKEKA', + cache_base_name='187/PTF_20110429_040004_11_R_Sci_LYQY3W', overrides={'extraction': {'threshold': 5}, 'subtraction': {'refset': 'test_refset_ptf'}}, bad_pixel_map=ptf_bad_pixel_map, provtag='ptf_datastore' diff --git a/tests/pipeline/test_making_references.py b/tests/pipeline/test_making_references.py index 78a6a749..1b2522f3 100644 --- a/tests/pipeline/test_making_references.py +++ b/tests/pipeline/test_making_references.py @@ -649,6 +649,8 @@ def test_making_references( ptf_reference_image_datastores ): 'min_number': 4, 'max_number': 10, 'end_time': '2010-01-01', + 'corner_distance': None, + 'overlap_fraction': None, } ) refsetstodel.add( maker.pars.name )