-
Notifications
You must be signed in to change notification settings - Fork 95
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
Add prefix to all output files #963
Conversation
It looks like the figure filenames are hardcoded into the HTML templates, so the prefixes are tough to account for. |
I could have a look at that. |
@eurunuela that would be awesome! Thanks! |
Let me know what you think @tsalo. |
It looks good to me. Thanks @eurunuela! |
Codecov ReportAll modified lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #963 +/- ##
==========================================
+ Coverage 89.00% 89.02% +0.01%
==========================================
Files 27 27
Lines 3411 3417 +6
Branches 622 622
==========================================
+ Hits 3036 3042 +6
Misses 227 227
Partials 148 148
☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In addition to the minor suggested change, the prefix isn't added to references.bib
or the figures
directory name.
I'd lean towards adding it for references.bib
since each run of the program will overwrite the file and that stylistically not great. The contents should always be identical so I'm fine if you don't want to add it.
I'd lean against adding it to figures
since all the files should be distinct in that directory, but figured I'd still flag it.
Otherwise LGTM
You're right, adding the prefix is a good idea. Most of the time, folks will run tedana with the same tree on each run. But there is the possibility that some people will want to run tedana with different settings on the same run, in which case the references file would contain different entries.
That was my thinking as well. As long as the figure files are unique, it should be fine. |
After approving, I noticed one minor thing that may or may not be worth changing. The four-echo integration test uses a pre-defined ICA mixing matrix: That file I don't see this as a major issue for this PR. The one problem I could see it happening is if someone is using another package to run ICA and sending those matricies to tedana. In that case, it would be their responsibility to appropriately name their mixing matrix files. That said, the supplied mixing matrix is copied without any checks on whether it's overwriting anything: |
@handwerkerd if it's alright, I think I'd like to leave that for a separate PR. I'd like to see this one merged in and I don't have much time to work on it further at the moment. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Thank you Taylor!
@tsalo It looks like the conflicts should be easy to resolve then merge. You want to do that? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noticed a few things that must have been removed with the merge that were causing tests to fail. With the changed I'm including, all the tests were passing for me.
Co-authored-by: Dan Handwerker <7406227+handwerkerd@users.noreply.github.com>
@handwerkerd sorry about screwing up the merge. I thought the conflicts were spurious, since I was under the (mistaken) impression that the only PR that had been merged since I last updated was your documentation one. |
Now I see what happened. #747 added the new system info fields that were causing the conflict & that was merged just last week. Since that does interact with his PR, maybe it's worth waiting for @eurunuela to check nothing got messed up with the system info, but the output looks fine to me. Since he already approved, if Eneko doesn't have time for one more check during the next few days, I'm fine with you merging. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like the conflicts were solved. Like @handwerkerd said, the outputs look fine.
Since I have two approvals, I'm going to merge. |
Closes #901 and closes #955.
Changes proposed in this pull request: