diff --git a/arccnet/data_generation/mag_processing.py b/arccnet/data_generation/mag_processing.py index d77d50c6..59e37327 100644 --- a/arccnet/data_generation/mag_processing.py +++ b/arccnet/data_generation/mag_processing.py @@ -620,13 +620,15 @@ def _validregion_extraction(self, group, mag_map, cont_map, cutout_size, path) - mag_submap = mag_map.submap(bottom_left, top_right=top_right) cont_submap = cont_map.submap(bottom_left, top_right=top_right) + det = mag_submap.detector if mag_submap.detector != "" else mag_submap.instrument output_mag_filename = ( path / f"{mag_submap.date.to_datetime().strftime('%Y%m%d_%H%M%S')}_{row['id']}-{row['number']}_" - f"mag_{mag_submap.detector.replace(' ', '_')}.fits" + f"mag_{det.replace(' ', '_')}.fits" ) + det = cont_submap.detector if cont_submap.detector != "" else cont_submap.instrument output_cont_filename = ( path / f"{cont_submap.date.to_datetime().strftime('%Y%m%d_%H%M%S')}_{row['id']}-{row['number']}_" - f"cont_{cont_submap.detector.replace(' ', '_')}.fits" + f"cont_{det.replace(' ', '_')}.fits" ) # store info in ARBox @@ -748,14 +750,16 @@ def _quietsun_extraction( bottom_left, top_right = pixel_to_bboxcoords(xsize, ysize, qs_center_hproj * u.pix) qs_mag_submap = mag_map.submap(bottom_left, top_right=top_right) # save to file + det = qs_mag_submap.detector if qs_mag_submap.detector != "" else qs_mag_submap.instrument output_mag_filename = ( path / f"{qs_mag_submap.date.to_datetime().strftime('%Y%m%d_%H%M%S')}_QS-{qs_df_len}_" - f"mag_{qs_mag_submap.detector.replace(' ', '_')}.fits" + f"mag_{det.replace(' ', '_')}.fits" ) - qs_cont_submap = cont_map.submap(bottom_left, top_right=bottom_left) + qs_cont_submap = cont_map.submap(bottom_left, top_right=top_right) + det = qs_cont_submap.detector if qs_cont_submap.detector != "" else qs_cont_submap.instrument output_cont_filename = ( path / f"{qs_cont_submap.date.to_datetime().strftime('%Y%m%d_%H%M%S')}_QS-{qs_df_len}_" - f"cont_{qs_cont_submap.detector.replace(' ', '_')}.fits" + f"cont_{det.replace(' ', '_')}.fits" ) # create QS BBox object diff --git a/arccnet/data_generation/utils/utils.py b/arccnet/data_generation/utils/utils.py index a92cfec6..003677d9 100644 --- a/arccnet/data_generation/utils/utils.py +++ b/arccnet/data_generation/utils/utils.py @@ -7,6 +7,8 @@ from pandas.core.interchange.dataframe_protocol import DataFrame from sklearn.model_selection import StratifiedGroupKFold +from astropy.io.fits import CompImageHDU + from arccnet.utils.logging import logger __all__ = [ @@ -55,7 +57,7 @@ def save_compressed_map(amap: sunpy.map.Map, path: Path, **kwargs) -> None: if "bzero" in amap.meta: del amap.meta["bzero"] - amap.save(path, **kwargs) # , hdu_type=astropy.io.fits.CompImageHDU, **kwargs) + amap.save(path, hdu_type=CompImageHDU, **kwargs) def round_to_midnight(dt: datetime): diff --git a/arccnet/pipeline/main.py b/arccnet/pipeline/main.py index 91366b2d..2df5a10c 100644 --- a/arccnet/pipeline/main.py +++ b/arccnet/pipeline/main.py @@ -776,7 +776,7 @@ def region_cutouts(config, srs_hmi, srs_mdi): logger.debug(f"writing {hmi_file}") hmi_table.write(hmi_file, format="parquet", overwrite=True) - mdi_file = intermediate_files / "mdi_rcutout_classification.parq" + mdi_file = intermediate_files / "mdi_cutout_classification.parq" if mdi_file.exists(): mdi_table = QTable.read(mdi_file) else: