Skip to content

feat: Migrating existing configs to include frame & ctf metadata #428

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

Merged
merged 61 commits into from
Apr 25, 2025
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
696d3ac
Updating ingestion config to v2 core
manasaV3 Jan 31, 2025
e0b8487
Adding CTF entity to config
manasaV3 Jan 31, 2025
ae2ccf6
Updating api to v2
manasaV3 Jan 31, 2025
69d5dc7
Adding validation for frame metadata
manasaV3 Jan 31, 2025
a9cb466
Migrating CTF entity in configs
manasaV3 Jan 31, 2025
8627ec0
Adding generated ctf and rawtlt files as fallback
manasaV3 Jan 31, 2025
7ae7ad0
Removing default keyphoto source as it is handled in the ingestion
manasaV3 Jan 31, 2025
0ac5618
Updating the mdoc file paths
manasaV3 Jan 31, 2025
efc9d36
Addinig frames dose rate config migration
manasaV3 Feb 1, 2025
63e34b3
Generating configs with failing stub dose_rate
manasaV3 Feb 1, 2025
1b6477a
Updating configs with failing stub dose_rate
manasaV3 Feb 3, 2025
d30885d
Adding documentation for gjensen config generation
manasaV3 Feb 21, 2025
f26bde0
Updating paths for mdoc and rawtlt to generated for jensen datasets
manasaV3 Feb 21, 2025
0f8c90d
Updating schema migration
manasaV3 Feb 21, 2025
8b438fa
Fix ctf configs
manasaV3 Feb 21, 2025
b41bfce
Merge remote-tracking branch 'origin/main' into mvenkatakrishnan/fnct…
uermel Mar 10, 2025
91b685c
first batch of updates
uermel Mar 10, 2025
486ac10
codegen
manasaV3 Mar 10, 2025
ffeb2d6
Merge remote-tracking branch 'origin/main' into mvenkatakrishnan/fnct…
uermel Mar 17, 2025
c2b4280
2nd batch of updates
uermel Mar 17, 2025
7e74c6e
dose rate for sim data
uermel Mar 18, 2025
42b1b3a
generalize per run mapping feature
uermel Mar 21, 2025
6db5a7e
Merge remote-tracking branch 'origin/main' into mvenkatakrishnan/fnct…
uermel Mar 25, 2025
f1a64d7
update cryoet-alignment dependency and 10009
uermel Mar 25, 2025
57780c1
Merge remote-tracking branch 'origin/main' into mvenkatakrishnan/fnct…
uermel Mar 26, 2025
7eb6acb
update lock file
uermel Mar 26, 2025
427ace4
fix some errors unnoticed during source validation.
uermel Mar 26, 2025
f47ebf8
fix 10005
uermel Mar 26, 2025
1c478a6
further fixes not caught in source validation
uermel Mar 26, 2025
fa9ca5b
further fixes not caught in source validation
uermel Mar 26, 2025
f630b1a
further updates.
uermel Mar 27, 2025
ea16081
fix staging validation by excluding new metadata file
uermel Mar 27, 2025
58b6c67
more fixes
uermel Mar 27, 2025
9d66b3c
add missing frames
uermel Mar 27, 2025
28e5029
fix frame import for 10009
uermel Mar 27, 2025
ea0f5b5
fix frame import for 10009
uermel Mar 27, 2025
602b5d4
fix gain import
uermel Mar 28, 2025
fd3aa3a
more fixes for 10002 and 10009
uermel Mar 28, 2025
9d3b5a7
add CTF
uermel Apr 8, 2025
e24cd64
first batch jensen
uermel Apr 10, 2025
1ef9274
Merge remote-tracking branch 'origin/main' into mvenkatakrishnan/fnct…
uermel Apr 10, 2025
7870840
allow manual exclude
uermel Apr 14, 2025
90a1a61
complete all jensen
uermel Apr 14, 2025
d04440a
fix dose rate
uermel Apr 14, 2025
7af4c2c
lint
uermel Apr 14, 2025
d82a6b6
update tilt angle validation to handle double-0 tilt
uermel Apr 14, 2025
68f2f78
fix 259
uermel Apr 14, 2025
c8a8bc8
apply quality score correctly
uermel Apr 15, 2025
7fc77c8
validate tilt range correctly
uermel Apr 15, 2025
a211859
lint
uermel Apr 15, 2025
634b9be
override total_flux
uermel Apr 15, 2025
d93d0e1
Merge remote-tracking branch 'origin/main' into mvenkatakrishnan/fnct…
uermel Apr 15, 2025
0b2cebd
deal with cases where tilt series is missing.
uermel Apr 15, 2025
df3d4d3
fix 185 and 195
uermel Apr 15, 2025
480ce46
add CTF for pahntom
uermel Apr 16, 2025
a4596bf
Update ingestion_tools/scripts/data_validation/standardized/fixtures/…
uermel Apr 16, 2025
080dcf8
address review, remove bad defaults for quality
uermel Apr 16, 2025
86096e4
Merge remote-tracking branch 'origin/mvenkatakrishnan/fnctf_config_mi…
uermel Apr 16, 2025
f074966
Suggested changes
Bento007 Apr 22, 2025
661aba4
Suggested changes 2
Bento007 Apr 24, 2025
315ed34
regenerate gjensen configs
Bento007 Apr 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 6 additions & 7 deletions ingestion_tools/dataset_configs/10301.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@ alignments:
list_globs:
- '{run_name}/AreTomo/{run_name}_dose-filt.tlt'
- '{run_name}/AreTomo/{run_name}_dose-filt.xf'
- metadata:
format: ARETOMO3
method_type: patch_tracking
sources:
- source_multi_glob:
list_globs:
- '{run_name}/ctffind4/ctfphaseflip_ctffind4.txt'
annotations:
- metadata:
annotation_method: Template matching + manual filtering + 3D classification filtering
Expand Down Expand Up @@ -198,6 +191,12 @@ collection_metadata:
- source_multi_glob:
list_globs:
- '{run_name}/{run_name}.mdoc'
ctf:
- metadata:
format: CTFFIND
sources:
- source_glob:
list_glob: '{run_name}/ctffind4/ctfphaseflip_ctffind4.txt'
dataset_keyphotos:
- sources:
- literal:
Expand Down
13 changes: 6 additions & 7 deletions ingestion_tools/dataset_configs/10302.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@ alignments:
list_globs:
- chlamy_visual_proteomics/{run_name}/AreTomo/{run_name}_dose-filt.tlt
- chlamy_visual_proteomics/{run_name}/AreTomo/{run_name}_dose-filt.xf
- metadata:
format: ARETOMO3
method_type: patch_tracking
sources:
- source_multi_glob:
list_globs:
- chlamy_visual_proteomics/{run_name}/ctffind4/ctfphaseflip_ctffind4.txt
annotations: []
collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- chlamy_visual_proteomics/{run_name}/{run_name}.mdoc
ctf:
- metadata:
format: CTFFIND
sources:
- source_glob:
list_glob: 'chlamy_visual_proteomics/{run_name}/ctffind4/ctfphaseflip_ctffind4.txt'
dataset_keyphotos:
- sources:
- literal:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10014.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -68,11 +69,20 @@ depositions:
- literal:
value:
- 10014
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/{mapped_frame_name}/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10015.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -68,11 +69,20 @@ depositions:
- literal:
value:
- 10014
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/3dimage_*/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10016.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -68,11 +69,20 @@ depositions:
- literal:
value:
- 10014
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/3dimage_*/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10017.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -65,11 +66,20 @@ depositions:
- literal:
value:
- 10014
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/3dimage_*/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10018.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -64,11 +65,20 @@ depositions:
- literal:
value:
- 10014
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/3dimage_*/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10019.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -63,11 +64,20 @@ depositions:
- literal:
value:
- 10014
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/3dimage_*/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10020.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -68,11 +69,20 @@ depositions:
- literal:
value:
- 10014
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/3dimage_*/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10021.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -63,11 +64,20 @@ depositions:
- literal:
value:
- 10049
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/3dimage_*/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10022.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -61,11 +62,20 @@ depositions:
- literal:
value:
- 10018
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/3dimage_*/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10023.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -63,11 +64,20 @@ depositions:
- literal:
value:
- 10018
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/{mapped_frame_name}/*.rawtlt'
runs:
- sources:
Expand Down
12 changes: 11 additions & 1 deletion ingestion_tools/dataset_configs/gjensen/10024.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ collection_metadata:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/rawdata/*.mdoc'
- '{run_name}/*/*.mdoc'
- '{run_name}/generated/*.mdoc'
dataset_keyphotos:
- sources:
- literal:
Expand Down Expand Up @@ -62,11 +63,20 @@ depositions:
- literal:
value:
- 10018
frames:
- metadata:
dose_rate: 0.0
is_gain_corrected: false
sources:
- literal:
value:
- default
rawtilts:
- sources:
- source_multi_glob:
list_globs:
- '{run_name}/file_*/*.rawtlt'
- '{run_name}/generated/*.rawtlt'
- '{run_name}/3dimage_*/*.rawtlt'
runs:
- sources:
Expand Down
Loading
Loading