Import Git History From Scanner & Trim [major]

Author: ric-evans

skyreader/event_metadata.py

@@ -1,4 +1,4 @@
-"""Tools for functions/data related to icecube events."""
+"""Tools for functions/data related to IceCube events."""
 
 import dataclasses as dc
 

skyreader/plot/plotting_tools.py

@@ -1,6 +1,7 @@
 """Plotting tools."""
 
 # fmt: off
+# flake8: noqa
 
 import astropy.io.fits as pyfits  # type: ignore[import]
 import healpy  # type: ignore[import]
@@ -17,12 +18,12 @@
 matplotlib.use('agg')
 
 def format_fits_header(event_id_tuple, mjd, ra, dec, uncertainty):
-    '''Prepare some of the relevant event information for 
-    a fits file header'''
+    """Prepare some of the relevant event information for a fits file
+    header."""
     run_id, event_id, event_type = event_id_tuple
 
     header = [
-        ('RUNID', run_id), 
+        ('RUNID', run_id),
         ('EVENTID', event_id),
         ('SENDER', 'IceCube Collaboration'),
         ('EventMJD', mjd),
@@ -63,7 +64,7 @@ def hp_ticklabels(zoom=False, lonra=None, latra=None, rot=None, bounds=None):
         min_lon = np.round(lon_offset/2.)*2. - 2
         max_lon = lon_offset+lonra[1]-lonra[0] + 2
         lons = np.arange(min_lon, max_lon, 2)
-        
+
         min_lat = np.round(lat_offset/2.)*2. - 2
         max_lat = lat_offset+latra[1]-latra[0] + 2
         lats = np.arange(min_lat, max_lat, 2)
@@ -109,7 +110,7 @@ def hp_ticklabels(zoom=False, lonra=None, latra=None, rot=None, bounds=None):
 def plot_catalog(master_map, cmap, lower_ra, upper_ra, lower_dec, upper_dec,
         cmap_min=0., cmap_max=250.):
     """"Plots the 4FGL catalog in a color that contrasts with the background
-    healpix map"""
+    healpix map."""
     hdu = pyfits.open('/cvmfs/icecube.opensciencegrid.org/users/steinrob/reference_catalogues/Fermi_4FGL_v18.fit')
     fgl = hdu[1]
     pe = [path_effects.Stroke(linewidth=0.5, foreground=cmap(0.0)),

skyreader/result.py

@@ -3,8 +3,9 @@
 # fmt: off
 # pylint: skip-file
 # mypy: ignore-errors
+# flake8: noqa
+
 
-import dataclasses as dc
 import io
 import itertools as it
 import json
@@ -23,14 +24,11 @@
 from matplotlib import pyplot as plt
 from matplotlib import text
 
-from .event_tools import EventMetadata
-from .pixel_classes import NSidesDict, RecoPixelFinal
+from .event_metadata import EventMetadata
 
 ###############################################################################
 # DATA TYPES
 
-PixelTuple = Tuple[int, float, float, float]
-
 
 class PyDictNSidePixels(TypedDict):
     columns: List[str]
@@ -349,53 +347,6 @@ def get_filename(
             filename = output_dir / Path(filename)
         return filename
 
-    """
-    nsides-dict input
-    """
-
-    @classmethod
-    def from_nsides_dict(
-        cls,
-        nsides_dict: NSidesDict,
-        event_metadata: Optional[EventMetadata] = None
-    ) -> "SkyScanResult":
-        """Factory method for nsides_dict."""
-        logger = logging.getLogger(__name__)
-
-        event_metadata_dict = {}
-        if event_metadata:
-            event_metadata_dict = dc.asdict(event_metadata)
-
-        result = dict()
-        for nside, pixel_dict in nsides_dict.items():
-            _dtype = np.dtype(cls.PIXEL_TYPE, metadata=dict(nside=nside, **event_metadata_dict))
-            nside_pixel_values = np.zeros(len(pixel_dict), dtype=_dtype)
-            logger.debug(f"nside {nside} has {len(pixel_dict)} pixels / {12 * nside**2} total.")
-
-            for i, (pixel_id, pixfin) in enumerate(sorted(pixel_dict.items())):
-                nside_pixel_values[i] = cls._pixelreco_to_tuple(pixfin, nside, pixel_id)
-
-            result[cls.format_nside(nside)] = nside_pixel_values
-
-        return cls(result)
-
-    @staticmethod
-    def _pixelreco_to_tuple(pixfin: RecoPixelFinal, nside: int, pixel_id: int) -> PixelTuple:
-        if (
-            not isinstance(pixfin, RecoPixelFinal)
-            or nside != pixfin.nside
-            or pixel_id != pixfin.pixel_id
-        ):
-            msg = f"Invalid {RecoPixelFinal} for {(nside,pixel_id)}: {pixfin}"
-            logging.error(msg)
-            raise ValueError(msg)
-        return (
-            pixfin.pixel_id,  # index
-            pixfin.llh,  # llh
-            pixfin.reco_losses_inside,  # E_in
-            pixfin.reco_losses_total,  # E_tot
-        )
-
     """
     NPZ input / output
     """