-
Notifications
You must be signed in to change notification settings - Fork 272
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
update SingleSubjectConcat with frame selection; update MSMAll pipeline #247
Conversation
I will point out that this PR is currently marked as a draft, which suggests it isn't ready for full scrutiny yet. |
Thanks for your comments. I have addressed all of them. |
Please produce some test outputs after you address Tim's concern above. |
Are you pointing to the duration calculation part? |
For the whole pipeline test, here are the arguments. Now The examples for output files:
|
Is this a temporary file: /media/myelin/brainmappers/Connectome_Project/YA_HCP_ReTest_Final/103818/MNINonLinear/Results/rfMRI_REST_38mins26secs_400To1200/frames_duration.txt? |
No, this is an output file that aims to let user know explicitly how long this concatenation is and which frame range is selected. |
But that is in the file name now, right? |
The file name is set by user. This file is calculated via the script. I think we can provide a correct source on this. |
I see, we have gone back and forth on this. I know Tim had concerns about this being programmatically set. Keeping a file around and having the user set the values also seems not ideal. Perhaps we should not keep the file and programmatically set things? |
This |
Logging would make a lot of sense, though I see the desirability of programmatically setting the file too. |
The latest commit deletes the matlab run mode from |
Let's try to come to consensus with @coalsont on the programmatic vs user defined naming before we merge this. |
As I understand it, he specified I think it is fine to generate a "frames_duration.txt" file when using non-default start and end frames (or always, why not), I don't see a drawback to having that information inside that file, since it appears to be in a folder specific to that concatenation. As long as the output filenames are built with |
If you aren't already, please test the edit I made from |
Sounds like Tim has said what he wants, so if this is fully tested I think we can merge it. |
…address comments; tested
I have updated a commit to address Tim's comments. Regarding the default behavior of an empty EndFrame, here are two passed tests. Test1: StartFrame=200; EndFrame=""; Test2: StartFrame=1; EndFrame=""; |
Looks like this needs some cleanup to be able to merge... |
Which part exactly? |
I think the current commit should have addressed all the comments above. |
Still has conflicts to merge. |
The conflicts were caused by merging master into the remote branch. Rebasing would have kept it able to rebase cleanly. Squash and merge says it will work cleanly, and might be a better choice than adding the 15 commits separately. |
I opened a new PR where there's only one commit including the latest changes. I wonder if this is an appropriate solution. |
"Squash and merge" is an option on github, you didn't need to do anything. I'd rather merge this one, because we know we reviewed the code in it, than to check that the new one has exactly the same changes. |
Okay, I see. |
Background
Previously the script
SingleSubjectConcat.sh
doesn't enable the frame range selection for each fMRI runs. Hence, the MSMAll is limited to be only applied to the full timeseries.Main changes
SingleSubjectConcat.sh
;SingleSubjectConcat.sh
;StartFrame
andEndFrame
inSingleSubjectConcat.sh
andMSMAllPipeline.sh
;SingleSubjectConcat.sh
;Evaluation
One subject with resting state fMRI is evaluated. No error.