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

testing and fixing outdated atlas generation scripts #249

Merged
merged 8 commits into from
Mar 1, 2024
Merged

testing and fixing outdated atlas generation scripts #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
27c035a
first commit, quick fixes of old syntax to try running it on the HPC
viktorpm Feb 27, 2024
0c1584a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 27, 2024
a3e6dcd
humanatlas.py: from brainio import brainio has to be installed manually
viktorpm Feb 27, 2024
a8f4631
fixing azba_zfish issue: replace smoothLaplacian with smooth in mesh_…
viktorpm Feb 28, 2024
58495b6
fixing kim_developmental_ccf_mouse.py issue: pandas syntax and df han…
viktorpm Feb 29, 2024
5d4f4b0
fixing allen_cord.py: updating source URL
viktorpm Feb 29, 2024
a69bf73
adding packages to dependencies
viktorpm Mar 1, 2024
4ab0f5e
removing unnecessary comments
viktorpm Mar 1, 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
4 changes: 1 addition & 3 deletions brainglobe_atlasapi/atlas_generation/atlas_scripts/admba_3d_dev_mouse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,7 @@ def create_atlas(
if isinstance(working_dir, str):
working_dir = Path(working_dir)
# Generated atlas path:
working_dir = (
working_dir / "brainglobe_workingdir" / atlas_config.atlas_name
)
working_dir = working_dir / "admba_3d_dev_mouse" / atlas_config.atlas_name
working_dir.mkdir(exist_ok=True, parents=True)

download_dir_path = working_dir / "downloads"
Expand Down
5 changes: 1 addition & 4 deletions brainglobe_atlasapi/atlas_generation/atlas_scripts/allen_cord.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,7 @@ def create_atlas(working_dir):
ORIENTATION = "asr"
RESOLUTION = (20, 10, 10)
ROOT_ID = 250
ATLAS_FILE_URL = (
"https://md-datasets-cache-zipfiles-prod.s3.eu-west-1."
"amazonaws.com/4rrggzv5d5-1.zip"
)
ATLAS_FILE_URL = "https://prod-dcd-datasets-cache-zipfiles.s3.eu-west-1.amazonaws.com/4rrggzv5d5-1.zip"
ATLAS_PACKAGER = "MetaCell LLC, Ltd."

download_dir_path = working_dir / "downloads"
Expand Down
6 changes: 4 additions & 2 deletions brainglobe_atlasapi/atlas_generation/atlas_scripts/kim_developmental_ccf_mouse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,10 @@ def create_atlas(
df = pd.read_csv(structures_file)
clean_up_df_entries(df)

df.loc[len(df)] = ["root", ROOT_ID, "root", ROOT_ID]
df.append(["root", ROOT_ID, "root", ROOT_ID])
new_row = pd.DataFrame(
[["root", ROOT_ID, "root", ROOT_ID]], columns=df.columns
)
df = pd.concat([df, new_row], ignore_index=True)

id_dict = dict(zip(df["ID"], df["Parent ID"]))

Expand Down
4 changes: 2 additions & 2 deletions brainglobe_atlasapi/atlas_generation/mesh_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ def extract_mesh_from_mask(
mesh = mesh.extractLargestRegion()

# decimate
mesh.decimate(decimate_fraction, method="pro")
mesh.decimate_pro(decimate_fraction)

if smooth:
mesh.smoothLaplacian()
mesh.smooth()

if obj_filepath is not None:
write(mesh, str(obj_filepath))
Expand Down
4 changes: 2 additions & 2 deletions brainglobe_atlasapi/atlas_generation/volume_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import os

import imio
import brainglobe_utils.image_io as image_io
import numpy as np


Expand Down Expand Up @@ -85,7 +85,7 @@ def load_labelled_volume(data, vmin=0, alpha=1, **kwargs):
raise FileNotFoundError(f"Volume data file {data} not found")

try:
data = imio.load_any(data)
data = image_io.load_any(data)
except Exception as e:
raise ValueError(
f"Could not load volume data from file: {data} - {e}"
Expand Down
4 changes: 4 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ dependencies = [
"treelib",
"vedo",
"xmltodict",
"scikit-image",
"brainio",
"brainglobe-utils",

]
dynamic = ["version"]

Expand Down
Loading