Skip to content

Commit

Permalink
wip test_van_vleck_crosses_int_nan
Browse files Browse the repository at this point in the history
  • Loading branch information
@d3v-null
d3v-null committed Sep 27, 2024
1 parent 73f00b5 commit 57fe50d
Showing 1 changed file with 89 additions and 4 deletions.
93 changes: 89 additions & 4 deletions src/van_vleck.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ use crate::{
};
use errorfunctions::RealErrorFunctions;
use itertools::{zip_eq, Itertools};
use lazy_static::lazy_static;
use log::trace;
use marlu::{
io::error::BadArrayShape, mwalib::CorrelatorContext, ndarray::ShapeError,
Expand Down Expand Up @@ -146,7 +145,7 @@ use thiserror::Error;
///
/// let ant_pairs = vis_sel.get_ant_pairs(&corr_ctx.metafits_context);
/// let flagged_ants = corr_ctx.metafits_context.antennas.iter().enumerate().filter_map(|(idx, ant)| {
/// if ant.rfinput_x.flag > 0 || ant.rfinput_y.flag > 0 {
/// if ant.rfinput_x.flagged || ant.rfinput_y.flagged {
/// Some(idx)
/// } else {
/// None
Expand Down Expand Up @@ -243,12 +242,12 @@ pub fn correct_van_vleck(
.unzip();

// correct autos
let sigma_xxr = Array::from(van_vleck_autos(&sighat_xxr)).into_shape((
let sigma_xxr = Array::from(van_vleck_autos(&sighat_xxr)).into_shape_with_order((
vis_dims.0,
vis_dims.1,
n_unflagged_autos,
))?;
let sigma_yyr = Array::from(van_vleck_autos(&sighat_yyr)).into_shape((
let sigma_yyr = Array::from(van_vleck_autos(&sighat_yyr)).into_shape_with_order((
vis_dims.0,
vis_dims.1,
n_unflagged_autos,
Expand Down Expand Up @@ -501,6 +500,12 @@ mod vv_auto_tests {
}
}

#[test]
fn test_van_vleck_autos_zero() {
let result = van_vleck_autos(&[0.]);
assert_approx_eq!(f64, result[0], 0.0, epsilon = 1e-10);
}

#[test]
fn test_correct_van_vleck_autos_bad_nsamples() {
let vis_dims = (1, 1, 3);
Expand Down Expand Up @@ -771,8 +776,11 @@ pub fn van_vleck_crosses_int(k_: &[f64], σ1_: &[f64], σ2_: &[f64]) -> Vec<f64>

#[cfg(test)]
mod vv_cross_tests {
// use crate::{io::read_mwalib, FlagContext};

use super::*;
use float_cmp::assert_approx_eq;
// use marlu::VisSelection;

#[test]
fn test_simpsons_identity() {
Expand Down Expand Up @@ -1301,6 +1309,40 @@ mod vv_cross_tests {
-0.00300000010, 0.00340000014, -0.01110000051, 0.00650000048, 0.01020000043,
];

#[test]
fn test_van_vleck_crosses_int_zero() {
let result = van_vleck_crosses_int(&[1e-20], &[0.], &[0.]);
assert_approx_eq!(f64, result[0], 0.0, epsilon = 1e-20);
}

#[test]
fn test_van_vleck_crosses_int_one() {
let result = van_vleck_crosses_int(&[1. - 1e-20], &[0.], &[0.]);
assert_approx_eq!(f64, result[0], 1.0, epsilon = 1e-20);
}

// #[test]
// #[should_panic]
// fn test_van_vleck_crosses_int_nan() {
// // van_vleck_crosses_int(&[f64::NAN], &[0.], &[0.]);
// van_vleck_crosses_int(&[0.], &[f64::NAN], &[0.]);
// }

// TODO: 1061317032 had a lot of warnings like this:
// [2024-08-14T22:19:30Z WARN birli::van_vleck] |ρ| > 1: 6.125001171875 / 2.4677409724093606 / 2.4677409724093606 at index 0
// [2024-08-14T22:19:30Z WARN birli::van_vleck] |ρ| > 1: 6.125001171875 / 2.4677409724093606 / 2.4677409724093606 at index 0
// [2024-08-14T22:19:30Z WARN birli::van_vleck] |ρ| > 1: 6.125001171875 / 2.4677409724093606 / 2.4677409724093606 at index 0
// [2024-08-14T22:19:30Z WARN birli::van_vleck] |ρ| > 1: 6.123776171875 / 2.4680004253890715 / 2.4680004253890715 at index 0

// TODO: 1061661688 had a lot of these:
// [2024-08-15T01:20:48Z WARN birli::van_vleck] Van Vleck correction did not converge for sigma=0.11521718621802912
// [2024-08-15T01:20:48Z WARN birli::van_vleck] Van Vleck correction did not converge for sigma=0.11478240283248996
// [2024-08-15T01:20:48Z WARN birli::van_vleck] Van Vleck correction did not converge for sigma=0.11704699910719625
// [2024-08-15T01:20:48Z WARN birli::van_vleck] Van Vleck correction did not converge for sigma=0.11401754250991379
// [2024-08-15T01:20:48Z WARN birli::van_vleck] Van Vleck correction did not converge for sigma=0.11467344941179715
// [2024-08-15T01:20:48Z WARN birli::van_vleck] Van Vleck correction did not converge for sigma=0.11715374513859982
// [2024-08-15T01:20:48Z WARN birli::van_vleck] Van Vleck correction did not converge for sigma=0.11597413504743202

#[test]
// compare values from pyuvdata
fn test_van_vleck_crosses_int() {
Expand Down Expand Up @@ -1559,6 +1601,49 @@ mod vv_cross_tests {
assert_approx_eq!(f32, jones_array[(0, 0, 2)][2].im, -khats2[1] as f32, epsilon=1e-9);
assert_approx_eq!(f32, jones_array[(0, 0, 2)][3].re, sighats2[1].powi(2) as f32);
}

// #[rustfmt::skip]
// #[test]
// fn test_correct_van_vleck_crosses_bad_visibilities() {
// let vis_dims = (1, 1, 3);
// let mut corr_ctx = CorrelatorContext::new(
// "tests/data/1196175296_mwa_ord/1196175296.metafits",
// &["tests/data/1196175296_mwa_ord/1196175296_20171201145440_gpubox01_00.fits"],
// )
// .unwrap();

// let vis_sel = VisSelection::from_mwalib(&corr_ctx).unwrap();

// let flag_ctx = FlagContext::from_mwalib(&corr_ctx);
// let fine_chans_per_coarse = corr_ctx.metafits_context.num_corr_fine_chans_per_coarse;
// let mut flag_array = vis_sel.allocate_flags(fine_chans_per_coarse).unwrap();
// flag_ctx
// .set_flags(
// flag_array.view_mut(),
// &vis_sel.timestep_range,
// &vis_sel.coarse_chan_range,
// &vis_sel.get_ant_pairs(&corr_ctx.metafits_context),
// )
// .unwrap();
// let mut jones_array = vis_sel.allocate_jones(fine_chans_per_coarse).unwrap();
// read_mwalib(
// &vis_sel,
// &corr_ctx,
// jones_array.view_mut(),
// flag_array.view_mut(),
// false,
// )
// .unwrap();

// let ant_pairs = vis_sel.get_ant_pairs(&corr_ctx.metafits_context);
// let flagged_ants = [];

// dbg!(&jones_array);

// correct_van_vleck(&corr_ctx, jones_array.view_mut(), &ant_pairs, &flagged_ants, false).unwrap();

// // ant1 is corrected, but ant2 isn't.
// }
}

// lazy_static! {
Expand Down

0 comments on commit 57fe50d

Please sign in to comment.