Skip to content

Commit

Permalink
plotting all fixed!!
Browse files Browse the repository at this point in the history
now we can see our fits beautifully
  • Loading branch information
judgemt committed Sep 14, 2023
1 parent 17dc98c commit 45237c5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 3 additions & 5 deletions R/browse_evidence.R
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ browse_evidence <- function(results.dir = NULL){
# ppm isn't needed anymore; using spectral matrix ppm.
lib.data.processed <- lib.data.processed %>% lapply(function(x) {x$data <- NULL; x$ppm <- NULL; return(x)})

message('*** running patch to map lib.info to lib.data.processed ***')
# Library file may not match lib.info (may be smaller, as it is field-specific).
# Map them.

# add compound names as column in match.info
compound.names.refmat <- lapply(lib.data.processed, function(x) x$compound.name) %>% unlist
match.info$ref.name <- match.info$ref %>% compound.names.refmat[.]
Expand Down Expand Up @@ -767,8 +763,10 @@ server <- function(input, output, session) {
backfits,
rfs.used, # new object with inds of rfs which contributed to scores
lib.data.processed,
score.name = 'fsaxrval',
# # Spectral data:
# xmat, ppm,
# xmat,
ppm,
# Filtering thresholds:
ppm.tolerance = ppm.tolerance,
cutoff.residuals.feat = cutoff.residuals.feat,
Expand Down
2 changes: 1 addition & 1 deletion R/fastStack.R
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ denser_mat_to_df <- function(denser.mat){

# Calculate feature fills
# Interpolate more x points in
browser()

# df.feats <- addpoints_evenly(
# mat = f.stack[, ncol(f.stack):1], # must be increasing xvals
# xvals = rev(ppm[cols.x]), # must be increasing xvals
Expand Down
3 changes: 2 additions & 1 deletion R/select_evidence_refmet.R
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ select_evidence_refmet <- function(ref = NULL,
lib.data.processed,
score.name = 'fsaxrval',
# # Spectral data:
# xmat, ppm,
# xmat,
ppm,
# Filtering thresholds:
ppm.tolerance = pars$matching$filtering$ppm.tol,
cutoff.residuals.feat = .5,
Expand Down
1 change: 1 addition & 0 deletions man/select_evidence_refmet.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 45237c5

Please sign in to comment.