Skip to content

Commit

Permalink
renamed spim to SPIM (for BIDS compliance) (#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
akhanf authored Apr 2, 2024
1 parent e7ea754 commit 71c3201
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
10 changes: 5 additions & 5 deletions workflow/rules/atlasreg.smk
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ rule affine_reg:
desc=config["atlasreg"]["desc"],
stain=config["atlasreg"]["stain"],
level=config["atlasreg"]["level"],
suffix="spim.nii",
suffix="SPIM.nii",
),
output:
xfm_ras=bids(
Expand All @@ -79,7 +79,7 @@ rule affine_reg:
acq="{acq}",
space="{template}",
desc="affinewarped",
suffix="spim.nii",
suffix="SPIM.nii",
),
log:
bids(
Expand Down Expand Up @@ -111,7 +111,7 @@ rule deform_reg:
desc=config["atlasreg"]["desc"],
stain=config["atlasreg"]["stain"],
level=config["atlasreg"]["level"],
suffix="spim.nii",
suffix="SPIM.nii",
),
xfm_ras=rules.affine_reg.output.xfm_ras,
output:
Expand All @@ -133,7 +133,7 @@ rule deform_reg:
acq="{acq}",
space="{template}",
desc="deformwarped",
suffix="spim.nii",
suffix="SPIM.nii",
),
log:
bids(
Expand Down Expand Up @@ -167,7 +167,7 @@ rule resample_labels_to_zarr:
acq="{acq}",
desc="{desc}",
stain=config["atlasreg"]["stain"],
suffix="spim.ome.zarr.zip",
suffix="SPIM.ome.zarr.zip",
),
output:
zarr=temp(
Expand Down
6 changes: 3 additions & 3 deletions workflow/rules/bigstitcher.smk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rule zarr_to_bdv:
sample="{sample}",
acq="{acq}",
desc="{desc}",
suffix="spim.zarr",
suffix="SPIM.zarr",
),
metadata_json=rules.raw_to_metadata.output.metadata_json,
params:
Expand Down Expand Up @@ -208,7 +208,7 @@ rule fuse_dataset:
acq="{acq}",
desc="stitched{desc}",
stain="{stain}",
suffix="spim.zarr",
suffix="SPIM.zarr",
)
)
),
Expand Down Expand Up @@ -280,7 +280,7 @@ rule fuse_dataset_spark:
acq="{acq}",
desc="sparkstitched{desc}",
stain="{stain}",
suffix="spim.zarr",
suffix="SPIM.zarr",
)
)
),
Expand Down
4 changes: 2 additions & 2 deletions workflow/rules/common.smk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def get_all_targets():
datatype="micr",
sample="{sample}",
acq="{acq}",
suffix="spim.ome.zarr.zip",
suffix="SPIM.ome.zarr.zip",
),
subject=datasets.loc[i, "subject"],
sample=datasets.loc[i, "sample"],
Expand All @@ -30,7 +30,7 @@ def get_all_targets():
acq="{acq}",
res="{level}x",
stain="{stain}",
suffix="spim.nii",
suffix="SPIM.nii",
),
subject=datasets.loc[i, "subject"],
sample=datasets.loc[i, "sample"],
Expand Down
6 changes: 3 additions & 3 deletions workflow/rules/flatfield_corr.smk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rule fit_basic_flatfield_corr:
sample="{sample}",
acq="{acq}",
desc="raw",
suffix="spim.zarr",
suffix="SPIM.zarr",
),
params:
channel=lambda wildcards: get_stains(wildcards).index(wildcards.stain),
Expand Down Expand Up @@ -71,7 +71,7 @@ rule apply_basic_flatfield_corr:
sample="{sample}",
acq="{acq}",
desc="raw",
suffix="spim.zarr",
suffix="SPIM.zarr",
),
model_dirs=lambda wildcards: expand(
rules.fit_basic_flatfield_corr.output.model_dir,
Expand All @@ -88,7 +88,7 @@ rule apply_basic_flatfield_corr:
sample="{sample}",
acq="{acq}",
desc="flatcorr",
suffix="spim.zarr",
suffix="SPIM.zarr",
)
)
),
Expand Down
6 changes: 3 additions & 3 deletions workflow/rules/import.smk
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rule extract_dataset:
sample="{sample}",
acq="{acq}",
desc="raw",
suffix="spim",
suffix="SPIM",
)
)
),
Expand Down Expand Up @@ -49,7 +49,7 @@ rule raw_to_metadata:
datatype="micr",
sample="{sample}",
acq="{acq}",
suffix="spim.metadata.json",
suffix="SPIM.metadata.json",
),
benchmark:
bids(
Expand Down Expand Up @@ -100,7 +100,7 @@ rule tif_to_zarr:
sample="{sample}",
acq="{acq}",
desc="raw",
suffix="spim.zarr",
suffix="SPIM.zarr",
)
)
),
Expand Down
8 changes: 4 additions & 4 deletions workflow/rules/ome_zarr.smk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rule zarr_to_ome_zarr:
acq="{acq}",
desc="{desc}",
stain="{stain}",
suffix="spim.zarr",
suffix="SPIM.zarr",
),
stain=get_stains(wildcards),
desc=config["ome_zarr"]["desc"],
Expand All @@ -31,7 +31,7 @@ rule zarr_to_ome_zarr:
datatype="micr",
sample="{sample}",
acq="{acq}",
suffix="spim.ome.zarr",
suffix="SPIM.ome.zarr",
)
)
),
Expand Down Expand Up @@ -75,7 +75,7 @@ rule ome_zarr_to_nii:
datatype="micr",
sample="{sample}",
acq="{acq}",
suffix="spim.ome.zarr.zip",
suffix="SPIM.ome.zarr.zip",
),
params:
channel_index=lambda wildcards: get_stains(wildcards).index(wildcards.stain),
Expand All @@ -88,7 +88,7 @@ rule ome_zarr_to_nii:
acq="{acq}",
res="{level}x",
stain="{stain}",
suffix="spim.nii",
suffix="SPIM.nii",
),
benchmark:
bids(
Expand Down

0 comments on commit 71c3201

Please sign in to comment.