Skip to content
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.

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

getEICs fix #31

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

getEICs fix #31

wants to merge 5 commits into from

Conversation

trljcl
Copy link

@trljcl trljcl commented May 22, 2018

No description provided.

trljcl added 5 commits May 16, 2018 16:40
xcmsRaw object @scantime updated to match parent xcmsSet object @rt$corrected, where these are present.  This is essential to ensure EICs generated for correlations use the correct rt boundaries
getEICs() failing when multiple EICs extracted from 2 or more files as these are out of order compared to the pspectra index. To fix, a template xeic@eic list created and then filled out of order as necessary by lapply().  xraw scantimes also updated from parent xcmsSet object, and other cosmetic changes to cat() outputs
to reflect that an xcmsRaw() object is not input
getAllPeakEICs assumes each scan has the same RT accross all samples.  Fixed by approximating the scans to the rt range for the sample with the longest rt range
Copy link
Owner

@sneumann sneumann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, any chance we can have a unit test checking for the changes ?
Can you have a look at the failing travis ? Anything I'd need to do on our side ?


pspecS <- pspec[which(object@psSamples[pspec] == smpls[a])]
## getting ALL peaks from the current sample (not that bad)
peaks <- CAMERA:::getPeaks(object@xcmsSet, smpls[a])
eic <- lapply (pspecS, function(pc) {
invisible(lapply (pspecS, function(pc) {
cnt <<- cnt + 1
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<<- immediately jumps at me. Any chance to avoid that ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this would be an issue, becuase as I understand it <<- applies to the parent environment, which in this case is PlotEICs() where cnt is assigned at line 17 (and so not to the the global environment)?

@trljcl
Copy link
Author

trljcl commented Mar 21, 2020

incorporates all changes to date

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants