Skip to content

implementation of a Grid type to replace raw Vec<Point> as the star grids #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alex-J-Brown wants to merge 7 commits into
base: main
Choose a base branch
from
Open

implementation of a Grid type to replace raw Vec<Point> as the star grids #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba7812c
first go at integrating Grid type
Alex-J-Brown Aug 19, 2026
bfd0d2f
Clean up implementation of Grid struct
Alex-J-Brown Aug 20, 2026
fadd67e
Merge branch 'main' into grid_type
Alex-J-Brown Aug 20, 2026
87acfc2
Merge branch 'main' into grid_type
Alex-J-Brown Aug 20, 2026
3e253cc
add more access methods to Grid
Alex-J-Brown Aug 21, 2026
0a829b6
Merge branch 'main' into grid_type
Alex-J-Brown Sep 4, 2026
e13b23c
remove q and iangle as Grid attributes
Alex-J-Brown Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 67 additions & 66 deletions src/binary_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use crate::comp_gravity::{comp_gravity1, comp_gravity2};
use crate::comp_light::{comp_bright_spot, comp_disc, comp_disc_edge, comp_star1, comp_star2};
use crate::comp_radius::comp_radius;
use crate::ginterp::Ginterp;
use crate::grid::Grid;
use crate::ldc::LDC;
use crate::model::{Entry, Model, ModelUpdate};
use crate::set_bright_spot_grid::set_bright_spot_grid;
Expand All @@ -15,7 +16,7 @@ use pyo3::types::{PyDict, PyDictMethods};
use rayon::prelude::*;
use roche::constants::{C, DAY};
use roche::errors::RocheError;
use roche::{self, Etype, Point, Star, disc_eclipse};
use roche::{self, Etype, Star, disc_eclipse};
use serde_pyobject::from_pyobject;
use std::collections::HashMap;
use std::f64::consts::TAU;
Expand Down Expand Up @@ -79,19 +80,19 @@ pub struct LightCurve {
#[pyclass]
pub struct BinaryModel {
#[pyo3(get)]
star1_coarse_grid: Vec<Point>,
star1_coarse_grid: Grid,
#[pyo3(get)]
star2_coarse_grid: Vec<Point>,
star2_coarse_grid: Grid,
#[pyo3(get)]
star1_fine_grid: Vec<Point>,
star1_fine_grid: Grid,
#[pyo3(get)]
star2_fine_grid: Vec<Point>,
star2_fine_grid: Grid,
#[pyo3(get)]
disc_grid: Vec<Point>,
disc_grid: Grid,
#[pyo3(get)]
disc_edge_grid: Vec<Point>,
disc_edge_grid: Grid,
#[pyo3(get)]
bright_spot_grid: Vec<Point>,
bright_spot_grid: Grid,
gint: Ginterp,
rlens1: f64,
model_beaming1: bool,
Expand Down Expand Up @@ -215,31 +216,31 @@ impl BinaryModel {
/// "disc",
/// "disc_edge",
/// "bright_spot"
///
pub fn set_grid_fluxes(&mut self, grid: &str, fluxes: Vec<f32>) -> Result<(), RocheError> {
let chosen_grid = match grid {
"star1_fine" => &mut self.star1_fine_grid,
"star1_coarse" => &mut self.star1_coarse_grid,
"star2_fine" => &mut self.star2_fine_grid,
"star2_coarse" => &mut self.star2_coarse_grid,
"disc" => &mut self.disc_grid,
"disc_edge" => &mut self.disc_edge_grid,
"bright_spot" => &mut self.bright_spot_grid,
_ => return Err(RocheError::ParameterError("Not a valid grid.".to_string())),
};

apply_fluxes(chosen_grid, fluxes)?;
self.gint = set_ginterp(
&self.model,
self.rlens1,
&self.star1_coarse_grid,
&self.star2_coarse_grid,
&self.star1_fine_grid,
&self.star2_fine_grid,
)?;

Ok(())
}
///
// pub fn set_grid_fluxes(&mut self, grid: &str, fluxes: Vec<f32>) -> Result<(), RocheError> {
// let chosen_grid = match grid {
// "star1_fine" => &mut self.star1_fine_grid,
// "star1_coarse" => &mut self.star1_coarse_grid,
// "star2_fine" => &mut self.star2_fine_grid,
// "star2_coarse" => &mut self.star2_coarse_grid,
// "disc" => &mut self.disc_grid,
// "disc_edge" => &mut self.disc_edge_grid,
// "bright_spot" => &mut self.bright_spot_grid,
// _ => return Err(RocheError::ParameterError("Not a valid grid.".to_string())),
// };

// apply_fluxes(chosen_grid, fluxes)?;
// self.gint = set_ginterp(
// &self.model,
// self.rlens1,
// &self.star1_coarse_grid,
// &self.star2_coarse_grid,
// &self.star1_fine_grid,
// &self.star2_fine_grid,
// )?;

// Ok(())
// }

///
/// Computes a model light curve for an array of times and exposure times
Expand Down Expand Up @@ -409,11 +410,11 @@ impl BinaryModel {
};

let rva1: f64 = if self.model.roche1 {
comp_radius(&self.star1_coarse_grid, Star::Primary)
comp_radius(&self.star1_coarse_grid.points, Star::Primary)
} else {
self.model.r1.value
};
let rva2: f64 = comp_radius(&self.star2_coarse_grid, Star::Secondary);
let rva2: f64 = comp_radius(&self.star2_coarse_grid.points, Star::Secondary);

Ok(LightCurve {
star1: star1.into_pyarray(py).unbind(),
Expand Down Expand Up @@ -578,13 +579,13 @@ fn build_grids(
model: &Model,
) -> Result<
(
Vec<Point>,
Vec<Point>,
Vec<Point>,
Vec<Point>,
Vec<Point>,
Vec<Point>,
Vec<Point>,
Grid,
Grid,
Grid,
Grid,
Grid,
Grid,
Grid,
Ginterp,
f64,
bool,
Expand All @@ -595,8 +596,8 @@ fn build_grids(
model.validate()?;
let mut star1_fine_grid = set_star_grid(model, Star::Primary, true)?;
let mut star2_fine_grid = set_star_grid(model, Star::Secondary, true)?;
let mut star1_coarse_grid: Vec<Point>;
let mut star2_coarse_grid: Vec<Point>;
let mut star1_coarse_grid: Grid;
let mut star2_coarse_grid: Grid;

let (r1, mut r2) = model.get_r1r2();
let rl2: f64 = 1.0 - roche::x_l1_2(model.q.value, model.spin2.value)?;
Expand Down Expand Up @@ -627,9 +628,9 @@ fn build_grids(
set_star_continuum(model, &mut star1_coarse_grid, &mut star2_coarse_grid)?;
}

let mut disc_grid: Vec<Point> = vec![];
let mut disc_edge_grid: Vec<Point> = vec![];
let mut bright_spot_grid: Vec<Point> = vec![];
let mut disc_grid: Grid = Grid::new(vec![]);
let mut disc_edge_grid: Grid = Grid::new(vec![]);
let mut bright_spot_grid: Grid = Grid::new(vec![]);

let mut rlens1 = 0.0;
if model.glens1 {
Expand Down Expand Up @@ -668,7 +669,7 @@ fn build_grids(

let mut eclipses: Etype;
if model.opaque {
for point in &mut star1_fine_grid {
for point in &mut star1_fine_grid.points {
eclipses = disc_eclipse(
model.iangle.value,
rdisc1,
Expand All @@ -682,7 +683,7 @@ fn build_grids(
}
}

for point in &mut star1_coarse_grid {
for point in &mut star1_coarse_grid.points {
eclipses = disc_eclipse(
model.iangle.value,
rdisc1,
Expand All @@ -696,7 +697,7 @@ fn build_grids(
}
}

for point in &mut star2_fine_grid {
for point in &mut star2_fine_grid.points {
eclipses = disc_eclipse(
model.iangle.value,
rdisc1,
Expand All @@ -710,7 +711,7 @@ fn build_grids(
}
}

for point in &mut star2_coarse_grid {
for point in &mut star2_coarse_grid.points {
eclipses = disc_eclipse(
model.iangle.value,
rdisc1,
Expand Down Expand Up @@ -768,10 +769,10 @@ fn build_grids(
pub fn set_ginterp(
model: &Model,
rlens1: f64,
star1c: &Vec<Point>,
star2c: &Vec<Point>,
star1f: &Vec<Point>,
star2f: &Vec<Point>,
star1c: &Grid,
star2c: &Grid,
star1f: &Grid,
star2f: &Grid,
) -> Result<Ginterp, RocheError> {
let (r1, mut r2) = model.get_r1r2();
let rl2: f64 = 1.0 - roche::x_l1_2(model.q.value, model.spin2.value)?;
Expand Down Expand Up @@ -1019,14 +1020,14 @@ pub fn chisq_log_prob(
(chisq_sum, log_prob)
}

fn apply_fluxes(points: &mut Vec<Point>, fluxes: Vec<f32>) -> Result<(), RocheError> {
if points.len() != fluxes.len() {
return Err(RocheError::ParameterError(
"Selected grid and flux array have mismatched lengths.".to_string(),
));
}
for (point, flux) in points.iter_mut().zip(fluxes) {
point.set_flux(flux);
}
Ok(())
}
// fn apply_fluxes(points: &mut Vec<Point>, fluxes: Vec<f32>) -> Result<(), RocheError> {
// if points.len() != fluxes.len() {
// return Err(RocheError::ParameterError(
// "Selected grid and flux array have mismatched lengths.".to_string(),
// ));
// }
// for (point, flux) in points.iter_mut().zip(fluxes) {
// point.set_flux(flux);
// }
// Ok(())
// }
11 changes: 6 additions & 5 deletions src/comp_gravity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use crate::grid::Grid;
use crate::model::Model;
use roche::constants::DAY;
use roche::errors::RocheError;
use roche::{Point, RocheContext, Star, Vec3};
use roche::{RocheContext, Star, Vec3};
use std::f64::consts::TAU;

//
Expand All @@ -14,7 +15,7 @@ use std::f64::consts::TAU;
// \return the value of logg
//

pub fn comp_gravity1(model: &Model, star1_fine_grid: &Vec<Point>) -> Result<f64, RocheError> {
pub fn comp_gravity1(model: &Model, star1_fine_grid: &Grid) -> Result<f64, RocheError> {
// Calculate the unit scaling factor to get CGS gravity
let gm1m2: f64 = (1000.0 * model.velocity_scale.value).powi(3) * model.tperiod * DAY / TAU;
let a: f64 = (gm1m2 / (TAU / DAY / model.tperiod).powi(2)).powf(1.0 / 3.0);
Expand Down Expand Up @@ -44,7 +45,7 @@ pub fn comp_gravity1(model: &Model, star1_fine_grid: &Vec<Point>) -> Result<f64,
let mut sumf: f64 = 0.0;

// Star 1
for point in star1_fine_grid {
for point in &star1_fine_grid.points {
// flux has built-in area factor
sumfg += (point.flux * point.gravity) as f64;
sumf += point.flux as f64;
Expand All @@ -66,7 +67,7 @@ pub fn comp_gravity1(model: &Model, star1_fine_grid: &Vec<Point>) -> Result<f64,
// \return the value of logg
//

pub fn comp_gravity2(model: &Model, star2_fine_grid: &Vec<Point>) -> Result<f64, RocheError> {
pub fn comp_gravity2(model: &Model, star2_fine_grid: &Grid) -> Result<f64, RocheError> {
// Calculate the unit scaling factor to get CGS gravity
let gm1m2: f64 = (1000.0 * model.velocity_scale.value).powi(3) * model.tperiod * DAY / TAU;
let a: f64 = (gm1m2 / (TAU / DAY / model.tperiod).powi(2)).powf(1.0 / 3.0);
Expand Down Expand Up @@ -99,7 +100,7 @@ pub fn comp_gravity2(model: &Model, star2_fine_grid: &Vec<Point>) -> Result<f64,
let mut sumf: f64 = 0.0;

// Star 2
for point in star2_fine_grid {
for point in &star2_fine_grid.points {
// flux has built-in area factor
sumfg += (point.flux * point.gravity) as f64;
sumf += point.flux as f64;
Expand Down
Loading
Loading