replace deprecated calls

Author: scivision

src/histutils/camclass.py

@@ -2,7 +2,7 @@
 import logging
 import numpy as np
 from numpy.testing import assert_allclose
-from datetime import datetime
+from datetime import datetime, timezone
 from scipy.signal import savgol_filter
 from numpy.random import poisson
 import h5py
@@ -19,8 +19,9 @@
 from .plots import plotnear_rc, plotlsq_rc
 
 
-class Cam:  # use this like an advanced version of Matlab struct
+class Cam:
     """
+    use this like an advanced version of Matlab struct
     simple mode via try except attributeerror
     """
 
@@ -279,8 +280,8 @@ def __init__(
 
             logging.info(
                 f"Camera {self.name} start/stop UTC:"
-                f"{datetime.utcfromtimestamp(self.ut1unix[0])} / "
-                f"{datetime.utcfromtimestamp(self.ut1unix[-1])}  "
+                f"{datetime.fromtimestamp(self.ut1unix[0], timezone.utc)} / "
+                f"{datetime.fromtimestamp(self.ut1unix[-1], timezone.utc)}  "
                 f"{self.ut1unix.size} frames."
             )
 

src/histutils/convert/__main__.py

@@ -27,28 +27,27 @@
 #
 from ..dio import dir2fn, vid2h5
 from ..rawDMCreader import goRead
-from ..plots import doPlayMovie, doplotsave
 
 
-def dmclooper(p):
+def dmclooper(p: dict):
 
     params = {
-        "kineticsec": p.kineticsec,
-        "rotccw": p.rotccw,
-        "transpose": p.transpose,
-        "flipud": p.flipud,
-        "fliplr": p.fliplr,
-        "fire": p.fire,
-        "sensorloc": p.loc,
+        "kineticsec": p["kineticsec"],
+        "rotccw": p["rotccw"],
+        "transpose": p["transpose"],
+        "flipud": p["flipud"],
+        "fliplr": p["fliplr"],
+        "fire": p["fire"],
+        "sensorloc": p["loc"],
         "cmdlog": " ".join(argv),
-        "header_bytes": p.headerbytes,
-        "xy_pixel": p.pix,
-        "xy_bin": p.bin,
-        "frame_request": p.frames,
+        "header_bytes": p["headerbytes"],
+        "xy_pixel": p["pix"],
+        "xy_bin": p["bin"],
+        "frame_request": p["frames"],
     }
 
     # %% find file(s) user specified
-    infn = Path(p.infile).expanduser()
+    infn = Path(p["infile"]).expanduser()
     if infn.is_file():
         flist = [infn]
     elif infn.is_dir():
@@ -59,7 +58,7 @@ def dmclooper(p):
     N = len(flist)
 
     for i, fn in enumerate(flist):
-        params["outfn"] = dir2fn(p.outdir, fn, ".h5")
+        params["outfn"] = dir2fn(p["outdir"], fn, ".h5")
         if params["outfn"].is_file():
             logging.warning(f"\nskipping {params['outfn']} {fn}")
             continue
@@ -71,17 +70,6 @@ def dmclooper(p):
         rawImgData, rawind, finf = goRead(fn, params)
         # %% convert
         vid2h5(None, ut1=finf["ut1"], rawind=rawind, ticks=None, params=params)
-        # %% optional plot
-        if p.movie:
-            plots(rawImgData, rawind, finf)
-
-
-def plots(rawImgData, rawind, finf):
-    try:
-        doPlayMovie(rawImgData, p.movie, ut1_unix=finf["ut1"], clim=p.clim)
-        doplotsave(p.infile, rawImgData, rawind, p.clim, p.hist, p.avg)
-    except Exception:
-        pass
 
 
 if __name__ == "__main__":
@@ -164,4 +152,4 @@ def plots(rawImgData, rawind, finf):
         level=logging.INFO,
     )
 
-    dmclooper(P)
+    dmclooper(vars(P))

src/histutils/dio.py

@@ -2,11 +2,11 @@
 import numpy as np
 import h5py
 from typing import Any
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
 
 
-def dir2fn(ofn: Path, ifn: Path, suffix: str = ".h5") -> Path | None:
+def dir2fn(ofn: Path, ifn: Path, suffix: str = ".h5") -> Path:
     """
 
     Parameters
@@ -25,27 +25,19 @@ def dir2fn(ofn: Path, ifn: Path, suffix: str = ".h5") -> Path | None:
     ofn: pathlib.Path
         filename to write
     """
-    if not ofn:  # no output file desired
-        return None
 
     ofn = Path(ofn).expanduser()
     ifn = Path(ifn).expanduser()
     if not ifn.is_file():
         raise FileNotFoundError(ifn)
 
-    if ofn.suffix == suffix:  # must already be a filename
-        pass
-    else:  # must be a directory
+    if ofn.suffix != suffix:
+        # must be a directory
         ofn.mkdir(parents=True, exist_ok=True)
         ofn = ofn / ifn.with_suffix(suffix).name
 
-    try:
-        if ofn.samefile(ifn):
-            raise FileExistsError(f"do not overwrite input file! {ifn}")
-    except (
-        FileNotFoundError
-    ):  # a good thing, the output file doesn't exist and hence it's not the input file
-        pass
+    if ofn.is_file() and ofn.samefile(ifn):
+        raise FileExistsError(f"do not overwrite input file! {ifn}")
 
     return ofn
 
@@ -143,8 +135,8 @@ def vid2h5(
 
         if ut1 is not None:
             print(
-                f"writing from {datetime.utcfromtimestamp(ut1[0])}"
-                f"to {datetime.utcfromtimestamp(ut1[-1])}"
+                f"writing from {datetime.fromtimestamp(ut1[0], timezone.utc)}"
+                f"to {datetime.fromtimestamp(ut1[-1], timezone.utc)}"
             )
             if "ut1_unix" not in f:
                 fut1 = f.create_dataset(

src/histutils/plots.py

@@ -8,7 +8,6 @@
 except ImportError:
     skml = None
 #
-from mpl_toolkits.mplot3d import Axes3D  # noqa: F401
 from matplotlib.pyplot import figure, hist, draw, pause, show
 from matplotlib.colors import LogNorm
 
@@ -18,15 +17,22 @@
 from pymap3d import ecef2geodetic
 
 
-def doPlayMovie(data, playMovie, ut1_unix=None, rawFrameInd=None, clim=None):
-    if not playMovie or data is None:
+def doPlayMovie(
+    data,
+    playMovie: float | None,
+    ut1_unix: list[int] | None = None,
+    rawFrameInd: list[int] | None = None,
+    clim: tuple[int, int] | None = None,
+) -> None:
+
+    if playMovie is None or data is None:
         return
     # %%
     # sfmt = ScalarFormatter(useMathText=True)
     hf1 = figure(1)
     hAx = hf1.gca()
 
-    try:
+    if clim is not None:
         hIm = hAx.imshow(
             data[0, ...],
             vmin=clim[0],
@@ -35,7 +41,7 @@ def doPlayMovie(data, playMovie, ut1_unix=None, rawFrameInd=None, clim=None):
             origin="lower",
             norm=LogNorm(),
         )
-    except TypeError:  # clim wasn't specified properly
+    else:
         print("setting image viewing limits based on first frame")
         hIm = hAx.imshow(data[0, ...], cmap="gray", origin="lower", norm=LogNorm())
 
@@ -52,14 +58,14 @@ def doPlayMovie(data, playMovie, ut1_unix=None, rawFrameInd=None, clim=None):
 
     for i, d in enumerate(data):
         hIm.set_data(d)
-        try:
+        if ut1_unix is not None and rawFrameInd is not None:
             if titleut:
                 hT.set_text(
-                    f"UT1 estimate: {datetime.utcfromtimestamp(ut1_unix[i])}  RelFrame#: {i}"
+                    f"UT1 estimate: {datetime.fromtimestamp(ut1_unix[i])}  RelFrame#: {i}"
                 )
             else:
                 hT.set_text(f"RawFrame#: {rawFrameInd[i]} RelFrame# {i}")
-        except TypeError:
+        else:
             hT.set_text(f"RelFrame# {i}")
 
         draw()

src/histutils/plotsimul.py

@@ -5,7 +5,7 @@
 from matplotlib.pyplot import figure
 
 # from matplotlib.colors import LogNorm
-from datetime import datetime
+from datetime import datetime, timezone
 
 #
 from astropy.visualization.mpl_normalize import ImageNormalize
@@ -44,7 +44,7 @@ def plotPlainImg(cam, rawdata, t, odir):
         ax.text(
             0.05,
             0.075,
-            datetime.utcfromtimestamp(C.tKeo[t]).isoformat()[:-3],
+            datetime.fromtimestamp(C.tKeo[t], timezone.utc).isoformat()[:-3],
             ha="left",
             va="top",
             transform=ax.transAxes,
@@ -192,7 +192,7 @@ def updateframe(t, raw, wavelen, cam, ax, fg):
         hc = fg.colorbar(hi, ax=ax)  # not cax!
         hc.set_label(f"{raw.dtype} data numbers")
 
-    dtframe = datetime.utcfromtimestamp(cam.tKeo[t])
+    dtframe = datetime.fromtimestamp(cam.tKeo[t], timezone.utc)
 
     if cam.name == "asi":
         dtstr = datetime.strftime(dtframe, "%H:%M:%S")

src/histutils/simulFrame.py

@@ -6,7 +6,7 @@
 """
 
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 from time import time
 import h5py
 from numpy import arange, unique, atleast_1d, around, array, isfinite
@@ -70,8 +70,8 @@ def HSTsync(sim, cam, verbose):
 
     logging.info(
         f"{tall.size} mutual frames available "
-        f"from {datetime.utcfromtimestamp(mutualStart)}"
-        f"to {datetime.utcfromtimestamp(mutualStop)}"
+        f"from {datetime.fromtimestamp(mutualStart, timezone.utc)}"
+        f"to {datetime.fromtimestamp(mutualStop, timezone.utc)}"
     )
     # %% adjust start/stop to user request
     try: