Skip to content

Replace ProSpectSEDlike manual parameter plumbing with ParmOff #31

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
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Replace ProSpectSEDlike manual parameter plumbing with ParmOff #31

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1af9f58
Use ParmOff in ProSpectSEDlike for bounds/logged and function dispatch
Copilot May 14, 2026
3444d84
Fix!
asgr May 14, 2026
a8be65d
Some tweaks. Can use .rem.args
asgr May 19, 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
113 changes: 70 additions & 43 deletions R/ProSpect.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,25 @@ ProSpectSEDlike = function(parm = c(8, 9, 10, 10, 0, -0.5, 0.2), Data) {

names(parm) = Data$parm.names

if (!requireNamespace("ParmOff", quietly = TRUE)) {
stop("The ParmOff package is needed for parameter mapping in ProSpectSEDlike. Please install it from GitHub/asgr/ParmOff.", call. = FALSE)
}

logged_parm_names = NULL
if (!is.null(Data$logged)) {
if(is.logical(Data$logged)){
if (length(Data$logged) == 1) {
if (Data$logged) {
logged_parm_names = Data$parm.names
}
} else {
logged_parm_names = Data$parm.names[Data$logged]
}
}else{
logged_parm_names = Data$logged
}
}

if(is.null(Data$photom) & isTRUE(Data$mode == 'photom')){
Data$photom = Data$flux
}
Expand Down Expand Up @@ -573,7 +592,7 @@ ProSpectSEDlike = function(parm = c(8, 9, 10, 10, 0, -0.5, 0.2), Data) {
z_genSF = Data$arglist$z_genSF ## What redshift should we start star formation?

ztest = parm["z"]
if(Data$logged[Data$parm.names == "z"]){
if("z" %in% logged_parm_names){
ztest = 10^ztest
}

Expand Down Expand Up @@ -622,40 +641,42 @@ ProSpectSEDlike = function(parm = c(8, 9, 10, 10, 0, -0.5, 0.2), Data) {
parm = Data$constraints(parm)
}

parm_lower = NULL
parm_upper = NULL
if (!is.null(Data$intervals)) {
#parm[parm < Data$intervals$lo] = Data$intervals$lo[parm < Data$intervals$lo]
#parm[parm > Data$intervals$hi] = Data$intervals$hi[parm > Data$intervals$hi]
parm = pmin(pmax(parm, Data$intervals$lo), Data$intervals$hi)
parm_lower = as.list(Data$intervals$lo)
parm_upper = as.list(Data$intervals$hi)
names(parm_lower) = Data$parm.names
names(parm_upper) = Data$parm.names
}

if (!is.null(Data$logged)) {
if (length(Data$logged) == 1) {
if (Data$logged) {
parmlist = 10 ^ parm
} else{
parmlist = parm
}
} else{
parmlist = parm
parmlist[Data$logged] = 10 ^ parm[Data$logged]
}
} else{
parmlist = parm
}
parmlist = ParmOff::ParmOff(
.func = ProSpectSED,
.args = parm,
.lower = parm_lower,
.upper = parm_upper,
.logged = logged_parm_names,
.return = 'args',
.check = FALSE
)$current_args

if (Data$verbose) {
message(parmlist)
if(any(lengths(parmlist) != 1L)){
stop('All fitting parameters must be scalar values.')
}

if('scat_scale' %in% Data$parm.names){
sel = which('scat_scale' == Data$parm.names)
scat_scale = parmlist[sel]
parmlist = parmlist[-sel]
Data$parm.names = Data$parm.names[-sel]
scat_scale = parmlist[['scat_scale']]
#parm = parm[-sel]
#Data$parm.names = Data$parm.names[-sel]
}else{
scat_scale = 1
}

if (Data$verbose) {
parmlist_print = unlist(parmlist, recursive = FALSE, use.names = TRUE)
message(parmlist_print)
}

Monitor = {}

if(isTRUE(Data$mode == 'spec') | isTRUE(Data$mode == 'both')){
Expand All @@ -666,20 +687,23 @@ ProSpectSEDlike = function(parm = c(8, 9, 10, 10, 0, -0.5, 0.2), Data) {
}

if (returnall) {
SEDout = do.call(
'ProSpectSED',
args = c(
SEDout = ParmOff::ParmOff(
.func = ProSpectSED,
.args = c(
parmlist,
list(SFH = quote(Data$SFH)),
list(speclib = quote(Data$speclib)),
list(Dale = quote(Data$Dale)),
list(AGN = quote(Data$AGN)),
list(filtout = quote(filtout)),
list(SFH = Data$SFH),
list(speclib = Data$speclib),
list(Dale = Data$Dale),
list(AGN = Data$AGN),
list(filtout = filtout),
list(filters = NULL),
list(returnall = TRUE),
list(Dale_M2L_func = quote(Data$Dale_M2L_func)),
list(Dale_M2L_func = Data$Dale_M2L_func),
Data$arglist
)
),
.rem_args = 'scat_scale',
.return = 'func',
.check = FALSE
)
if(is.null(Data$filtout) | isTRUE(Data$mode == 'spec') | isTRUE(Data$mode == 'both')){
#this means we are in spec-z mode
Expand Down Expand Up @@ -718,19 +742,22 @@ ProSpectSEDlike = function(parm = c(8, 9, 10, 10, 0, -0.5, 0.2), Data) {
}
} else{

Photom = do.call(
'ProSpectSED',
args = c(
Photom = ParmOff::ParmOff(
.func = ProSpectSED,
.args = c(
parmlist,
list(SFH = quote(Data$SFH)),
list(speclib = quote(Data$speclib)),
list(Dale = quote(Data$Dale)),
list(AGN = quote(Data$AGN)),
list(filtout = quote(filtout)),
list(SFH = Data$SFH),
list(speclib = Data$speclib),
list(Dale = Data$Dale),
list(AGN = Data$AGN),
list(filtout = filtout),
list(filters = NULL),
list(returnall = FALSE),
Data$arglist
)
),
.rem_args = 'scat_scale',
.return = 'func',
.check = FALSE
)

if(is.null(filtout)){
Expand Down
Loading