diff --git a/src/cli/error.rs b/src/cli/error.rs index 61815dc0..3a06797d 100644 --- a/src/cli/error.rs +++ b/src/cli/error.rs @@ -173,7 +173,6 @@ impl From 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 index 264e8680..66bcb7d2 100644 --- 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 deleted file mode 100644 index 16b3338a..00000000 --- a/src/hyperdrive-peel.code-workspace +++ /dev/null @@ -1,20 +0,0 @@ -{ - "folders": [ - { - "path": ".." - }, - { - "path": "../../../../../data/dev/1226233968" - }, - { - "path": "../../../../../data/dev/1090701368" - }, - { - "path": "../../../../../data/dev/1094090416" - }, - { - "path": "../../../../../data/dev/1096811152" - } - ], - "settings": {} -} \ No newline at end of file diff --git a/src/params/peel/mod.rs b/src/params/peel/mod.rs index 53a75173..c9c1f259 100644 --- 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>, Array3, &'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>, Array2, Epoch)>, - tx_full_residual: Sender<(Array3>, Array3, &'a Timeblock)>, + tx_full_residual: Sender>, error: &AtomicCell, ) { 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>, Array3, &Timeblock)>, + rx_full_residual: Receiver, tx_write: Sender, tx_iono_consts: Sender>, error: &AtomicCell, diff --git a/src/srclist/hyperdrive/write.rs b/src/srclist/hyperdrive/write.rs index ff8d218e..0a8ae84d 100644 --- a/src/srclist/hyperdrive/write.rs +++ b/src/srclist/hyperdrive/write.rs @@ -23,6 +23,8 @@ pub(crate) fn source_list_to_yaml( 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(); }