[FIX] Bug fixes from adding KCNI name support#267
Merged
josephmje merged 6 commits intoTIGRLab:masterfrom Mar 18, 2020
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #267 +/- ##
==========================================
+ Coverage 30.81% 31.04% +0.23%
==========================================
Files 54 54
Lines 8396 8430 +34
==========================================
+ Hits 2587 2617 +30
- Misses 5809 5813 +4
Continue to review full report at Codecov.
|
jerdra
approved these changes
Mar 12, 2020
josephmje
reviewed
Mar 12, 2020
| '(?!.+PHA)(?P<subject>[^_]+)_' \ | ||
| '(?P<subject>[^_]+)(?<!PHA)_' \ | ||
| '(?P<timepoint>[^_]+)_' \ | ||
| '(?!MR)(?!SE)(?P<session>[^_]+))' |
Contributor
There was a problem hiding this comment.
is the MR and SE here a hack for dealing with phantoms?
Contributor
Author
There was a problem hiding this comment.
That and to ensure KCNI IDs (correctly formed or not) won't match. We can't just restrict to numeric sessions only because of prelapse (and possibly others).
josephmje
approved these changes
Mar 18, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes a problem where scan tags with the substring "PHA" were being flagged as invalid, and adds tests to catch this and other similar tag issues, and also reverts some of the changes made to xnat_fetch_sessions because I forgot that their server's experiments are not meaningful and it isn't really necessary to get them to switch to KCNI format.