remove unused error, alias complex type

MWATelescope · Nov 21, 2024 · feb0b74 · feb0b74
1 parent c82b9c5
commit feb0b74
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 26 deletions.
diff --git a/src/cli/error.rs b/src/cli/error.rs
@@ -173,7 +173,6 @@ impl From<PeelArgsError> for HyperdriveError {
     fn from(e: PeelArgsError) -> Self {
         match e {
             PeelArgsError::NoOutput
-            | PeelArgsError::NoChannels
             | PeelArgsError::ZeroPasses
             | PeelArgsError::ZeroLoops
             | PeelArgsError::ParseIonoTimeAverageFactor(_)

diff --git a/src/cli/peel/error.rs b/src/cli/peel/error.rs
@@ -7,9 +7,6 @@ pub(crate) enum PeelArgsError {
     #[error("No calibration output was specified. There must be at least one calibration solution file.")]
     NoOutput,
 
-    #[error("The data either contains no frequency channels or all channels are flagged")]
-    NoChannels,
-
     #[error("The number of iono sub passes cannot be 0")]
     ZeroPasses,
 

diff --git a/src/hyperdrive-peel.code-workspace b/src/hyperdrive-peel.code-workspace
diff --git a/src/params/peel/mod.rs b/src/params/peel/mod.rs
@@ -2632,6 +2632,9 @@ fn subtract_thread(
     Ok(())
 }
 
+// type for passing full residuals from joiner thread
+type FullResidual<'a> = (Array3<Jones<f32>>, Array3<f32>, &'a Timeblock);
+
 /// reshapes residuals for peel.
 /// receives a stream of 2D residuals and weights [chan, baseline]
 /// joins them into a 3D array [time, chan, baseline] whose time axis
@@ -2645,7 +2648,7 @@ fn joiner_thread<'a>(
     spw: &Spw,
     num_unflagged_cross_baselines: usize,
     rx_residual: Receiver<(Array2<Jones<f32>>, Array2<f32>, Epoch)>,
-    tx_full_residual: Sender<(Array3<Jones<f32>>, Array3<f32>, &'a Timeblock)>,
+    tx_full_residual: Sender<FullResidual<'a>>,
     error: &AtomicCell<bool>,
 ) {
     for timeblock in iono_timeblocks {
@@ -2716,7 +2719,7 @@ fn peel_thread(
     low_res_lambdas_m: &[f64],
     apply_precession: bool,
     output_vis_params: Option<&OutputVisParams>,
-    rx_full_residual: Receiver<(Array3<Jones<f32>>, Array3<f32>, &Timeblock)>,
+    rx_full_residual: Receiver<FullResidual>,
     tx_write: Sender<VisTimestep>,
     tx_iono_consts: Sender<Vec<IonoConsts>>,
     error: &AtomicCell<bool>,

diff --git a/src/srclist/hyperdrive/write.rs b/src/srclist/hyperdrive/write.rs
@@ -23,6 +23,8 @@ pub(crate) fn source_list_to_yaml<T: std::io::Write>(
         let mut map = HashMap::with_capacity(1);
         for (name, src) in sl.iter().take(num_sources) {
             map.insert(name.as_str(), serde_yaml::to_value(src)?);
+            // TODO: linter bug
+            #[allow(clippy::needless_borrows_for_generic_args)]
             serde_yaml::to_writer(&mut buf, &map)?;
             map.clear();
         }