⬆️ !PATCHED! update mwalib 1.7.1

fitsio removed filename from FitsFile, so mwalib macros need MWAFitsFile

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "birli"
 description = "A preprocessing pipeline for the Murchison Widefield Array"
-version = "0.15.1"
+version = "0.16.0"
 readme = "README.md"
 homepage = "https://github.com/MWATelescope/Birli"
 repository = "https://github.com/MWATelescope/Birli"
@@ -41,9 +41,9 @@ cfg-if = "1.0.0"
 derive_builder = "0.11.1"
 indicatif = { version = "0.17.0", features = ["rayon"] }
 itertools = "0.10.0"
-lazy_static = "1.4.0"
+lazy_static = "~1.5"
 log = "0.4.0"
-marlu = "0.14.0"
+marlu = "0.15.0"                                         # don't forget dev-dependencies!
 regex = "1.4.0"
 thiserror = "1.0.0"
 
@@ -64,7 +64,7 @@ csv = "1.1"
 float-cmp = "0.9"
 glob = "0.3"
 lexical = "6.0"
-marlu = { version = "0.14.0", features = ["approx"] }
+marlu = { version = "0.15.0", features = ["approx"] }
 ndarray = { version = "0.16.0", features = ["approx"] }
 tempfile = "3.3"
 
@@ -91,6 +91,6 @@ opt-level = 3
 
 [patch.crates-io]
 # marlu = { path = "../Marlu" }
-# marlu = { git = "https://github.com/MWATelescope/Marlu", branch = "birli-150" }
+marlu = { git = "https://github.com/MWATelescope/Marlu", branch = "mwalib-1.7.1" }
 # mwalib = { path = "../mwalib" }
 # mwalib = { git = "https://github.com/MWATelescope/mwalib", branch = "digital_gains_plus" }

Makefile.toml

@@ -161,6 +161,7 @@ install_crate = "rustfmt"
 
 [tasks.clippy]
 command = "cargo"
+# cargo clippy --all-targets --all-features -- -D warnings
 args = ["clippy", "--all-targets", "--all-features", "--", "-D", "warnings"]
 install_crate = "clippy"
 

README.md

@@ -114,7 +114,7 @@ cargo test
 ### Dependencies
 
 Experiencing segfaults? I can guarantee it's because of one of the C library dependencies.
-Make sure you have the right versions of all the libraries. These are specified in [Prerequisites](#Prerequisites).
+Make sure you have the right versions of all the libraries. These are specified in [Prerequisites](#prerequisites).
 
 Get library versions on linux with:
 

src/cli.rs

@@ -13,8 +13,8 @@ use indicatif::{ProgressDrawTarget, ProgressStyle};
 use itertools::{izip, Itertools};
 use log::{debug, info, trace, warn};
 use mwalib::{
-    built_info::PKG_VERSION as MWALIB_PKG_VERSION, fitsio_sys::CFITSIO_VERSION, CableDelaysApplied,
-    CorrelatorContext, GeometricDelaysApplied, MWAVersion,
+    built_info::PKG_VERSION as MWALIB_PKG_VERSION, CableDelaysApplied, CorrelatorContext,
+    GeometricDelaysApplied, MWAVersion,
 };
 use prettytable::{format as prettyformat, row, table};
 
@@ -98,7 +98,6 @@ pub fn fmt_build_info(f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
     writeln!(f, "libraries:")?;
     writeln!(f, "- marlu v{MARLU_PKG_VERSION}")?;
     writeln!(f, "- mwalib v{MWALIB_PKG_VERSION}")?;
-    writeln!(f, "- cfitsio (bindings) v{CFITSIO_VERSION}")?;
 
     cfg_if! {
         if #[cfg(feature = "aoflagger")] {

src/io/mod.rs

@@ -858,12 +858,12 @@ mod tests_aoflagger {
             unsafe {
                 // ffggpe = fits_read_grppar_flt
                 fitsio_sys::ffggpe(
-                    fptr.as_raw(),                 /* I - FITS file pointer                       */
-                    1 + *row_idx as i64,           /* I - group to read (1 = 1st group)           */
-                    1,                             /* I - first vector element to read (1 = 1st)  */
-                    pcount as i64,                 /* I - number of values to read                */
+                    fptr.fits_file.as_raw(), /* I - FITS file pointer                       */
+                    1 + *row_idx as i64,     /* I - group to read (1 = 1st group)           */
+                    1,                       /* I - first vector element to read (1 = 1st)  */
+                    pcount as i64,           /* I - number of values to read                */
                     obs_group_params.as_mut_ptr(), /* O - array of values that are returned       */
-                    &mut status,                   /* IO - error status                           */
+                    &mut status,             /* IO - error status                           */
                 );
             }
             fits_check_status(status).unwrap();
@@ -885,14 +885,14 @@ mod tests_aoflagger {
             unsafe {
                 // ffgpve = fits_read_img_flt
                 fitsio_sys::ffgpve(
-                    fptr.as_raw(),        /* I - FITS file pointer                       */
-                    1 + *row_idx as i64,  /* I - group to read (1 = 1st group)           */
-                    1,                    /* I - first vector element to read (1 = 1st)  */
-                    obs_vis.len() as i64, /* I - number of values to read                */
-                    0.0,                  /* I - value for undefined pixels              */
-                    obs_vis.as_mut_ptr(), /* O - array of values that are returned       */
-                    &mut 0,               /* O - set to 1 if any values are null; else 0 */
-                    &mut status,          /* IO - error status                           */
+                    fptr.fits_file.as_raw(), /* I - FITS file pointer                       */
+                    1 + *row_idx as i64,     /* I - group to read (1 = 1st group)           */
+                    1,                       /* I - first vector element to read (1 = 1st)  */
+                    obs_vis.len() as i64,    /* I - number of values to read                */
+                    0.0,                     /* I - value for undefined pixels              */
+                    obs_vis.as_mut_ptr(),    /* O - array of values that are returned       */
+                    &mut 0,                  /* O - set to 1 if any values are null; else 0 */
+                    &mut status,             /* IO - error status                           */
                 );
             };
             fits_check_status(status).unwrap();