Skip to content

Commit 783bab3

Browse files
committed
Rename of tomo_preproc functions
1 parent fb5d0fb commit 783bab3

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/murfey/server/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def get_job_ids(tilt_series_id: int, appid: int) -> JobIDs:
189189
)
190190

191191

192-
def get_tomo_preproc_params(dcg_id: int, *args) -> db.TomographyProcessingParameters:
192+
def get_tomo_proc_params(dcg_id: int, *args) -> db.TomographyProcessingParameters:
193193
results = murfey_db.exec(
194194
select(db.TomographyProcessingParameters).where(
195195
db.TomographyProcessingParameters.dcg_id == dcg_id
@@ -1651,7 +1651,7 @@ def _flush_tomography_preprocessing(message: dict):
16511651
.where(db.DataCollectionGroup.session_id == session_id)
16521652
.where(db.DataCollectionGroup.tag == message["data_collection_group_tag"])
16531653
).first()
1654-
proc_params = get_tomo_preproc_params(collected_ids.id)
1654+
proc_params = get_tomo_proc_params(collected_ids.id)
16551655
if not proc_params:
16561656
visit_name = message["visit_name"].replace("\r\n", "").replace("\n", "")
16571657
logger.warning(
@@ -2151,7 +2151,7 @@ def feedback_callback(header: dict, message: dict) -> None:
21512151
]
21522152
tilts = get_all_tilts(relevant_tilt_series.id)
21532153
ids = get_job_ids(relevant_tilt_series.id, alignment_ids[2].id)
2154-
preproc_params = get_tomo_preproc_params(ids.dcgid)
2154+
preproc_params = get_tomo_proc_params(ids.dcgid)
21552155
stack_file = (
21562156
Path(message["mrc_out"]).parents[3]
21572157
/ "Tomograms"

src/murfey/server/api/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
get_job_ids,
4343
get_machine_config,
4444
get_microscope,
45-
get_tomo_preproc_params,
45+
get_tomo_proc_params,
4646
sanitise,
4747
templates,
4848
)
@@ -617,7 +617,7 @@ def post_foil_hole(
617617

618618

619619
@router.post("/sessions/{session_id}/tomography_processing_parameters")
620-
def register_tomo_preproc_params(
620+
def register_tomo_proc_params(
621621
session_id: MurfeySessionID, proc_params: ProcessingParametersTomo, db=murfey_db
622622
):
623623
session_processing_parameters = db.exec(
@@ -767,7 +767,7 @@ def register_completed_tilt_series(
767767
]
768768
tilts = get_all_tilts(ts.id)
769769
ids = get_job_ids(ts.id, collected_ids[3].id)
770-
preproc_params = get_tomo_preproc_params(ids.dcgid)
770+
preproc_params = get_tomo_proc_params(ids.dcgid)
771771

772772
first_tilt = db.exec(
773773
select(Tilt).where(Tilt.tilt_series_id == ts.id)

src/murfey/server/demo_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ def register_spa_proc_params(
475475

476476

477477
@router.post("/sessions/{session_id}/tomography_processing_parameters")
478-
def register_tomo_preproc_params(
478+
def register_tomo_proc_params(
479479
session_id: MurfeySessionID, proc_params: ProcessingParametersTomo, db=murfey_db
480480
):
481481
log.info(

0 commit comments

Comments
 (0)