From 8e5c765e40583dd66daab51a1deb2ec09c017388 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 6 Jan 2025 11:09:00 +0000 Subject: [PATCH 01/47] update dependencies*.log files(s) --- dependencies-examples.log | 22 +++++++++++----------- dependencies-mypy.log | 22 +++++++++++----------- dependencies-tests.log | 20 ++++++++++---------- dependencies.log | 20 ++++++++++---------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dependencies-examples.log b/dependencies-examples.log index d2fc0289..f014d16c 100644 --- a/dependencies-examples.log +++ b/dependencies-examples.log @@ -8,15 +8,15 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2024.12.9.0.36.21 +astropy-iers-data==0.2025.1.6.0.33.42 # via astropy cachetools==5.5.0 # via wipac-rest-tools -certifi==2024.8.30 +certifi==2024.12.14 # via requests cffi==1.17.1 # via cryptography -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 # via requests contourpy==1.3.1 # via matplotlib @@ -32,15 +32,15 @@ healpy==1.18.0 # mhealpy idna==3.10 # via requests -kiwisolver==1.4.7 +kiwisolver==1.4.8 # via matplotlib -matplotlib==3.9.3 +matplotlib==3.10.0 # via icecube-skyreader (setup.py) meander==0.0.3 # via icecube-skyreader (setup.py) mhealpy==0.3.4 # via icecube-skyreader (setup.py) -numpy==2.2.0 +numpy==2.2.1 # via # astropy # contourpy @@ -56,7 +56,7 @@ packaging==24.2 # matplotlib pandas==2.2.3 # via icecube-skyreader (setup.py) -pillow==11.0.0 +pillow==11.1.0 # via matplotlib pycparser==2.22 # via cffi @@ -64,7 +64,7 @@ pyerfa==2.0.1.5 # via astropy pyjwt[crypto]==2.10.1 # via wipac-rest-tools -pyparsing==3.2.0 +pyparsing==3.2.1 # via matplotlib python-dateutil==2.9.0.post0 # via @@ -83,7 +83,7 @@ requests==2.32.3 # wipac-rest-tools requests-futures==1.0.2 # via wipac-rest-tools -scipy==1.14.1 +scipy==1.15.0 # via icecube-skyreader (setup.py) six==1.17.0 # via python-dateutil @@ -93,7 +93,7 @@ typing-extensions==4.12.2 # via wipac-dev-tools tzdata==2024.2 # via pandas -urllib3==2.2.3 +urllib3==2.3.0 # via # requests # wipac-rest-tools @@ -101,5 +101,5 @@ wipac-dev-tools==1.13.0 # via # icecube-skyreader (setup.py) # wipac-rest-tools -wipac-rest-tools==1.8.4 +wipac-rest-tools==1.8.5 # via icecube-skyreader (setup.py) diff --git a/dependencies-mypy.log b/dependencies-mypy.log index 9e01221d..cefb367a 100644 --- a/dependencies-mypy.log +++ b/dependencies-mypy.log @@ -8,15 +8,15 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2024.12.9.0.36.21 +astropy-iers-data==0.2025.1.6.0.33.42 # via astropy cachetools==5.5.0 # via wipac-rest-tools -certifi==2024.8.30 +certifi==2024.12.14 # via requests cffi==1.17.1 # via cryptography -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 # via requests contourpy==1.3.1 # via matplotlib @@ -34,15 +34,15 @@ idna==3.10 # via requests iniconfig==2.0.0 # via pytest -kiwisolver==1.4.7 +kiwisolver==1.4.8 # via matplotlib -matplotlib==3.9.3 +matplotlib==3.10.0 # via icecube-skyreader (setup.py) meander==0.0.3 # via icecube-skyreader (setup.py) mhealpy==0.3.4 # via icecube-skyreader (setup.py) -numpy==2.2.0 +numpy==2.2.1 # via # astropy # contourpy @@ -59,7 +59,7 @@ packaging==24.2 # pytest pandas==2.2.3 # via icecube-skyreader (setup.py) -pillow==11.0.0 +pillow==11.1.0 # via matplotlib pluggy==1.5.0 # via pytest @@ -69,7 +69,7 @@ pyerfa==2.0.1.5 # via astropy pyjwt[crypto]==2.10.1 # via wipac-rest-tools -pyparsing==3.2.0 +pyparsing==3.2.1 # via matplotlib pytest==8.3.4 # via @@ -94,7 +94,7 @@ requests==2.32.3 # wipac-rest-tools requests-futures==1.0.2 # via wipac-rest-tools -scipy==1.14.1 +scipy==1.15.0 # via icecube-skyreader (setup.py) six==1.17.0 # via python-dateutil @@ -104,7 +104,7 @@ typing-extensions==4.12.2 # via wipac-dev-tools tzdata==2024.2 # via pandas -urllib3==2.2.3 +urllib3==2.3.0 # via # requests # wipac-rest-tools @@ -112,5 +112,5 @@ wipac-dev-tools==1.13.0 # via # icecube-skyreader (setup.py) # wipac-rest-tools -wipac-rest-tools==1.8.4 +wipac-rest-tools==1.8.5 # via icecube-skyreader (setup.py) diff --git a/dependencies-tests.log b/dependencies-tests.log index a74935e1..f6572564 100644 --- a/dependencies-tests.log +++ b/dependencies-tests.log @@ -8,11 +8,11 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2024.12.9.0.36.21 +astropy-iers-data==0.2025.1.6.0.33.42 # via astropy -certifi==2024.8.30 +certifi==2024.12.14 # via requests -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 # via requests contourpy==1.3.1 # via matplotlib @@ -28,15 +28,15 @@ idna==3.10 # via requests iniconfig==2.0.0 # via pytest -kiwisolver==1.4.7 +kiwisolver==1.4.8 # via matplotlib -matplotlib==3.9.3 +matplotlib==3.10.0 # via icecube-skyreader (setup.py) meander==0.0.3 # via icecube-skyreader (setup.py) mhealpy==0.3.4 # via icecube-skyreader (setup.py) -numpy==2.2.0 +numpy==2.2.1 # via # astropy # contourpy @@ -53,13 +53,13 @@ packaging==24.2 # pytest pandas==2.2.3 # via icecube-skyreader (setup.py) -pillow==11.0.0 +pillow==11.1.0 # via matplotlib pluggy==1.5.0 # via pytest pyerfa==2.0.1.5 # via astropy -pyparsing==3.2.0 +pyparsing==3.2.1 # via matplotlib pytest==8.3.4 # via @@ -77,7 +77,7 @@ pyyaml==6.0.2 # via astropy requests==2.32.3 # via wipac-dev-tools -scipy==1.14.1 +scipy==1.15.0 # via icecube-skyreader (setup.py) six==1.17.0 # via python-dateutil @@ -85,7 +85,7 @@ typing-extensions==4.12.2 # via wipac-dev-tools tzdata==2024.2 # via pandas -urllib3==2.2.3 +urllib3==2.3.0 # via requests wipac-dev-tools==1.13.0 # via icecube-skyreader (setup.py) diff --git a/dependencies.log b/dependencies.log index ccb626f5..bd4aed62 100644 --- a/dependencies.log +++ b/dependencies.log @@ -8,11 +8,11 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2024.12.9.0.36.21 +astropy-iers-data==0.2025.1.6.0.33.42 # via astropy -certifi==2024.8.30 +certifi==2024.12.14 # via requests -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 # via requests contourpy==1.3.1 # via matplotlib @@ -26,15 +26,15 @@ healpy==1.18.0 # mhealpy idna==3.10 # via requests -kiwisolver==1.4.7 +kiwisolver==1.4.8 # via matplotlib -matplotlib==3.9.3 +matplotlib==3.10.0 # via icecube-skyreader (setup.py) meander==0.0.3 # via icecube-skyreader (setup.py) mhealpy==0.3.4 # via icecube-skyreader (setup.py) -numpy==2.2.0 +numpy==2.2.1 # via # astropy # contourpy @@ -50,11 +50,11 @@ packaging==24.2 # matplotlib pandas==2.2.3 # via icecube-skyreader (setup.py) -pillow==11.0.0 +pillow==11.1.0 # via matplotlib pyerfa==2.0.1.5 # via astropy -pyparsing==3.2.0 +pyparsing==3.2.1 # via matplotlib python-dateutil==2.9.0.post0 # via @@ -66,7 +66,7 @@ pyyaml==6.0.2 # via astropy requests==2.32.3 # via wipac-dev-tools -scipy==1.14.1 +scipy==1.15.0 # via icecube-skyreader (setup.py) six==1.17.0 # via python-dateutil @@ -74,7 +74,7 @@ typing-extensions==4.12.2 # via wipac-dev-tools tzdata==2024.2 # via pandas -urllib3==2.2.3 +urllib3==2.3.0 # via requests wipac-dev-tools==1.13.0 # via icecube-skyreader (setup.py) From 8e90b9c4c2c6abbd4d347d0fff272027e4eb97c5 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Mon, 6 Jan 2025 12:14:05 +0100 Subject: [PATCH 02/47] header identical to lvk --- skyreader/utils/handle_map_data.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/skyreader/utils/handle_map_data.py b/skyreader/utils/handle_map_data.py index b145b677..0ffe2566 100644 --- a/skyreader/utils/handle_map_data.py +++ b/skyreader/utils/handle_map_data.py @@ -400,8 +400,10 @@ def prepare_multiorder_map( max_nside = np.max(all_nsides) multiorder_map = mhealpy.HealpixMap( grid_value / healpy.nside2pixarea( - max_nside, degrees=True, - ), uniq_array + max_nside, degrees=False, + ), + uniq_array, + unit = "sr-1" ) - column_names = [f"{column_names[0]} DENSITY [deg-2]"] + column_names = ["PROBDENSITY"] return multiorder_map, column_names From fe4010c3cc7f2021aadca5a9cbcbaddab1c6c2db Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Mon, 6 Jan 2025 13:35:12 +0100 Subject: [PATCH 03/47] flake8 --- skyreader/utils/handle_map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/utils/handle_map_data.py b/skyreader/utils/handle_map_data.py index 0ffe2566..8d77a155 100644 --- a/skyreader/utils/handle_map_data.py +++ b/skyreader/utils/handle_map_data.py @@ -403,7 +403,7 @@ def prepare_multiorder_map( max_nside, degrees=False, ), uniq_array, - unit = "sr-1" + unit="sr-1" ) column_names = ["PROBDENSITY"] return multiorder_map, column_names From 0f30bf2ed560a2c03ec35ff711ee7ffc3bd3d1c4 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Mon, 6 Jan 2025 13:38:05 +0100 Subject: [PATCH 04/47] get_paths() instead of collections --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 3c09e6e0..73385c4c 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -193,7 +193,7 @@ def create_plot( contour_set = ax.contour( ra, dec, map_to_plot, levels=[level], colors=[color] ) - cs_collections.append(contour_set.collections[0]) + cs_collections.append(contour_set.get_paths()[0]) e, _ = contour_set.legend_elements() leg_element.append(e[0]) From 67b87115c2a7ff770d395e6414e25498158f80dc Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Mon, 6 Jan 2025 13:58:34 +0100 Subject: [PATCH 05/47] try to fix incompatibily with new matplotlib --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 73385c4c..96641ada 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -221,7 +221,7 @@ def create_plot( leg_labels = [] for i in range(len(contour_labels)): - vs = cs_collections[i].get_paths()[0].vertices + vs = cs_collections[i].vertices # Compute area enclosed by vertices. # Take absolute values to be independent of orientation of # the boundary integral. From 29d8d5ffaff6949a038bd75247411062207e9a41 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Wed, 8 Jan 2025 10:29:46 +0100 Subject: [PATCH 06/47] modified julian date as in lvk --- skyreader/plot/plot.py | 1 + skyreader/plot/plotting_tools.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 96641ada..b46ccd08 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -756,6 +756,7 @@ def bounding_box(ra, dec, theta, phi): ) uncertainty = [(ra_minus, ra_plus), (dec_minus, dec_plus)] + print(event_metadata) fits_header = format_fits_header( ( event_metadata.run_id, diff --git a/skyreader/plot/plotting_tools.py b/skyreader/plot/plotting_tools.py index bf8c7bc8..c6ec44bb 100644 --- a/skyreader/plot/plotting_tools.py +++ b/skyreader/plot/plotting_tools.py @@ -32,7 +32,8 @@ def format_fits_header( ('RUNID', run_id), ('EVENTID', event_id), ('SENDER', 'IceCube Collaboration'), - ('EventMJD', mjd), + # ('DATE-OBS', ) + ('MJD-OBS', mjd, 'modified Julian date of observation'), ('I3TYPE', f'{event_type}','Alert Type'), ('RA', np.round(ra,2),'Degree'), ('DEC', np.round(dec,2),'Degree'), From beb05584805dde5abd2956d1a7c4011e3e336ccd Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Wed, 8 Jan 2025 10:41:00 +0100 Subject: [PATCH 07/47] utc date in isot format --- skyreader/plot/plot.py | 1 - skyreader/plot/plotting_tools.py | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index b46ccd08..96641ada 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -756,7 +756,6 @@ def bounding_box(ra, dec, theta, phi): ) uncertainty = [(ra_minus, ra_plus), (dec_minus, dec_plus)] - print(event_metadata) fits_header = format_fits_header( ( event_metadata.run_id, diff --git a/skyreader/plot/plotting_tools.py b/skyreader/plot/plotting_tools.py index c6ec44bb..1618f040 100644 --- a/skyreader/plot/plotting_tools.py +++ b/skyreader/plot/plotting_tools.py @@ -4,6 +4,7 @@ # flake8: noqa import astropy.io.fits as pyfits # type: ignore[import] +from astropy.time import Time # type: ignore[import] import healpy # type: ignore[import] import matplotlib # type: ignore[import] import matplotlib.patheffects as path_effects # type: ignore[import] @@ -28,12 +29,14 @@ def format_fits_header( else: uncertainty_comment = 'Highest posterior density 90% credible region' + t = Time(mjd, format="mjd") + header = [ ('RUNID', run_id), ('EVENTID', event_id), ('SENDER', 'IceCube Collaboration'), - # ('DATE-OBS', ) - ('MJD-OBS', mjd, 'modified Julian date of observation'), + ('DATE-OBS', t.isot, 'UTC date of the observation') + ('MJD-OBS', mjd, 'modified Julian date of the observation'), ('I3TYPE', f'{event_type}','Alert Type'), ('RA', np.round(ra,2),'Degree'), ('DEC', np.round(dec,2),'Degree'), From 4d5fd9515347f2539e5fa2210907956ffa0496b6 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Wed, 8 Jan 2025 10:42:08 +0100 Subject: [PATCH 08/47] add comma --- skyreader/plot/plotting_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plotting_tools.py b/skyreader/plot/plotting_tools.py index 1618f040..f8b57823 100644 --- a/skyreader/plot/plotting_tools.py +++ b/skyreader/plot/plotting_tools.py @@ -35,7 +35,7 @@ def format_fits_header( ('RUNID', run_id), ('EVENTID', event_id), ('SENDER', 'IceCube Collaboration'), - ('DATE-OBS', t.isot, 'UTC date of the observation') + ('DATE-OBS', t.isot, 'UTC date of the observation'), ('MJD-OBS', mjd, 'modified Julian date of the observation'), ('I3TYPE', f'{event_type}','Alert Type'), ('RA', np.round(ra,2),'Degree'), From 72a078ae154c31a9157276130441cc19977a9a3b Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Wed, 8 Jan 2025 11:12:33 +0100 Subject: [PATCH 09/47] flattened probability map with same units as multiorder map --- skyreader/plot/plot.py | 11 +++++++---- skyreader/utils/handle_map_data.py | 10 +++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 96641ada..dd4cf8dc 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -812,7 +812,7 @@ def bounding_box(ra, dec, theta, phi): plt.legend(fontsize=6, loc="lower left") # save flattened map - equatorial_map, column_names = prepare_flattened_map( + equatorial_map, column_names, column_units = prepare_flattened_map( equatorial_map, llh_map ) if llh_map: @@ -822,14 +822,17 @@ def bounding_box(ra, dec, theta, phi): filename_main = f"{unique_id}.skymap_nside_{mmap_nside}_{type_map}" healpy.write_map( self.output_dir / f"{filename_main}.fits.gz", - equatorial_map, + equatorial_map / healpy.nside2pixarea( + max_nside, degrees=False, + ), coord='C', column_names=column_names, + column_units=column_units, extra_header=fits_header, overwrite=True ) - multiorder_map, column_names = prepare_multiorder_map( - grid_value, uniq_array, llh_map, column_names + multiorder_map = prepare_multiorder_map( + grid_value, uniq_array, llh_map, ) multiorder_map.write_map( self.output_dir / f"{filename_main}.multiorder.fits.gz", diff --git a/skyreader/utils/handle_map_data.py b/skyreader/utils/handle_map_data.py index 8d77a155..0e962cd4 100644 --- a/skyreader/utils/handle_map_data.py +++ b/skyreader/utils/handle_map_data.py @@ -369,20 +369,21 @@ def prepare_flattened_map( """ if llh_map: column_names = ['2DLLH'] + column_units = None else: # avoid excessively heavy data format for the flattened map equatorial_map[equatorial_map < 1e-16] = np.nanmean( equatorial_map[equatorial_map < 1e-16] ) - column_names = ["PROBABILITY"] - return equatorial_map, column_names + column_names = ["PROBDENSITY"] + column_units = ["sr-1"] + return equatorial_map, column_names, column_units def prepare_multiorder_map( grid_value: np.ndarray, uniq_array: np.ndarray, llh_map: bool, - column_names: List[str] ) -> Tuple[mhealpy.HealpixMap, List[str]]: """ Create the mhealpix map that needs to be saved keeping @@ -405,5 +406,4 @@ def prepare_multiorder_map( uniq_array, unit="sr-1" ) - column_names = ["PROBDENSITY"] - return multiorder_map, column_names + return multiorder_map From a725e43686727fe43ed0d5f5ff707bc62530fdea Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Wed, 8 Jan 2025 11:20:12 +0100 Subject: [PATCH 10/47] fix type of output for prepare_flattened_map() --- skyreader/utils/handle_map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/utils/handle_map_data.py b/skyreader/utils/handle_map_data.py index 0e962cd4..dc7abe39 100644 --- a/skyreader/utils/handle_map_data.py +++ b/skyreader/utils/handle_map_data.py @@ -362,7 +362,7 @@ def clean_data_multiorder_map( def prepare_flattened_map( equatorial_map: np.ndarray, llh_map: bool, -) -> Tuple[np.ndarray, List[str]]: +) -> Tuple[np.ndarray, List[str], Union[List[str], None]]: """ Create the healpix map that needs to be saved keeping into account if it is a probability or a llh map From bfdcc9569e4bcea00d18bdeef7ff544c1d694342 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Wed, 8 Jan 2025 11:22:49 +0100 Subject: [PATCH 11/47] fix type of output for prepare_multiorder_map() --- skyreader/utils/handle_map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/utils/handle_map_data.py b/skyreader/utils/handle_map_data.py index dc7abe39..3f72dc22 100644 --- a/skyreader/utils/handle_map_data.py +++ b/skyreader/utils/handle_map_data.py @@ -384,7 +384,7 @@ def prepare_multiorder_map( grid_value: np.ndarray, uniq_array: np.ndarray, llh_map: bool, -) -> Tuple[mhealpy.HealpixMap, List[str]]: +) -> mhealpy.HealpixMap: """ Create the mhealpix map that needs to be saved keeping into account if it is a probability or a llh map From 9aa9adf30fc16499ffd1cce1de2bc6c52c72be8b Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Thu, 16 Jan 2025 10:44:08 +0100 Subject: [PATCH 12/47] remove option dozoom --- skyreader/plot/plot.py | 164 ++++++----------------------------------- 1 file changed, 23 insertions(+), 141 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index dd4cf8dc..62c01bbd 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -55,7 +55,6 @@ def __init__(self, output_dir: Path = Path(".")): def create_plot( self, result: SkyScanResult, - dozoom: bool = False, systematics: bool = False, llh_map: bool = True, angular_error_floor: Union[None, float] = None, @@ -65,7 +64,7 @@ def create_plot( PLOT_DPI_STANDARD and PLOT_DPI_ZOOMED. Zoomed mode is very inefficient as the meshgrid is created for the full sky. """ - dpi = self.PLOT_DPI_STANDARD if not dozoom else self.PLOT_DPI_ZOOMED + dpi = self.PLOT_DPI_STANDARD # number of grid points along RA coordinate xsize = int(self.PLOT_SIZE_X_IN * dpi) @@ -90,11 +89,7 @@ def create_plot( mjd_str = f"MJD: {event_metadata.mjd}" plot_title = f"{run_str} {evt_str} {typ_str} {mjd_str}" - if dozoom: - addition_to_filename = 'plot_zoomed_legacy.' - else: - addition_to_filename = '' - plot_filename = f"{unique_id}.{addition_to_filename}pdf" + plot_filename = f"{unique_id}.pdf" LOGGER.info(f"saving plot to {plot_filename}") grid_value, grid_ra, grid_dec, equatorial_map, _ = extract_map( @@ -118,12 +113,6 @@ def create_plot( LOGGER.info(f"min Dec: {min_dec * 180./np.pi} deg") # renormalize - if dozoom: - plotting_map = plotting_map - min_value - equatorial_map = equatorial_map - min_value - vmin = 0. - vmax = 50 - map_to_plot = plotting_map if llh_map: cmap = self.PLOT_COLORMAP text_colorbar = r"$-2 \ln(L)$" @@ -162,11 +151,8 @@ def create_plot( ax = None - if dozoom: - ax = fig.add_subplot(111) # ,projection='cartesian') - else: - cmap.set_over(alpha=0.) # make underflows transparent - ax = fig.add_subplot(111, projection='astro mollweide') + cmap.set_over(alpha=0.) # make underflows transparent + ax = fig.add_subplot(111, projection='astro mollweide') # rasterized makes the map bitmap while the labels remain vectorial # flip longitude to the astro convention @@ -197,112 +183,19 @@ def create_plot( e, _ = contour_set.legend_elements() leg_element.append(e[0]) - if not dozoom: - # graticule - if isinstance(ax, AstroMollweideAxes): - # mypy guard - ax.set_longitude_grid(30) - ax.set_latitude_grid(30) - cb = fig.colorbar( - image, - orientation='horizontal', - shrink=.6, - pad=0.05, - ticks=[vmin, vmax], - ) - cb.ax.xaxis.set_label_text(text_colorbar) - else: - ax.set_xlabel('right ascension') - ax.set_ylabel('declination') - cb = fig.colorbar( - image, orientation='horizontal', shrink=.6, pad=0.13 - ) - cb.ax.xaxis.set_label_text(r"$-2 \Delta \ln (L)$") - - leg_labels = [] - for i in range(len(contour_labels)): - vs = cs_collections[i].vertices - # Compute area enclosed by vertices. - # Take absolute values to be independent of orientation of - # the boundary integral. - contour_area = abs(calculate_area(vs)) # in square-radians - # convert to square-degrees - contour_area_sqdeg = contour_area*(180.*180.)/(np.pi*np.pi) - - area_string = f"area: {contour_area_sqdeg:.2f}sqdeg" - leg_labels.append( - f'{contour_labels[i]} - {area_string}' - ) - - ax.scatter( - min_ra, - min_dec, - s=20, - marker='*', - color='black', - label=r'scan best-fit', - zorder=2 - ) - ax.legend( - leg_element, - leg_labels, - loc='lower right', - fontsize=8, - scatterpoints=1, - ncol=2 - ) - - LOGGER.info(f"Contour Area (90%): {contour_area_sqdeg} " - f"degrees (cartesian) " - f"{contour_area_sqdeg * np.cos(min_dec)**2} " - "degrees (scaled)") - x_width = 1.6 * np.sqrt(contour_area_sqdeg) - LOGGER.info(f"x width is {x_width}") - if np.isnan(x_width): - # this get called only when contour_area / x_width is - # NaN so possibly never invoked in typical situations - raise RuntimeError( - "Estimated area / width is NaN and the fallback logic " - "for this scenario is no longer supported. If you " - "encounter this error raise an issue to SkyReader." - ) - # mypy error: "QuadContourSet" has no attribute "allsegs" - # [attr-defined]. This attribute is likely deprecated but - # this scenario is rarely (if ever) hit original code is - # kept commented for the time being - - # note: contour_set is re-assigned at every iteration of - # the loop on contour_levels, contour_colors, so this - # effectively corresponds to the last contour_set - # x_width = 1.6*(max(contour_set.allsegs[i][0][:,0]) - - # min(contour_set.allsegs[i][0][:,0])) - - y_width = 0.5 * x_width - - lower_x = max(min_ra - x_width*np.pi/180., 0.) - upper_x = min(min_ra + x_width*np.pi/180., 2 * np.pi) - lower_y = max(min_dec - y_width*np.pi/180., -np.pi/2.) - upper_y = min(min_dec + y_width*np.pi/180., np.pi/2.) - - ax.set_xlim(upper_x, lower_x) - ax.set_ylim(lower_y, upper_y) - - # why not RAFormatter? - ax.xaxis.set_major_formatter(DecFormatter()) - - ax.yaxis.set_major_formatter(DecFormatter()) - - factor = 0.25*(np.pi/180.) - while (upper_x - lower_x)/factor > 6: - factor *= 2. - tick_label_grid = factor - - ax.xaxis.set_major_locator( - matplotlib.ticker.MultipleLocator(base=tick_label_grid) - ) - ax.yaxis.set_major_locator( - matplotlib.ticker.MultipleLocator(base=tick_label_grid) - ) + # graticule + if isinstance(ax, AstroMollweideAxes): + # mypy guard + ax.set_longitude_grid(30) + ax.set_latitude_grid(30) + cb = fig.colorbar( + image, + orientation='horizontal', + shrink=.6, + pad=0.05, + ticks=[vmin, vmax], + ) + cb.ax.xaxis.set_label_text(text_colorbar) # cb.ax.xaxis.labelpad = -8 # workaround for issue with viewers, see colorbar docstring @@ -311,9 +204,6 @@ def create_plot( if isinstance(cb.solids, matplotlib.collections.QuadMesh): cb.solids.set_edgecolor("face") - if dozoom: - ax.set_aspect('equal') - ax.tick_params(axis='x', labelsize=10) ax.tick_params(axis='y', labelsize=10) @@ -333,20 +223,12 @@ def create_plot( # remove white space around figure spacing = 0.01 - if not dozoom: - fig.subplots_adjust( - bottom=spacing, - top=1.-spacing, - left=spacing+0.04, - right=1.-spacing - ) - else: - fig.subplots_adjust( - bottom=spacing, - top=0.92-spacing, - left=spacing+0.1, - right=1.-spacing - ) + fig.subplots_adjust( + bottom=spacing, + top=1.-spacing, + left=spacing+0.04, + right=1.-spacing + ) # set the title fig.suptitle(plot_title) From 2c41db1c65b16ef3a3e955889957cd5eb1974b90 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 16 Jan 2025 09:44:47 +0000 Subject: [PATCH 13/47] update dependencies*.log files(s) --- dependencies-examples.log | 6 +++--- dependencies-mypy.log | 6 +++--- dependencies-tests.log | 6 +++--- dependencies.log | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dependencies-examples.log b/dependencies-examples.log index f014d16c..031287b7 100644 --- a/dependencies-examples.log +++ b/dependencies-examples.log @@ -8,7 +8,7 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2025.1.6.0.33.42 +astropy-iers-data==0.2025.1.13.0.34.51 # via astropy cachetools==5.5.0 # via wipac-rest-tools @@ -83,7 +83,7 @@ requests==2.32.3 # wipac-rest-tools requests-futures==1.0.2 # via wipac-rest-tools -scipy==1.15.0 +scipy==1.15.1 # via icecube-skyreader (setup.py) six==1.17.0 # via python-dateutil @@ -97,7 +97,7 @@ urllib3==2.3.0 # via # requests # wipac-rest-tools -wipac-dev-tools==1.13.0 +wipac-dev-tools==1.15.0 # via # icecube-skyreader (setup.py) # wipac-rest-tools diff --git a/dependencies-mypy.log b/dependencies-mypy.log index cefb367a..9fa437d2 100644 --- a/dependencies-mypy.log +++ b/dependencies-mypy.log @@ -8,7 +8,7 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2025.1.6.0.33.42 +astropy-iers-data==0.2025.1.13.0.34.51 # via astropy cachetools==5.5.0 # via wipac-rest-tools @@ -94,7 +94,7 @@ requests==2.32.3 # wipac-rest-tools requests-futures==1.0.2 # via wipac-rest-tools -scipy==1.15.0 +scipy==1.15.1 # via icecube-skyreader (setup.py) six==1.17.0 # via python-dateutil @@ -108,7 +108,7 @@ urllib3==2.3.0 # via # requests # wipac-rest-tools -wipac-dev-tools==1.13.0 +wipac-dev-tools==1.15.0 # via # icecube-skyreader (setup.py) # wipac-rest-tools diff --git a/dependencies-tests.log b/dependencies-tests.log index f6572564..a6aff038 100644 --- a/dependencies-tests.log +++ b/dependencies-tests.log @@ -8,7 +8,7 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2025.1.6.0.33.42 +astropy-iers-data==0.2025.1.13.0.34.51 # via astropy certifi==2024.12.14 # via requests @@ -77,7 +77,7 @@ pyyaml==6.0.2 # via astropy requests==2.32.3 # via wipac-dev-tools -scipy==1.15.0 +scipy==1.15.1 # via icecube-skyreader (setup.py) six==1.17.0 # via python-dateutil @@ -87,5 +87,5 @@ tzdata==2024.2 # via pandas urllib3==2.3.0 # via requests -wipac-dev-tools==1.13.0 +wipac-dev-tools==1.15.0 # via icecube-skyreader (setup.py) diff --git a/dependencies.log b/dependencies.log index bd4aed62..57b73b6a 100644 --- a/dependencies.log +++ b/dependencies.log @@ -8,7 +8,7 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2025.1.6.0.33.42 +astropy-iers-data==0.2025.1.13.0.34.51 # via astropy certifi==2024.12.14 # via requests @@ -66,7 +66,7 @@ pyyaml==6.0.2 # via astropy requests==2.32.3 # via wipac-dev-tools -scipy==1.15.0 +scipy==1.15.1 # via icecube-skyreader (setup.py) six==1.17.0 # via python-dateutil @@ -76,5 +76,5 @@ tzdata==2024.2 # via pandas urllib3==2.3.0 # via requests -wipac-dev-tools==1.13.0 +wipac-dev-tools==1.15.0 # via icecube-skyreader (setup.py) From 837f3e1bdb933a7916939d89e28a3150b424d9fa Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Thu, 16 Jan 2025 10:47:33 +0100 Subject: [PATCH 14/47] flake8 --- skyreader/plot/plot.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 62c01bbd..b45ad245 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -21,7 +21,6 @@ from .plotting_tools import ( AstroMollweideAxes, - DecFormatter, format_fits_header, hp_ticklabels, plot_catalog @@ -102,8 +101,6 @@ def create_plot( grid_pix = healpy.ang2pix(max(nsides), np.pi/2. - DEC, RA) plotting_map = equatorial_map[grid_pix] - min_value = grid_value[0] # for probability map, this is actually - # the max_value min_dec = grid_dec[0] min_ra = grid_ra[0] From 466296196fefc5a121a9b645e76623b2bc1ed237 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 15:51:21 +0100 Subject: [PATCH 15/47] test if nans create problems --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index b45ad245..4d365bad 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -131,7 +131,7 @@ def create_plot( map_to_plot[plotting_map != 0.] = np.log10( plotting_map[plotting_map != 0.] ) - map_to_plot[plotting_map == 0.] = np.nan + #map_to_plot[plotting_map == 0.] = np.nan equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) From 1e2a46980d70de67aac12549b29141ffee673a33 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Tue, 21 Jan 2025 14:52:04 +0000 Subject: [PATCH 16/47] update dependencies*.log files(s) --- dependencies-examples.log | 4 ++-- dependencies-mypy.log | 4 ++-- dependencies-tests.log | 4 ++-- dependencies.log | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies-examples.log b/dependencies-examples.log index 031287b7..2e64d7d2 100644 --- a/dependencies-examples.log +++ b/dependencies-examples.log @@ -8,7 +8,7 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2025.1.13.0.34.51 +astropy-iers-data==0.2025.1.20.0.32.27 # via astropy cachetools==5.5.0 # via wipac-rest-tools @@ -40,7 +40,7 @@ meander==0.0.3 # via icecube-skyreader (setup.py) mhealpy==0.3.4 # via icecube-skyreader (setup.py) -numpy==2.2.1 +numpy==2.2.2 # via # astropy # contourpy diff --git a/dependencies-mypy.log b/dependencies-mypy.log index 9fa437d2..4764637e 100644 --- a/dependencies-mypy.log +++ b/dependencies-mypy.log @@ -8,7 +8,7 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2025.1.13.0.34.51 +astropy-iers-data==0.2025.1.20.0.32.27 # via astropy cachetools==5.5.0 # via wipac-rest-tools @@ -42,7 +42,7 @@ meander==0.0.3 # via icecube-skyreader (setup.py) mhealpy==0.3.4 # via icecube-skyreader (setup.py) -numpy==2.2.1 +numpy==2.2.2 # via # astropy # contourpy diff --git a/dependencies-tests.log b/dependencies-tests.log index a6aff038..b5acbe58 100644 --- a/dependencies-tests.log +++ b/dependencies-tests.log @@ -8,7 +8,7 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2025.1.13.0.34.51 +astropy-iers-data==0.2025.1.20.0.32.27 # via astropy certifi==2024.12.14 # via requests @@ -36,7 +36,7 @@ meander==0.0.3 # via icecube-skyreader (setup.py) mhealpy==0.3.4 # via icecube-skyreader (setup.py) -numpy==2.2.1 +numpy==2.2.2 # via # astropy # contourpy diff --git a/dependencies.log b/dependencies.log index 57b73b6a..61d96796 100644 --- a/dependencies.log +++ b/dependencies.log @@ -8,7 +8,7 @@ astropy==7.0.0 # via # healpy # icecube-skyreader (setup.py) -astropy-iers-data==0.2025.1.13.0.34.51 +astropy-iers-data==0.2025.1.20.0.32.27 # via astropy certifi==2024.12.14 # via requests @@ -34,7 +34,7 @@ meander==0.0.3 # via icecube-skyreader (setup.py) mhealpy==0.3.4 # via icecube-skyreader (setup.py) -numpy==2.2.1 +numpy==2.2.2 # via # astropy # contourpy From 815a0782784f67e629d28be57d62420d686704a3 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 15:58:46 +0100 Subject: [PATCH 17/47] debug create_plot --- skyreader/plot/plot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 4d365bad..b37710bd 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -131,7 +131,8 @@ def create_plot( map_to_plot[plotting_map != 0.] = np.log10( plotting_map[plotting_map != 0.] ) - #map_to_plot[plotting_map == 0.] = np.nan + print(np.min(map_to_plot), np.nanmin(map_to_plot)) + map_to_plot[plotting_map == 0.] = np.nan equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) From 417c1627aec8ebc2ebf861626c49270cc95ea919 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:01:00 +0100 Subject: [PATCH 18/47] debug create_plot --- skyreader/plot/plot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index b37710bd..2903790c 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -132,6 +132,7 @@ def create_plot( plotting_map[plotting_map != 0.] ) print(np.min(map_to_plot), np.nanmin(map_to_plot)) + print(np.min(equatorial_map), np.nanmin(equatorial_map)) map_to_plot[plotting_map == 0.] = np.nan equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) From 2237f79c23c6f459b6db9366ac71cbbde4dfae64 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:02:49 +0100 Subject: [PATCH 19/47] try fix --- skyreader/plot/plot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 2903790c..100dcf48 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -133,6 +133,7 @@ def create_plot( ) print(np.min(map_to_plot), np.nanmin(map_to_plot)) print(np.min(equatorial_map), np.nanmin(equatorial_map)) + equatorial_map[np.isnan(equatorial_map)] = 0. map_to_plot[plotting_map == 0.] = np.nan equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) From 5f9359d618aa8cd2fd3532cb134983bfc3520765 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:06:06 +0100 Subject: [PATCH 20/47] try fix --- skyreader/plot/plot.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 100dcf48..513aca92 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -132,8 +132,13 @@ def create_plot( plotting_map[plotting_map != 0.] ) print(np.min(map_to_plot), np.nanmin(map_to_plot)) + equatorial_map[ + np.logical_or( + np.isnan(equatorial_map), + equatorial_map == 0. + ) + ] = 0. print(np.min(equatorial_map), np.nanmin(equatorial_map)) - equatorial_map[np.isnan(equatorial_map)] = 0. map_to_plot[plotting_map == 0.] = np.nan equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) From 5561d4e3d65be26ab60c12cf81098b5b58d0e4a7 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:09:38 +0100 Subject: [PATCH 21/47] try fix --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 513aca92..22cf6448 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -137,7 +137,7 @@ def create_plot( np.isnan(equatorial_map), equatorial_map == 0. ) - ] = 0. + ] = np.nanmin(equatorial_map[equatorial_map > 0.]) print(np.min(equatorial_map), np.nanmin(equatorial_map)) map_to_plot[plotting_map == 0.] = np.nan equatorial_map = np.ma.masked_invalid(equatorial_map) From e03682bbf7c9a60349c838a77fba55226d772595 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:10:54 +0100 Subject: [PATCH 22/47] try fix --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 22cf6448..afa0b898 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -140,7 +140,7 @@ def create_plot( ] = np.nanmin(equatorial_map[equatorial_map > 0.]) print(np.min(equatorial_map), np.nanmin(equatorial_map)) map_to_plot[plotting_map == 0.] = np.nan - equatorial_map = np.ma.masked_invalid(equatorial_map) + # equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) LOGGER.info(f"Preparing plot: {plot_filename}...") From 7ef5ede1ad96c07e10342b8649cbe4ccbc055d6e Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:26:52 +0100 Subject: [PATCH 23/47] debug create_plot --- skyreader/plot/plot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index afa0b898..45045c21 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -140,7 +140,7 @@ def create_plot( ] = np.nanmin(equatorial_map[equatorial_map > 0.]) print(np.min(equatorial_map), np.nanmin(equatorial_map)) map_to_plot[plotting_map == 0.] = np.nan - # equatorial_map = np.ma.masked_invalid(equatorial_map) + equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) LOGGER.info(f"Preparing plot: {plot_filename}...") @@ -185,6 +185,7 @@ def create_plot( ra, dec, map_to_plot, levels=[level], colors=[color] ) cs_collections.append(contour_set.get_paths()[0]) + print(cs_collections) e, _ = contour_set.legend_elements() leg_element.append(e[0]) From 666004b938dff790ea041e5186338e4b19e29a7a Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:31:15 +0100 Subject: [PATCH 24/47] debug create_plot --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 45045c21..c9c01886 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -185,7 +185,7 @@ def create_plot( ra, dec, map_to_plot, levels=[level], colors=[color] ) cs_collections.append(contour_set.get_paths()[0]) - print(cs_collections) + print(level, cs_collections) e, _ = contour_set.legend_elements() leg_element.append(e[0]) From 772ff4ef906d96db036e73e3e637edce73de8900 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:35:03 +0100 Subject: [PATCH 25/47] try fix --- skyreader/plot/plot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index c9c01886..4c99872c 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -132,10 +132,10 @@ def create_plot( plotting_map[plotting_map != 0.] ) print(np.min(map_to_plot), np.nanmin(map_to_plot)) - equatorial_map[ + map_to_plot[ np.logical_or( - np.isnan(equatorial_map), - equatorial_map == 0. + np.isnan(map_to_plot), + map_to_plot == 0. ) ] = np.nanmin(equatorial_map[equatorial_map > 0.]) print(np.min(equatorial_map), np.nanmin(equatorial_map)) From d071544dfc07e9c2c45f1da63f64506443e97d42 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:38:19 +0100 Subject: [PATCH 26/47] try fix --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 4c99872c..158f4a86 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -137,7 +137,7 @@ def create_plot( np.isnan(map_to_plot), map_to_plot == 0. ) - ] = np.nanmin(equatorial_map[equatorial_map > 0.]) + ] = np.nanmin(map_to_plot[map_to_plot > 0.]) print(np.min(equatorial_map), np.nanmin(equatorial_map)) map_to_plot[plotting_map == 0.] = np.nan equatorial_map = np.ma.masked_invalid(equatorial_map) From 057aa049bc5f5b9a72d9d97dff2b7ca19a69f5b4 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:39:45 +0100 Subject: [PATCH 27/47] try fix --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 158f4a86..1c303b2c 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -137,7 +137,7 @@ def create_plot( np.isnan(map_to_plot), map_to_plot == 0. ) - ] = np.nanmin(map_to_plot[map_to_plot > 0.]) + ] = np.nanmin(map_to_plot) print(np.min(equatorial_map), np.nanmin(equatorial_map)) map_to_plot[plotting_map == 0.] = np.nan equatorial_map = np.ma.masked_invalid(equatorial_map) From d1df9427944de6b613581efee070379c20f537dc Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:41:46 +0100 Subject: [PATCH 28/47] try fix --- skyreader/plot/plot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 1c303b2c..28b8a252 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -132,14 +132,14 @@ def create_plot( plotting_map[plotting_map != 0.] ) print(np.min(map_to_plot), np.nanmin(map_to_plot)) + print(np.min(equatorial_map), np.nanmin(equatorial_map)) + map_to_plot[plotting_map == 0.] = np.nan map_to_plot[ np.logical_or( np.isnan(map_to_plot), map_to_plot == 0. ) ] = np.nanmin(map_to_plot) - print(np.min(equatorial_map), np.nanmin(equatorial_map)) - map_to_plot[plotting_map == 0.] = np.nan equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) From 9067e4a23c0aa657ddcf48a8ff7f7191d3c49eda Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:45:14 +0100 Subject: [PATCH 29/47] try debugging --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 28b8a252..0c4679b4 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -133,7 +133,7 @@ def create_plot( ) print(np.min(map_to_plot), np.nanmin(map_to_plot)) print(np.min(equatorial_map), np.nanmin(equatorial_map)) - map_to_plot[plotting_map == 0.] = np.nan + # map_to_plot[plotting_map == 0.] = np.nan map_to_plot[ np.logical_or( np.isnan(map_to_plot), From 36bdd5c826e1b1019aad2d223fe8f71b0df6864f Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Tue, 21 Jan 2025 15:45:54 +0000 Subject: [PATCH 30/47] update dependencies*.log files(s) --- dependencies-examples.log | 2 +- dependencies-mypy.log | 2 +- dependencies-tests.log | 2 +- dependencies.log | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies-examples.log b/dependencies-examples.log index 2e64d7d2..3397101e 100644 --- a/dependencies-examples.log +++ b/dependencies-examples.log @@ -24,7 +24,7 @@ cryptography==44.0.0 # via pyjwt cycler==0.12.1 # via matplotlib -fonttools==4.55.3 +fonttools==4.55.4 # via matplotlib healpy==1.18.0 # via diff --git a/dependencies-mypy.log b/dependencies-mypy.log index 4764637e..bb288f86 100644 --- a/dependencies-mypy.log +++ b/dependencies-mypy.log @@ -24,7 +24,7 @@ cryptography==44.0.0 # via pyjwt cycler==0.12.1 # via matplotlib -fonttools==4.55.3 +fonttools==4.55.4 # via matplotlib healpy==1.18.0 # via diff --git a/dependencies-tests.log b/dependencies-tests.log index b5acbe58..af62065c 100644 --- a/dependencies-tests.log +++ b/dependencies-tests.log @@ -18,7 +18,7 @@ contourpy==1.3.1 # via matplotlib cycler==0.12.1 # via matplotlib -fonttools==4.55.3 +fonttools==4.55.4 # via matplotlib healpy==1.18.0 # via diff --git a/dependencies.log b/dependencies.log index 61d96796..54a11d61 100644 --- a/dependencies.log +++ b/dependencies.log @@ -18,7 +18,7 @@ contourpy==1.3.1 # via matplotlib cycler==0.12.1 # via matplotlib -fonttools==4.55.3 +fonttools==4.55.4 # via matplotlib healpy==1.18.0 # via From cc90b0f5803660f0382373610937998e10a72d98 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:47:27 +0100 Subject: [PATCH 31/47] debug create_plot --- skyreader/plot/plot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 0c4679b4..ff7ce21c 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -133,7 +133,7 @@ def create_plot( ) print(np.min(map_to_plot), np.nanmin(map_to_plot)) print(np.min(equatorial_map), np.nanmin(equatorial_map)) - # map_to_plot[plotting_map == 0.] = np.nan + map_to_plot[plotting_map == 0.] = np.nan map_to_plot[ np.logical_or( np.isnan(map_to_plot), @@ -184,6 +184,7 @@ def create_plot( contour_set = ax.contour( ra, dec, map_to_plot, levels=[level], colors=[color] ) + print(contour_set) cs_collections.append(contour_set.get_paths()[0]) print(level, cs_collections) e, _ = contour_set.legend_elements() From 0b3406fcc125417365a57bd61953e925c86e87e8 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:51:24 +0100 Subject: [PATCH 32/47] debug create_plot --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index ff7ce21c..23dfc2cb 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -184,7 +184,7 @@ def create_plot( contour_set = ax.contour( ra, dec, map_to_plot, levels=[level], colors=[color] ) - print(contour_set) + print(contour_set.get_paths()) cs_collections.append(contour_set.get_paths()[0]) print(level, cs_collections) e, _ = contour_set.legend_elements() From efc07f2f005741952724664c5a40f3386130d0e1 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:55:11 +0100 Subject: [PATCH 33/47] try fix --- skyreader/plot/plot.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 23dfc2cb..a9edd7bb 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -133,13 +133,8 @@ def create_plot( ) print(np.min(map_to_plot), np.nanmin(map_to_plot)) print(np.min(equatorial_map), np.nanmin(equatorial_map)) - map_to_plot[plotting_map == 0.] = np.nan - map_to_plot[ - np.logical_or( - np.isnan(map_to_plot), - map_to_plot == 0. - ) - ] = np.nanmin(map_to_plot) + # map_to_plot[plotting_map == 0.] = np.nan + map_to_plot[np.isnan(map_to_plot)] = np.nanmin(map_to_plot) equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) From 8c9ba4f0e87506acd225e2bdbd307727a51f0ec2 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 16:58:53 +0100 Subject: [PATCH 34/47] debug create_plot --- skyreader/plot/plot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index a9edd7bb..43ecad58 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -131,6 +131,7 @@ def create_plot( map_to_plot[plotting_map != 0.] = np.log10( plotting_map[plotting_map != 0.] ) + print(f"max equatorial map: {np.nanmax(equatorial_map)}") print(np.min(map_to_plot), np.nanmin(map_to_plot)) print(np.min(equatorial_map), np.nanmin(equatorial_map)) # map_to_plot[plotting_map == 0.] = np.nan From 6ba75c2a968ba21c118d71d936b7052d1e18eb2a Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 17:08:28 +0100 Subject: [PATCH 35/47] try fix --- skyreader/plot/plot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 43ecad58..c6956f5a 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -134,10 +134,10 @@ def create_plot( print(f"max equatorial map: {np.nanmax(equatorial_map)}") print(np.min(map_to_plot), np.nanmin(map_to_plot)) print(np.min(equatorial_map), np.nanmin(equatorial_map)) - # map_to_plot[plotting_map == 0.] = np.nan + map_to_plot[plotting_map == 0.] = np.nan map_to_plot[np.isnan(map_to_plot)] = np.nanmin(map_to_plot) equatorial_map = np.ma.masked_invalid(equatorial_map) - map_to_plot = np.ma.masked_invalid(map_to_plot) + # map_to_plot = np.ma.masked_invalid(map_to_plot) LOGGER.info(f"Preparing plot: {plot_filename}...") From 1bfc2e676ec01ca3c9e0fb82dd4d24a347da9ebf Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 17:24:18 +0100 Subject: [PATCH 36/47] debug create_plot --- skyreader/plot/plot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index c6956f5a..70e05ef9 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -132,12 +132,12 @@ def create_plot( plotting_map[plotting_map != 0.] ) print(f"max equatorial map: {np.nanmax(equatorial_map)}") - print(np.min(map_to_plot), np.nanmin(map_to_plot)) + print(np.min(map_to_plot), np.nanmin(map_to_plot), np.nanmax(map_to_plot)) print(np.min(equatorial_map), np.nanmin(equatorial_map)) map_to_plot[plotting_map == 0.] = np.nan map_to_plot[np.isnan(map_to_plot)] = np.nanmin(map_to_plot) equatorial_map = np.ma.masked_invalid(equatorial_map) - # map_to_plot = np.ma.masked_invalid(map_to_plot) + map_to_plot = np.ma.masked_invalid(map_to_plot) LOGGER.info(f"Preparing plot: {plot_filename}...") From e7098624dbdb0060b8e1fbf50335dde6d3062316 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 17:31:25 +0100 Subject: [PATCH 37/47] try increasing dpi for create_plot --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 70e05ef9..9cd8a109 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -41,7 +41,7 @@ class SkyScanPlotter: PLOT_SIZE_Y_IN: float = 3.85 PLOT_SIZE_X_IN: float = 6 - PLOT_DPI_STANDARD = 150 + PLOT_DPI_STANDARD = 300 PLOT_DPI_ZOOMED = 1200 PLOT_COLORMAP = matplotlib.colormaps['plasma_r'] From 8c524bd6c8aa0e87f95aa3715264b66bbc5bfdcd Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 17:39:43 +0100 Subject: [PATCH 38/47] remove debugging lines and past fixing attempts --- skyreader/plot/plot.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 9cd8a109..d83ab4ee 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -131,11 +131,7 @@ def create_plot( map_to_plot[plotting_map != 0.] = np.log10( plotting_map[plotting_map != 0.] ) - print(f"max equatorial map: {np.nanmax(equatorial_map)}") - print(np.min(map_to_plot), np.nanmin(map_to_plot), np.nanmax(map_to_plot)) - print(np.min(equatorial_map), np.nanmin(equatorial_map)) map_to_plot[plotting_map == 0.] = np.nan - map_to_plot[np.isnan(map_to_plot)] = np.nanmin(map_to_plot) equatorial_map = np.ma.masked_invalid(equatorial_map) map_to_plot = np.ma.masked_invalid(map_to_plot) @@ -180,9 +176,7 @@ def create_plot( contour_set = ax.contour( ra, dec, map_to_plot, levels=[level], colors=[color] ) - print(contour_set.get_paths()) cs_collections.append(contour_set.get_paths()[0]) - print(level, cs_collections) e, _ = contour_set.legend_elements() leg_element.append(e[0]) From 9bfc99b367a11f6e584ae5c2d83a8eaf5ee04b27 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 17:49:05 +0100 Subject: [PATCH 39/47] return to probability per pixel for flattened maps --- skyreader/plot/plot.py | 11 ++++------- skyreader/utils/handle_map_data.py | 10 +++++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index d83ab4ee..c3c7dad0 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -691,7 +691,7 @@ def bounding_box(ra, dec, theta, phi): plt.legend(fontsize=6, loc="lower left") # save flattened map - equatorial_map, column_names, column_units = prepare_flattened_map( + equatorial_map, column_names = prepare_flattened_map( equatorial_map, llh_map ) if llh_map: @@ -701,17 +701,14 @@ def bounding_box(ra, dec, theta, phi): filename_main = f"{unique_id}.skymap_nside_{mmap_nside}_{type_map}" healpy.write_map( self.output_dir / f"{filename_main}.fits.gz", - equatorial_map / healpy.nside2pixarea( - max_nside, degrees=False, - ), + equatorial_map, coord='C', column_names=column_names, - column_units=column_units, extra_header=fits_header, overwrite=True ) - multiorder_map = prepare_multiorder_map( - grid_value, uniq_array, llh_map, + multiorder_map, column_names = prepare_multiorder_map( + grid_value, uniq_array, llh_map, column_names ) multiorder_map.write_map( self.output_dir / f"{filename_main}.multiorder.fits.gz", diff --git a/skyreader/utils/handle_map_data.py b/skyreader/utils/handle_map_data.py index 3f72dc22..8284f623 100644 --- a/skyreader/utils/handle_map_data.py +++ b/skyreader/utils/handle_map_data.py @@ -369,21 +369,20 @@ def prepare_flattened_map( """ if llh_map: column_names = ['2DLLH'] - column_units = None else: # avoid excessively heavy data format for the flattened map equatorial_map[equatorial_map < 1e-16] = np.nanmean( equatorial_map[equatorial_map < 1e-16] ) - column_names = ["PROBDENSITY"] - column_units = ["sr-1"] - return equatorial_map, column_names, column_units + column_names = ["PROBABILITY"] + return equatorial_map, column_names def prepare_multiorder_map( grid_value: np.ndarray, uniq_array: np.ndarray, llh_map: bool, + column_names: List[str] ) -> mhealpy.HealpixMap: """ Create the mhealpix map that needs to be saved keeping @@ -406,4 +405,5 @@ def prepare_multiorder_map( uniq_array, unit="sr-1" ) - return multiorder_map + column_names = ["PROBDENSITY"] + return multiorder_map, column_names From 5689c305ba81e85bce4c2d5a44c1756f17116831 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Tue, 21 Jan 2025 17:52:40 +0100 Subject: [PATCH 40/47] correct output types --- skyreader/utils/handle_map_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skyreader/utils/handle_map_data.py b/skyreader/utils/handle_map_data.py index 8284f623..8d77a155 100644 --- a/skyreader/utils/handle_map_data.py +++ b/skyreader/utils/handle_map_data.py @@ -362,7 +362,7 @@ def clean_data_multiorder_map( def prepare_flattened_map( equatorial_map: np.ndarray, llh_map: bool, -) -> Tuple[np.ndarray, List[str], Union[List[str], None]]: +) -> Tuple[np.ndarray, List[str]]: """ Create the healpix map that needs to be saved keeping into account if it is a probability or a llh map @@ -383,7 +383,7 @@ def prepare_multiorder_map( uniq_array: np.ndarray, llh_map: bool, column_names: List[str] -) -> mhealpy.HealpixMap: +) -> Tuple[mhealpy.HealpixMap, List[str]]: """ Create the mhealpix map that needs to be saved keeping into account if it is a probability or a llh map From 33ea36fedd73887fb3125ed8ed8ea05a6eebdd40 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Thu, 23 Jan 2025 15:11:33 +0100 Subject: [PATCH 41/47] debug saving of flattened llh maps --- skyreader/plot/plot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index c3c7dad0..c1028226 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -699,6 +699,7 @@ def bounding_box(ra, dec, theta, phi): else: type_map = "probability" filename_main = f"{unique_id}.skymap_nside_{mmap_nside}_{type_map}" + print(equatorial_map) healpy.write_map( self.output_dir / f"{filename_main}.fits.gz", equatorial_map, From 0ea426a9e1a4c24b3075028c110eea983ccc765f Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 23 Jan 2025 14:12:19 +0000 Subject: [PATCH 42/47] update dependencies*.log files(s) --- dependencies-examples.log | 6 +++--- dependencies-mypy.log | 6 +++--- dependencies-tests.log | 4 ++-- dependencies.log | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dependencies-examples.log b/dependencies-examples.log index 3397101e..3263f0f5 100644 --- a/dependencies-examples.log +++ b/dependencies-examples.log @@ -10,7 +10,7 @@ astropy==7.0.0 # icecube-skyreader (setup.py) astropy-iers-data==0.2025.1.20.0.32.27 # via astropy -cachetools==5.5.0 +cachetools==5.5.1 # via wipac-rest-tools certifi==2024.12.14 # via requests @@ -24,7 +24,7 @@ cryptography==44.0.0 # via pyjwt cycler==0.12.1 # via matplotlib -fonttools==4.55.4 +fonttools==4.55.5 # via matplotlib healpy==1.18.0 # via @@ -91,7 +91,7 @@ tornado==6.4.2 # via wipac-rest-tools typing-extensions==4.12.2 # via wipac-dev-tools -tzdata==2024.2 +tzdata==2025.1 # via pandas urllib3==2.3.0 # via diff --git a/dependencies-mypy.log b/dependencies-mypy.log index bb288f86..d1f7970d 100644 --- a/dependencies-mypy.log +++ b/dependencies-mypy.log @@ -10,7 +10,7 @@ astropy==7.0.0 # icecube-skyreader (setup.py) astropy-iers-data==0.2025.1.20.0.32.27 # via astropy -cachetools==5.5.0 +cachetools==5.5.1 # via wipac-rest-tools certifi==2024.12.14 # via requests @@ -24,7 +24,7 @@ cryptography==44.0.0 # via pyjwt cycler==0.12.1 # via matplotlib -fonttools==4.55.4 +fonttools==4.55.5 # via matplotlib healpy==1.18.0 # via @@ -102,7 +102,7 @@ tornado==6.4.2 # via wipac-rest-tools typing-extensions==4.12.2 # via wipac-dev-tools -tzdata==2024.2 +tzdata==2025.1 # via pandas urllib3==2.3.0 # via diff --git a/dependencies-tests.log b/dependencies-tests.log index af62065c..38dad7f3 100644 --- a/dependencies-tests.log +++ b/dependencies-tests.log @@ -18,7 +18,7 @@ contourpy==1.3.1 # via matplotlib cycler==0.12.1 # via matplotlib -fonttools==4.55.4 +fonttools==4.55.5 # via matplotlib healpy==1.18.0 # via @@ -83,7 +83,7 @@ six==1.17.0 # via python-dateutil typing-extensions==4.12.2 # via wipac-dev-tools -tzdata==2024.2 +tzdata==2025.1 # via pandas urllib3==2.3.0 # via requests diff --git a/dependencies.log b/dependencies.log index 54a11d61..dc158651 100644 --- a/dependencies.log +++ b/dependencies.log @@ -18,7 +18,7 @@ contourpy==1.3.1 # via matplotlib cycler==0.12.1 # via matplotlib -fonttools==4.55.4 +fonttools==4.55.5 # via matplotlib healpy==1.18.0 # via @@ -72,7 +72,7 @@ six==1.17.0 # via python-dateutil typing-extensions==4.12.2 # via wipac-dev-tools -tzdata==2024.2 +tzdata==2025.1 # via pandas urllib3==2.3.0 # via requests From 2fefae9788e52c61d9186e7381c8c284d6652f92 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Thu, 23 Jan 2025 15:13:24 +0100 Subject: [PATCH 43/47] try specifying the need to save float32 --- skyreader/plot/plot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index c1028226..a8435ec9 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -706,7 +706,8 @@ def bounding_box(ra, dec, theta, phi): coord='C', column_names=column_names, extra_header=fits_header, - overwrite=True + overwrite=True, + dtype='float32' ) multiorder_map, column_names = prepare_multiorder_map( grid_value, uniq_array, llh_map, column_names From baf4c11b3760c1452374a940de967caac25c6157 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Thu, 23 Jan 2025 15:19:20 +0100 Subject: [PATCH 44/47] try removing float32 specification --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index a8435ec9..6fb53432 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -707,7 +707,7 @@ def bounding_box(ra, dec, theta, phi): column_names=column_names, extra_header=fits_header, overwrite=True, - dtype='float32' + #dtype='float32' ) multiorder_map, column_names = prepare_multiorder_map( grid_value, uniq_array, llh_map, column_names From a4ac440c268cdc766a851edb170c5a745e617673 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Thu, 23 Jan 2025 15:23:34 +0100 Subject: [PATCH 45/47] undo all changes --- skyreader/plot/plot.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 6fb53432..46b9886f 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -699,7 +699,6 @@ def bounding_box(ra, dec, theta, phi): else: type_map = "probability" filename_main = f"{unique_id}.skymap_nside_{mmap_nside}_{type_map}" - print(equatorial_map) healpy.write_map( self.output_dir / f"{filename_main}.fits.gz", equatorial_map, @@ -707,7 +706,6 @@ def bounding_box(ra, dec, theta, phi): column_names=column_names, extra_header=fits_header, overwrite=True, - #dtype='float32' ) multiorder_map, column_names = prepare_multiorder_map( grid_value, uniq_array, llh_map, column_names From 7d1a72639aa01b05029c6b8e87416e21f2b6ffc8 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Thu, 23 Jan 2025 17:33:59 +0100 Subject: [PATCH 46/47] flattened map as in lvk --- skyreader/plot/plot.py | 1 + skyreader/utils/handle_map_data.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index 46b9886f..a6ee62d0 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -704,6 +704,7 @@ def bounding_box(ra, dec, theta, phi): equatorial_map, coord='C', column_names=column_names, + column_units=["pix-1"] extra_header=fits_header, overwrite=True, ) diff --git a/skyreader/utils/handle_map_data.py b/skyreader/utils/handle_map_data.py index 8d77a155..2e9ddcf8 100644 --- a/skyreader/utils/handle_map_data.py +++ b/skyreader/utils/handle_map_data.py @@ -374,7 +374,7 @@ def prepare_flattened_map( equatorial_map[equatorial_map < 1e-16] = np.nanmean( equatorial_map[equatorial_map < 1e-16] ) - column_names = ["PROBABILITY"] + column_names = ["PROB"] return equatorial_map, column_names From 9e492bd58c80d22e2edf3632adca4a3c5b81b197 Mon Sep 17 00:00:00 2001 From: G-Sommani Date: Thu, 23 Jan 2025 17:34:47 +0100 Subject: [PATCH 47/47] typo --- skyreader/plot/plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skyreader/plot/plot.py b/skyreader/plot/plot.py index a6ee62d0..3b630a50 100644 --- a/skyreader/plot/plot.py +++ b/skyreader/plot/plot.py @@ -704,7 +704,7 @@ def bounding_box(ra, dec, theta, phi): equatorial_map, coord='C', column_names=column_names, - column_units=["pix-1"] + column_units=["pix-1"], extra_header=fits_header, overwrite=True, )