Skip to content
Snippets Groups Projects
Commit 662ee5c0 authored by Constantin Pape's avatar Constantin Pape
Browse files

Update migration files

parent 25fedacb
No related branches found
No related tags found
1 merge request!11New storage layout
from .master import make_cell_tables, make_nucleus_tables, make_cilia_tables from .master import make_cell_tables, make_nuclei_tables, make_cilia_tables
...@@ -97,8 +97,8 @@ def make_cell_tables(old_folder, folder, name, tmp_folder, resolution, ...@@ -97,8 +97,8 @@ def make_cell_tables(old_folder, folder, name, tmp_folder, resolution,
write_additional_table_file(table_folder) write_additional_table_file(table_folder)
def make_nucleus_tables(old_folder, folder, name, tmp_folder, resolution, def make_nuclei_tables(old_folder, folder, name, tmp_folder, resolution,
target='slurm', max_jobs=100): target='slurm', max_jobs=100):
# make the table folder # make the table folder
table_folder = os.path.join(folder, 'tables', name) table_folder = os.path.join(folder, 'tables', name)
os.makedirs(table_folder, exist_ok=True) os.makedirs(table_folder, exist_ok=True)
......
...@@ -20,7 +20,7 @@ def new_folder_structure(folder): ...@@ -20,7 +20,7 @@ def new_folder_structure(folder):
print("Creating folder", remote_folder) print("Creating folder", remote_folder)
else: else:
assert os.path.exists(image_folder), image_folder assert os.path.exists(image_folder), image_folder
os.makedirs(image_folder, exist_ok=True) os.makedirs(local_folder, exist_ok=True)
os.makedirs(remote_folder, exist_ok=True) os.makedirs(remote_folder, exist_ok=True)
...@@ -74,7 +74,7 @@ def update_image_dict(image_folder, image_dict): ...@@ -74,7 +74,7 @@ def update_image_dict(image_folder, image_dict):
image_dict.update(json.load(f)) image_dict.update(json.load(f))
with open(dict_out_file, 'w') as f: with open(dict_out_file, 'w') as f:
json.dump(f, sort_keys=True, indent=2) json.dump(image_dict, f, sort_keys=True, indent=2)
def update_image_data(folder): def update_image_data(folder):
...@@ -157,7 +157,7 @@ def update_segmentation_data(folder): ...@@ -157,7 +157,7 @@ def update_segmentation_data(folder):
else: else:
dynamic_seg_path = os.path.join(folder, 'misc', 'dynamic_segmentations.json') dynamic_seg_path = os.path.join(folder, 'misc', 'dynamic_segmentations.json')
with open(dynamic_seg_path, 'w') as f: with open(dynamic_seg_path, 'w') as f:
json.dump(dynamic_seg_dict, f) json.dump(dynamic_seg_dict, f, sort_keys=True, indent=2)
# update the tables # update the tables
update_tables(folder) update_tables(folder)
...@@ -180,10 +180,6 @@ def clean_up(version_folder): ...@@ -180,10 +180,6 @@ def clean_up(version_folder):
os.remove(bdv_server_config) os.remove(bdv_server_config)
def make_readme(version):
pass
# migrate version folder from old to new data layout # migrate version folder from old to new data layout
def migrate_version(version): def migrate_version(version):
version_folder = os.path.join(ROOT, version) version_folder = os.path.join(ROOT, version)
...@@ -199,13 +195,8 @@ def migrate_version(version): ...@@ -199,13 +195,8 @@ def migrate_version(version):
update_segmentation_data(version_folder) update_segmentation_data(version_folder)
# 4.) clean up: # 4.) clean up:
# - remove segmentations folder (make sure it's empty)
# - remove bdv server config
clean_up(version_folder) clean_up(version_folder)
# 5.) Make a readme for this version
make_readme(version)
# migrate all the data in the raw folder # migrate all the data in the raw folder
def migrate_rawfolder(): def migrate_rawfolder():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment