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

Bug ct duplicate #22

Merged
merged 37 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
b7e89b3
print
davidmeunier79 Oct 8, 2024
0a8af53
rig_only ct to t1
davidmeunier79 Oct 8, 2024
fac9526
rigid stereo as well
davidmeunier79 Oct 11, 2024
46ad9fa
rigid
davidmeunier79 Oct 11, 2024
572ed1a
second step
davidmeunier79 Oct 11, 2024
62b8ed3
res_file
davidmeunier79 Oct 11, 2024
4f8d2ba
nac_flag
davidmeunier79 Oct 11, 2024
5255945
reg aladin on stereo (not reg resample)
davidmeunier79 Oct 11, 2024
307b2cc
resample Ct
davidmeunier79 Oct 11, 2024
fe6933d
resample_ct_on_T1
davidmeunier79 Oct 11, 2024
b361644
aff_file
davidmeunier79 Oct 11, 2024
4cc9e22
out_file
davidmeunier79 Oct 11, 2024
95c9054
no nac
davidmeunier79 Oct 11, 2024
1e385d8
smooth before the end
davidmeunier79 Oct 29, 2024
8e81fec
smooth
davidmeunier79 Oct 29, 2024
ef856c0
Smooth
davidmeunier79 Oct 29, 2024
07bfd1a
smoothed_file
davidmeunier79 Oct 29, 2024
407c827
bin after smooth
davidmeunier79 Oct 30, 2024
02901e9
typo
davidmeunier79 Oct 30, 2024
7c98d90
petra_skull_bin
davidmeunier79 Oct 30, 2024
a3433bb
thresh
davidmeunier79 Oct 30, 2024
5457189
supress smooth + thresh + bin
davidmeunier79 Oct 30, 2024
8804add
flake8
davidmeunier79 Oct 31, 2024
8754d57
version 0.0.3
davidmeunier79 Oct 31, 2024
cd36bca
aling on stereo
davidmeunier79 Nov 4, 2024
92d02c8
res_file
davidmeunier79 Nov 4, 2024
c264f8b
outfile
davidmeunier79 Nov 4, 2024
cbe9f74
outfile
davidmeunier79 Nov 4, 2024
e2cc443
kmeans for ct
davidmeunier79 Nov 4, 2024
4c02755
pip install install ?
davidmeunier79 Nov 4, 2024
69a7c4c
Merge branch 'main' into bug_ct_duplicate
davidmeunier79 Nov 4, 2024
df22985
Merge branch 'main' into bug_ct_duplicate
davidmeunier79 Nov 4, 2024
eeee216
no T1 in name
davidmeunier79 Nov 5, 2024
f274a5b
name with T1
davidmeunier79 Nov 5, 2024
adae527
remove T1 from the name
davidmeunier79 Nov 5, 2024
0d1d5f8
head erode skin 9 (18 was too long and required for specific indiv only)
davidmeunier79 Nov 5, 2024
2f15e60
t1 back in name
davidmeunier79 Nov 5, 2024
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
5 changes: 3 additions & 2 deletions Dockerfile_testpypi
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ RUN pip3 install xvfbwrapper \
pbr \
nibabel==3.2.2 \
packaging \
pytest \
install \
pytest

RUN pip3 install install \
graphviz \
pybids \
nipype \
Expand Down
1 change: 0 additions & 1 deletion skullTo3d/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@

__version__ = '0.0.3'
7 changes: 4 additions & 3 deletions skullTo3d/pipelines/skull_pipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,8 @@ def create_skull_ct_pipe(name="skull_ct_pipe", params={}):
align_ct_on_T1 = pe.Node(interface=RegAladin(),
name="align_ct_on_T1")

align_ct_on_T1.inputs.rig_only_flag = True

skull_ct_pipe.connect(inputnode, 'ct',
align_ct_on_T1, "flo_file")

Expand Down Expand Up @@ -411,7 +413,7 @@ def create_skull_ct_pipe(name="skull_ct_pipe", params={}):
inputnode, ("indiv_params", parse_key, "ct_skull_mask_thr"),
ct_skull_mask_thr, "indiv_params")

skull_ct_pipe.connect(align_ct_on_stereo_T1, "out_file",
skull_ct_pipe.connect(align_ct_on_stereo_T1, 'out_file',
ct_skull_mask_thr, "in_file")
else:

Expand All @@ -426,7 +428,7 @@ def create_skull_ct_pipe(name="skull_ct_pipe", params={}):
params=parse_key(params, "ct_skull_auto_mask"),
name="ct_skull_auto_mask")

skull_ct_pipe.connect(align_ct_on_stereo_T1, "out_file",
skull_ct_pipe.connect(align_ct_on_stereo_T1, 'out_file',
ct_skull_auto_mask, "img_file")

skull_ct_pipe.connect(
Expand Down Expand Up @@ -849,7 +851,6 @@ def create_skull_petra_pipe(name="skull_petra_pipe", params={}):
if "petra_skull_fov" in params.keys():

# petra_skull_fov ####### [okey][json]

petra_skull_fov = NodeParams(
interface=RobustFOV(),
params=parse_key(params, "petra_skull_fov"),
Expand Down
8 changes: 4 additions & 4 deletions workflows/params_segment_macaque_ants_skull.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"t1_head_erode_skin":
{
"kernel_shape": "boxv",
"kernel_size": 18.0
"kernel_size": 9.0
},
"t1_skull_dilate":
{
Expand All @@ -179,11 +179,11 @@
{
"ct_skull_auto_mask":
{
"kmeans": false,
"kmeans": true,
"sample_bins": 30,
"distance": 10,
"operation": "higher",
"index": 3
"operation": "lower",
"index": 2
},
"ct_skull_dilate":
{
Expand Down
2 changes: 1 addition & 1 deletion workflows/segment_petra.py
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ def create_main_workflow(data_dir, process_dir, soft, species, subjects,
datasink, '@t1_native_skull_mask')

if "ct" in skull_dt and "skull_ct_pipe" in params.keys():
print("rename ct skull pipe")
print("rename ct skull pipe 1")

rename_all_skull_ct_derivatives(
params, main_workflow, segment_brain_pipe, skull_ct_pipe,
Expand Down
Loading