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.

Sign up for GitHub

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

fMRISurface related pull request #136

Merged
merged 9 commits into from
Oct 12, 2019
Merged

fMRISurface related pull request #136

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
72d1510
fMRISurface pipeline related changes
sivcek Sep 27, 2019
462b4d5
Switched to using mppmodecheck.shlib.
sivcek Sep 29, 2019
bc5b62a
Adjusted compliance check.
sivcek Oct 2, 2019
02d3ee9
Removed compliance check as it is not needed.
sivcek Oct 3, 2019
9ef5726
Removed sourcing the mppmodecheck.shlib.
sivcek Oct 3, 2019
27719cf
Set MSMSulc as the default registration option and added warning when…
sivcek Oct 9, 2019
d7c9334
Fixed a log_Warn bug, changed wording.
sivcek Oct 9, 2019
c447c16
Corrected a typo in warn message.
sivcek Oct 9, 2019
c160585
Split the warning into multiple lines.
sivcek Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions fMRISurface/GenericfMRISurfaceProcessingPipeline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
#!/bin/bash
#!/bin/bash
set -e

# Requirements for this script
# installed versions of: FSL (version 5.0.6), FreeSurfer (version 5.3.0-HCP) , gradunwarp (HCP version 1.0.2)
# installed versions of: FSL (version 5.0.6), FreeSurfer (version 5.3.0-HCP) , gradunwarp (HCP version 1.0.2)
sivcek marked this conversation as resolved.
Show resolved Hide resolved
# environment: use SetUpHCPPipeline.sh (or individually set FSLDIR, FREESURFER_HOME, HCPPIPEDIR, PATH - for gradient_unwarp.py)

########################################## PIPELINE OVERVIEW ##########################################
########################################## PIPELINE OVERVIEW ##########################################

# TODO

########################################## OUTPUT DIRECTORIES ##########################################
########################################## OUTPUT DIRECTORIES ##########################################

# TODO

# --------------------------------------------------------------------------------
# Load Function Libraries
# --------------------------------------------------------------------------------

source $HCPPIPEDIR/global/scripts/log.shlib # Logging related functions
source $HCPPIPEDIR/global/scripts/opts.shlib # Command line option functions
source ${HCPPIPEDIR}/global/scripts/log.shlib # Logging related functions
source ${HCPPIPEDIR}/global/scripts/opts.shlib # Command line option functions
source ${HCPPIPEDIR}/global/scripts/mppmodecheck.shlib # Checking validity of MPP mode selection

################################################ SUPPORT FUNCTIONS ##################################################

Expand Down Expand Up @@ -62,6 +63,17 @@ fi

RUN=`opts_GetOpt1 "--printcom" $@` # use ="echo" for just printing everything and not running the commands (default is to run)

# ------------------------------------------------------------------------------
# Check MMP Version
# ------------------------------------------------------------------------------

MPPMode=`opts_GetOpt1 "--mpp-mode" $@`
MPPMode=`opts_DefaultOpt $MPPMode "HCPStyleData"`
check_mpp_compliance "fMRISurface"

# --- END MPP Version Check


log_Msg "Path: ${Path}"
log_Msg "Subject: ${Subject}"
log_Msg "NameOffMRI: ${NameOffMRI}"
Expand Down
23 changes: 17 additions & 6 deletions fMRISurface/GenericfMRISurfaceProcessingPipeline_1res.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
#!/bin/bash
#!/bin/bash
set -e

# Requirements for this script
# installed versions of: FSL (version 5.0.6), FreeSurfer (version 5.3.0-HCP) , gradunwarp (HCP version 1.0.2)
# installed versions of: FSL (version 5.0.6), FreeSurfer (version 5.3.0-HCP) , gradunwarp (HCP version 1.0.2)
# environment: use SetUpHCPPipeline.sh (or individually set FSLDIR, FREESURFER_HOME, HCPPIPEDIR, PATH - for gradient_unwarp.py)

########################################## PIPELINE OVERVIEW ##########################################
########################################## PIPELINE OVERVIEW ##########################################

# TODO

########################################## OUTPUT DIRECTORIES ##########################################
########################################## OUTPUT DIRECTORIES ##########################################

# TODO

# --------------------------------------------------------------------------------
# Load Function Libraries
# --------------------------------------------------------------------------------

source $HCPPIPEDIR/global/scripts/log.shlib # Logging related functions
source $HCPPIPEDIR/global/scripts/opts.shlib # Command line option functions
source ${HCPPIPEDIR}/global/scripts/log.shlib # Logging related functions
source ${HCPPIPEDIR}/global/scripts/opts.shlib # Command line option functions
source ${HCPPIPEDIR}/global/scripts/mppmodecheck.shlib # Checking validity of MPP mode selection

################################################ SUPPORT FUNCTIONS ##################################################

Expand Down Expand Up @@ -62,6 +63,16 @@ fi

RUN=`opts_GetOpt1 "--printcom" $@` # use ="echo" for just printing everything and not running the commands (default is to run)

# ------------------------------------------------------------------------------
# Check MMP Version
# ------------------------------------------------------------------------------

MPPMode=`opts_GetOpt1 "--mpp-mode" $@`
MPPMode=`opts_DefaultOpt $MPPMode "HCPStyleData"`
check_mpp_compliance "fMRISurface"

# --- END MPP Version Check

log_Msg "Path: ${Path}"
log_Msg "Subject: ${Subject}"
log_Msg "NameOffMRI: ${NameOffMRI}"
Expand Down