Skip to content

Commit 5a04898

Browse files
committed
bug fix for sinlge core use for DDA deconvolution
1 parent bca639c commit 5a04898

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

R/MSn_processing.R

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ PerformDDADeconvolution <- function(mSet= NULL,
327327
DecRes <- list()
328328
DecRes <- lapply(seq(col1),
329329
function(x, ls_orches, winSize, ppm1, ppm2, sn, filt,
330-
intensity_thresh, ionmode, db_path, decoOn){
330+
intensity_thresh, ionmode, db_path, decoOn, useEntropy){
331331
x1 <- ls_orches[[1]][x];
332332
x2 <- ls_orches[[3]][[ls_orches[[2]][x]]];
333333
if(any(x2 == 1)){showOutput = TRUE} else{showOutput = FALSE}
@@ -351,7 +351,7 @@ PerformDDADeconvolution <- function(mSet= NULL,
351351
ppm1, ppm2,
352352
sn, filt, intensity_thresh,
353353
ionmode, db_path,
354-
decoOn,
354+
decoOn,useEntropy,
355355
showOutput, thread_int, fileName);
356356
res},
357357
ls_orches = ls_orches,
@@ -363,7 +363,8 @@ PerformDDADeconvolution <- function(mSet= NULL,
363363
intensity_thresh = intensity_thresh,
364364
ionmode = ion_mode,
365365
db_path = database_path,
366-
decoOn = decoOn)
366+
decoOn = decoOn,
367+
useEntropy = useEntropy)
367368
}
368369

369370

@@ -1264,7 +1265,7 @@ MirrorPlotting <- function(spec.top,
12641265
if (is.null(spec.top) || is.null(spec.bottom)) {
12651266
stop("spec.top and spec.bottom cannot be NULL.")
12661267
}
1267-
1268+
#save(spec.top, spec.bottom, ppm, title, subtitle, cutoff_relative, file = "MirrorPlotting__results.rda")
12681269
top <- normalize_spectrum(spec.top, cutoff_relative)
12691270
bottom <- normalize_spectrum(spec.bottom, cutoff_relative)
12701271

@@ -1310,7 +1311,7 @@ MirrorPlotting <- function(spec.top,
13101311
p <- ggplot() +
13111312
geom_segment(data=top, aes(x = mz, xend = mz, y = 0, yend = normalized), color = "blue") +
13121313
geom_segment(data=bottom, aes(x = mz, xend = mz, y = 0, yend = -normalized), color = "red") +
1313-
geom_point(data=top, aes(x = mz, y = star_intensity), shape=18, color="red", size=3, na.rm = TRUE) +
1314+
geom_point(data=top, aes(x = mz, y = star_intensity), shape=18, color="red", size=2, na.rm = TRUE) +
13141315
labs(title = title, subtitle = subtitle, y = "Relative Intensity (%)", x = "m/z") +
13151316
theme_minimal() +
13161317
xlim(x_axis_limits) +

0 commit comments

Comments
 (0)