Skip to content

Commit 9571412

Browse files
aphearinaphearin
committed
Remove _gash from module names
1 parent 6ee3628 commit 9571412

15 files changed

Lines changed: 18 additions & 22 deletions

‎diffstar/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
get_unbounded_diffstar_params,
1616
)
1717
from .mgas_model import calc_mgas_galpop, calc_mgas_singlegal
18-
from .sfh_model_mgash import calc_sfh_galpop, calc_sfh_singlegal
18+
from .sfh_model import calc_sfh_galpop, calc_sfh_singlegal

‎diffstar/defaults.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
DEFAULT_N_STEPS = 50
2020

2121

22-
from .kernels.main_sequence_kernels_mgash import (
22+
from .kernels.main_sequence_kernels import (
2323
DEFAULT_MS_PARAMS,
2424
DEFAULT_MS_PDICT,
2525
DEFAULT_U_MS_PARAMS,

diffstar/fitting_helpers/diffstar_fitting_helpers_mgash.py renamed to diffstar/fitting_helpers/diffstar_fitting_helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from jax import jit as jjit
99
from jax import numpy as jnp
1010

11-
from ..sfh_model_mgash import calc_sfh_singlegal
11+
from ..sfh_model import calc_sfh_singlegal
1212
from ..defaults import (
1313
DEFAULT_DIFFSTAR_U_PARAMS,
1414
DEFAULT_MS_PARAMS,
@@ -19,7 +19,7 @@
1919
SFR_MIN,
2020
get_bounded_diffstar_params,
2121
)
22-
from ..kernels.main_sequence_kernels_mgash import _get_unbounded_sfr_params
22+
from ..kernels.main_sequence_kernels import _get_unbounded_sfr_params
2323
from ..kernels.quenching_kernels import _get_unbounded_q_params
2424
from ..utils import _sigmoid, compute_fstar, cumulative_mstar_formed
2525
from .utils import minimizer_wrapper

diffstar/fitting_helpers/tests/test_diffstar_fitting_helpers_mgash.py renamed to diffstar/fitting_helpers/tests/test_diffstar_fitting_helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
from diffmah.defaults import DEFAULT_MAH_PARAMS
55
from jax import random as jran
66

7-
from ...sfh_model_mgash import calc_sfh_singlegal
87
from ...defaults import (
98
DEFAULT_DIFFSTAR_U_PARAMS,
109
T_TABLE_MIN,
1110
get_bounded_diffstar_params,
1211
)
12+
from ...sfh_model import calc_sfh_singlegal
1313
from ...utils import cumulative_mstar_formed
14-
from .. import diffstar_fitting_helpers_mgash as dfh
14+
from .. import diffstar_fitting_helpers as dfh
1515

1616
LOSS_TOL = 0.1
1717

diffstar/kernels/history_kernel_builders_mgash.py renamed to diffstar/kernels/history_kernel_builders.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from jax import vmap
88

99
from ..defaults import SFR_MIN
10-
from .main_sequence_kernels_mgash import sfh_ms_kernel
10+
from .main_sequence_kernels import sfh_ms_kernel
1111
from .quenching_kernels import _quenching_kern
1212

1313

diffstar/kernels/main_sequence_kernels_mgash.py renamed to diffstar/kernels/main_sequence_kernels.py

File renamed without changes.

diffstar/kernels/tests/test_history_kernel_builders_mgash.py renamed to diffstar/kernels/tests/test_history_kernel_builders.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
# === Adjust these imports to your real module paths ===
99
from ...defaults import SFR_MIN
10-
from ..main_sequence_kernels_mgash import DEFAULT_MS_PARAMS
10+
from ..main_sequence_kernels import DEFAULT_MS_PARAMS
1111
from ..quenching_kernels import (
1212
DEFAULT_Q_PARAMS,
1313
DEFAULT_Q_PARAMS_UNQUENCHED,
1414
)
15-
from ..history_kernel_builders_mgash import (
15+
from ..history_kernel_builders import (
1616
_sfh_singlegal_scalar,
1717
_sfh_singlegal_kern,
1818
_sfh_galpop_kern,

diffstar/kernels/tests/test_main_sequence_kernels_mgash.py renamed to diffstar/kernels/tests/test_main_sequence_kernels.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import numpy as np
44
import jax.numpy as jnp
55

6-
from ..main_sequence_kernels_mgash import (
6+
from ..main_sequence_kernels import (
77
DEFAULT_MS_PARAMS,
88
DEFAULT_U_MS_PARAMS,
99
DEFAULT_MS_PDICT,

‎diffstar/mgas_model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from jax import vmap
66

77
from .defaults import FB, LGT0
8-
from .kernels.history_kernel_builders_mgash import _sfh_galpop_kern, _sfh_singlegal_kern
8+
from .kernels.history_kernel_builders import _sfh_galpop_kern, _sfh_singlegal_kern
99
from .utils import _jax_get_dt_array, cumulative_mstar_formed
1010

1111
_cumulative_mstar_formed_vmap = jjit(vmap(cumulative_mstar_formed, in_axes=(None, 0)))

diffstar/sfh_model_mgash.py renamed to diffstar/sfh_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from jax import vmap
99

1010
from .defaults import FB, LGT0
11-
from .kernels.history_kernel_builders_mgash import _sfh_galpop_kern, _sfh_singlegal_kern
11+
from .kernels.history_kernel_builders import _sfh_galpop_kern, _sfh_singlegal_kern
1212
from .utils import cumulative_mstar_formed
1313

1414
_cumulative_mstar_formed_vmap = jjit(vmap(cumulative_mstar_formed, in_axes=(None, 0)))

0 commit comments

Comments
 (0)