Merge pull request #190 from desy-multimessenger/skymap_loader

Pushed ingesting skymap functionality to dedicated class
desy-multimessenger · Nov 30, 2022 · 878a84d · 878a84d
2 parents b608177 + 6b3c689
commit 878a84d
Show file tree

Hide file tree

Showing 8 changed files with 484 additions and 408 deletions.
diff --git a/notebooks/run_skymap_scan.ipynb b/notebooks/run_skymap_scan.ipynb
@@ -4,7 +4,23 @@
    "cell_type": "code",
    "execution_count": 1,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "\n",
+      "WARNING: version mismatch between CFITSIO header (v40100) and linked library (v40200).\n",
+      "\n",
+      "\n",
+      "WARNING: version mismatch between CFITSIO header (v40100) and linked library (v40200).\n",
+      "\n",
+      "\n",
+      "WARNING: version mismatch between CFITSIO header (v40100) and linked library (v40200).\n",
+      "\n"
+     ]
+    }
+   ],
    "source": [
     "import logging\n",
     "from nuztf.skymap_scanner import SkymapScanner"
@@ -49,20 +65,20 @@
     "n_days = 3\n",
     "\n",
     "# skymap_file = \"IGWN-GWTC3p0-v1-GW200210_092254_PEDataRelease_cosmo_reweight_C01_Mixed.fits\"\n",
-    "skymap_file=\"GRB220617A_IPN_map_hpx2.fits\"\n",
-    "skymap_file=\"glg_healpix_all_bn220617772.fits\""
+    "# skymap_file=\"GRB220617A_IPN_map_hpx2.fit\"\n",
+    "skymap_file=\"glg_healpix_all_bn220617772.fit\""
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "INFO:nuztf.skymap_scanner:Reading file: /Users/robertstein/Data/ZTF/skymaps/glg_healpix_all_bn220617772.fits\n",
+      "INFO:nuztf.skymap_scanner:Reading file: /Users/simeon/ZTFDATA/skymaps/glg_healpix_all_bn220617772.fit\n",
       "INFO:nuztf.skymap_scanner:Flattening skymap\n",
       "INFO:nuztf.skymap_scanner:Summed probability is 100.0%\n",
       "INFO:nuztf.skymap_scanner:Event time: 2022-06-17T18:29:00.000\n",
@@ -72,12 +88,12 @@
       "INFO:nuztf.skymap_scanner:Threshold found! \n",
       " To reach 95.00% of probability, pixels with probability greater than 6.560151090268943e-05 are included.\n",
       "INFO:nuztf.skymap_scanner:Checking which pixels are within the contour:\n",
-      "100%|██████████████████████████████| 196608/196608 [00:00<00:00, 2320650.07it/s]\n",
+      "100%|███████████████████████████████████████████| 196608/196608 [00:00<00:00, 3658372.39it/s]\n",
       "INFO:nuztf.skymap_scanner:Total pixel area: 422.7941737751253 degrees\n",
       "INFO:nuztf.base_scanner:AMPEL run config:\n",
       "INFO:nuztf.base_scanner:{'min_ndet': 1, 'min_tspan': -1, 'max_tspan': 365, 'min_rb': 0.3, 'max_fwhm': 5.5, 'max_elong': 1.4, 'max_magdiff': 1.0, 'max_nbad': 2, 'min_sso_dist': 20, 'min_gal_lat': 0.0, 'gaia_rs': 10.0, 'gaia_pm_signif': 3, 'gaia_plx_signif': 3, 'gaia_veto_gmag_min': 9, 'gaia_veto_gmag_max': 20, 'gaia_excessnoise_sig_max': 999, 'ps1_sgveto_rad': 1.0, 'ps1_sgveto_th': 0.8, 'ps1_confusion_rad': 3.0, 'ps1_confusion_sg_tol': 0.1}\n",
       "\n",
-      "2022-06-18 22:36:06 DecentFilter:72 INFO\n",
+      "2022-11-30 12:49:25 DecentFilter:72 INFO\n",
       " Using min_ndet=1\n",
       " Using min_tspan=-1.0\n",
       " Using max_tspan=365.0\n",
@@ -101,7 +117,9 @@
       " Using gaia_veto_gmag_min=9.0\n",
       " Using gaia_veto_gmag_max=20.0\n",
       " Using gaia_excessnoise_sig_max=999.0\n",
-      "100%|█████████████████████████████████████| 532/532 [00:00<00:00, 107194.93it/s]\n",
+      "100%|██████████████████████████████████████████████████| 532/532 [00:00<00:00, 158568.06it/s]\n",
+      "WARNING: TimeDeltaMissingUnitWarning: Numerical value without unit or explicit format passed to TimeDelta, assuming days [astropy.time.core]\n",
+      "WARNING:astroquery:TimeDeltaMissingUnitWarning: Numerical value without unit or explicit format passed to TimeDelta, assuming days\n",
       "INFO:nuztf.base_scanner:Time-range is 2022-06-17T18:29:00.000 -- 2022-06-20T18:29:00.000\n"
      ]
     }
@@ -1518,9 +1536,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "nuztf_env",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "nuztf_env"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -1532,7 +1550,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.12"
+   "version": "3.10.8"
   }
  },
  "nbformat": 4,

diff --git a/nuztf/config/gw_run_config.yaml b/nuztf/config/gw_run_config.yaml
@@ -0,0 +1,20 @@
+min_ndet: 1 # Default:2
+min_tspan: -1  # Default 0, but that rejects everything!
+max_tspan: 365
+min_rb: 0.3
+max_fwhm: 5.5
+max_elong: 1.4
+max_magdiff: 1.0
+max_nbad: 2
+min_sso_dist: 20
+min_gal_lat: 0.0  # Default: 14
+gaia_rs: 10.0
+gaia_pm_signif: 3
+gaia_plx_signif: 3
+gaia_veto_gmag_min: 9
+gaia_veto_gmag_max: 20
+gaia_excessnoise_sig_max: 999
+ps1_sgveto_rad: 1.0
+ps1_sgveto_th: 0.8
+ps1_confusion_rad: 3.0
+ps1_confusion_sg_tol: 0.1
diff --git a/nuztf/config/nu_run_config.yaml b/nuztf/config/nu_run_config.yaml
@@ -0,0 +1,20 @@
+min_ndet: 1  # Default:2
+min_tspan: -1  # Default 0, but that rejects everything!
+max_tspan: 365
+min_rb: 0.0
+max_fwhm: 5.5
+max_elong: 1.4
+max_magdiff: 1.0
+max_nbad: 2
+min_sso_dist: 20
+min_gal_lat: -1.0  # Default: 14
+gaia_rs: 20
+gaia_pm_signif: 3
+gaia_plx_signif: 3
+gaia_veto_gmag_min: 9
+gaia_veto_gmag_max: 20
+gaia_excessnoise_sig_max: 999
+ps1_sgveto_rad: 1
+ps1_sgveto_th: 0.8
+ps1_confusion_rad: 3
+ps1_confusion_sg_tol: 0.1
diff --git a/nuztf/neutrino_scanner.py b/nuztf/neutrino_scanner.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 # coding: utf-8
 
-import os
-import logging
+import os, logging, yaml
 
 from astropy.time import Time
 import healpy as hp
@@ -20,29 +19,6 @@
 if not os.path.exists(nu_candidate_output_dir):
     os.makedirs(nu_candidate_output_dir)
 
-NU_RUN_CONFIG = {
-    "min_ndet": 1,  # Default:2
-    "min_tspan": -1,  # Default 0, but that rejects everything!
-    "max_tspan": 365,
-    "min_rb": 0.0,
-    "max_fwhm": 5.5,
-    "max_elong": 1.4,
-    "max_magdiff": 1.0,
-    "max_nbad": 2,
-    "min_sso_dist": 20,
-    "min_gal_lat": -1.0,  # Default: 14
-    "gaia_rs": 20,
-    "gaia_pm_signif": 3,
-    "gaia_plx_signif": 3,
-    "gaia_veto_gmag_min": 9,
-    "gaia_veto_gmag_max": 20,
-    "gaia_excessnoise_sig_max": 999,
-    "ps1_sgveto_rad": 1,
-    "ps1_sgveto_th": 0.8,
-    "ps1_confusion_rad": 3,
-    "ps1_confusion_sg_tol": 0.1,
-}
-
 
 class NeutrinoScanner(BaseScanner):
 
@@ -55,13 +31,19 @@ def __init__(
         gcn_no: int = None,
         cone_nside: int = 128,
         t_precursor: float = None,
-        logger=None,
+        config: dict = None,
     ):
 
-        if logger is None:
-            self.logger = logging.getLogger(__name__)
+        self.logger = logging.getLogger(__name__)
+
+        if config:
+            self.config = config
         else:
-            self.logger = logger
+            config_path = os.path.join(
+                os.path.dirname(__file__), "config", "nu_run_config.yaml"
+            )
+            with open(config_path) as f:
+                self.config = yaml.safe_load(f)
 
         self.prob_threshold = 0.9
 
@@ -112,8 +94,7 @@ def __init__(
         BaseScanner.__init__(
             self,
             t_min=nu_time,
-            run_config=NU_RUN_CONFIG,
-            logger=logger,
+            run_config=self.config,
             cone_nside=cone_nside,
         )
         self.prob_threshold = 0.9
@@ -238,7 +219,7 @@ def in_contour(self, ra_deg, dec_deg):
 
         return np.logical_and(in_ra, in_dec)
 
-    def unpack_skymap(self):
+    def unpack_skymap(self, skymap=None):
         """ """
         nside = 1024
         map_coords = []