diff --git a/mirar/pipelines/wirc/blocks.py b/mirar/pipelines/wirc/blocks.py index 9028df50d..23655ea00 100644 --- a/mirar/pipelines/wirc/blocks.py +++ b/mirar/pipelines/wirc/blocks.py @@ -169,12 +169,6 @@ only_write_mask=True, ), ImageSaver(output_dir_name="firstpassmasked", write_mask=True), - LoadImageFromHeader( - header_key=RAW_IMG_KEY, - copy_header_keys=[SCAMP_HEADER_KEY, FITS_MASK_KEY, "TARGRA", "TARGDEC"], - load_image=load_raw_wirc_image, - ), - AstrometryFromFile(astrometry_file_key=SCAMP_HEADER_KEY), SkyFlatCalibrator(flat_mask_key=FITS_MASK_KEY, cache_sub_dir="secondpasscal"), NightSkyMedianCalibrator( flat_mask_key=FITS_MASK_KEY, cache_sub_dir="secondpasscal" diff --git a/tests/test_wirc_pipeline.py b/tests/test_wirc_pipeline.py index ddd39fbb6..8dd6b0137 100644 --- a/tests/test_wirc_pipeline.py +++ b/tests/test_wirc_pipeline.py @@ -22,25 +22,25 @@ test_data_dir = get_test_data_dir() expected_header = { - "ZP_6.0": 28.756793975830078, - "ZP_6.0_std": 0.07175969332456589, - "ZP_6.0_nstars": 10, - "ZP_10.0": 29.221546173095703, - "ZP_10.0_std": 0.08415297418832779, - "ZP_10.0_nstars": 10, - "ZP_14.0": 29.307411193847656, - "ZP_14.0_std": 0.12999354302883148, - "ZP_14.0_nstars": 11, - "ZP_18.0": 29.351654052734375, - "ZP_18.0_std": 0.10415466874837875, - "ZP_18.0_nstars": 11, - "ZP_AUTO": 29.370691299438477, - "ZP_AUTO_std": 0.0895678773522377, - "ZP_AUTO_nstars": 11, - "DETMAG95": 20.52475357055664, - "DETMAG50": 19.24155044555664, - "DETMAG05": 16.64298439025879, - "MAGLIM": 21.068127497605154, + "ZP_6.0": 28.65304946899414, + "ZP_6.0_std": 0.2731286287307739, + "ZP_6.0_nstars": 13, + "ZP_10.0": 29.234046936035156, + "ZP_10.0_std": 0.0909748375415802, + "ZP_10.0_nstars": 11, + "ZP_14.0": 29.31132698059082, + "ZP_14.0_std": 0.13512319326400757, + "ZP_14.0_nstars": 13, + "ZP_18.0": 29.36883544921875, + "ZP_18.0_std": 0.10831019282341003, + "ZP_18.0_nstars": 13, + "ZP_AUTO": 29.382896423339844, + "ZP_AUTO_std": 0.09697652608156204, + "ZP_AUTO_nstars": 12, + "DETMAG95": 20.556614112854003, + "DETMAG50": 19.223386764526367, + "DETMAG05": 16.460859966278075, + "MAGLIM": 21.044430789667402, } expected_table = { @@ -48,21 +48,21 @@ "dec": 34.437416666666664, "xpos": 689.7351634112279, "ypos": 1658.0823528760743, - "fluxap": 35875.90509640997, - "fluxuncap": 687.4760147074132, - "magap": 17.983684133207536, - "sigmagap": 0.09195371412681115, - "fluxapbig": 74376.7707068217, - "fluxuncapbig": 3028.8886771963785, - "magapbig": 17.192098003889477, - "sigmagapbig": 0.09989157687293666, - "psfflux": 39665.9926674688, - "psffluxunc": 417.21051569081976, - "chipsf": 0.9663571880988399, + "fluxap": 36445.87475183021, + "fluxuncap": 700.6073201070337, + "magap": 17.97877547743225, + "sigmagap": 0.09919814366894542, + "fluxapbig": 70467.29198086978, + "fluxuncapbig": 3087.953360586301, + "magapbig": 17.262927468037958, + "sigmagapbig": 0.10802419286410868, + "psfflux": 40020.58541113894, + "psffluxunc": 426.734305980583, + "chipsf": 0.9351921013740141, "xshift": 1, "yshift": 0, - "magpsf": 17.874645481282734, - "sigmapsf": 0.09029330822879632, + "magpsf": 17.87718783059487, + "sigmapsf": 0.09766545019630819, }