pspipe 0.6.0__tar.gz → 0.7__tar.gz

{pspipe-0.6.0 → pspipe-0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pspipe
-Version: 0.6.0
+Version: 0.7
 Summary: Power spectra pipeline for Cosmic Dawn, Epoch of Reionization radio interferometric experiments
 Author: Florent Mertens
 Author-email: florent.mertens@gmail.com
@@ -14,9 +14,9 @@ Provides-Extra: ml-gpr
 Requires-Dist: astropy (>6.0)
 Requires-Dist: click (>=8.0)
 Requires-Dist: libpipe (>=0.1.5)
-Requires-Dist: nenucal (>=0.1.11)
 Requires-Dist: ps-eor (>=0.8)
 Requires-Dist: ps-eor[ml-gpr] (>=0.8) ; extra == "ml-gpr"
+Requires-Dist: python-casacore (>=3.0)
 Requires-Dist: tables (>=3.2)
 Requires-Dist: tabulate (>=0.8)
 Requires-Dist: toml (>=0.10)

{pspipe-0.6.0 → pspipe-0.7}/pspipe/database.py

@@ -15,7 +15,6 @@ from libpipe import futils
 from libpipe.attrmap import OrderedSet
 
 # Lazy loaded:
-# - nenucal.msutils in ObsIDMeta.set_ms_info()
 # - .obsdata.ObsData in VisRevision.get_data()
 
 from .settings import Settings
@@ -365,9 +364,7 @@ class ObsIDMeta(AbstractJsonMeta):
         return ObsIDMeta(file, d)
 
     def set_ms_files(self, ms_files):
-        from nenucal import msutils
-
-        self.update(msutils.get_info_from_ms_files(ms_files[0]))
+        self.update(utils.get_info_from_ms_files(ms_files[0]))
         self['ms_files'] = ms_files
         self.save()
 

pspipe-0.7/pspipe/utils.py

@@ -0,0 +1,82 @@
+# Mixed utilities
+#
+# Author: F. Mertens
+
+import itertools
+
+import astropy.time as at
+from casacore import tables
+
+
+def alphanum(s):
+    return "".join(filter(str.isalnum, s))
+
+
+def all_same(l):
+    return not l or l.count(l[0]) == len(l)
+
+
+def all_in_other(l, other):
+    return all(elem in other for elem in l)
+
+
+def get_lst(obs_mjd, longitude=6.57):
+    return at.Time(obs_mjd, scale='utc', format='mjd').sidereal_time('mean', longitude=longitude).value
+
+
+def is_in_lst_bin(lst, lst_s, lst_e):
+    if lst_s == lst_e:
+        return False
+    if lst_e > lst_s:
+        return (lst >= lst_s) and (lst < lst_e)
+    return (lst >= lst_s) or (lst < lst_e)
+
+
+def pairwise(iterable):
+    '''s -> (s0,s1), (s1,s2), (s2, s3), ...'''
+    a, b = itertools.tee(iterable)
+    next(b, None)
+    return list(zip(a, b))
+
+def is_number(i):
+    '''Check if input is a string or an integer'''
+    try:
+        bool_i = i.isdigit()
+
+    except AttributeError:
+        bool_i = isinstance(i, int)
+
+    return bool_i
+
+
+def get_ms_freqs(ms_file):
+    with tables.table(os.path.join(ms_file, 'SPECTRAL_WINDOW'), readonly=True, ack=False) as t_spec_win:
+        freqs = t_spec_win.getcol('CHAN_FREQ').reshape(-1)
+        chan_widths = t_spec_win.getcol('CHAN_WIDTH').reshape(-1)
+
+    return freqs, chan_widths
+
+
+def get_info_from_ms_files(files):
+    t_start = []    
+    t_end = []
+    t_total = 0
+
+    for file in files:
+        with tables.table(file, ack=False) as t:
+            start = t.getcell('TIME', 0)
+            end = t.getcell('TIME', t.nrows() - 1)
+            t_int = t.getcell('INTERVAL', 0)
+        t_start.append(start)
+        t_end.append(end)
+        t_total += end - start
+        freqs, chan_widths = get_ms_freqs(file)
+        n_chan = len(freqs)
+        chan_width = chan_widths.mean()
+
+    t_start = min(t_start)
+    t_end = max(t_end)
+
+    return {'start_time': t_start, 'end_time': t_end, 'int_time': t_int,
+            'total_time': t_total, 'n_channels': n_chan, 'chan_width': chan_width}
+

{pspipe-0.6.0 → pspipe-0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "pspipe"
-version = "0.6.0"
+version = "0.7"
 description = "Power spectra pipeline for Cosmic Dawn, Epoch of Reionization radio interferometric experiments"
 readme = "README.md"
 authors = [
@@ -20,8 +20,8 @@ dependencies = [
     "tables>=3.2",
     "tabulate>=0.8",
     "ps-eor>=0.8",
-    "nenucal>=0.1.11",
-    "libpipe>=0.1.5"
+    "libpipe>=0.1.5",
+    "python-casacore>=3.0",
 ]
 
 [project.optional-dependencies]

pspipe-0.6.0/pspipe/utils.py

@@ -1,47 +0,0 @@
-# Mixed utilities
-#
-# Author: F. Mertens
-
-import itertools
-import astropy.time as at
-
-
-def alphanum(s):
-    return "".join(filter(str.isalnum, s))
-
-
-def all_same(l):
-    return not l or l.count(l[0]) == len(l)
-
-
-def all_in_other(l, other):
-    return all(elem in other for elem in l)
-
-
-def get_lst(obs_mjd, longitude=6.57):
-    return at.Time(obs_mjd, scale='utc', format='mjd').sidereal_time('mean', longitude=longitude).value
-
-
-def is_in_lst_bin(lst, lst_s, lst_e):
-    if lst_s == lst_e:
-        return False
-    if lst_e > lst_s:
-        return (lst >= lst_s) and (lst < lst_e)
-    return (lst >= lst_s) or (lst < lst_e)
-
-
-def pairwise(iterable):
-    '''s -> (s0,s1), (s1,s2), (s2, s3), ...'''
-    a, b = itertools.tee(iterable)
-    next(b, None)
-    return list(zip(a, b))
-
-def is_number(i):
-    '''Check if input is a string or an integer'''
-    try:
-        bool_i = i.isdigit()
-
-    except AttributeError:
-        bool_i = isinstance(i, int)
-
-    return bool_i