Skip to content

Commit 3097828

Browse files
committed
remove race condition for sed_config.yaml detetion from test_processor.py
1 parent c7ac253 commit 3097828

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

tests/test_processor.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,18 @@ def test_momentum_correction_workflow(features: np.ndarray):
273273
)
274274
assert len(processor.mc.pouter_ord) == rotsym
275275
processor.generate_splinewarp(use_center=include_center)
276-
processor.save_splinewarp(filename=f"sed_config{len(features)}.yaml", overwrite=True)
276+
processor.save_splinewarp(
277+
filename=f"sed_config_momentum_correction{len(features)}.yaml",
278+
overwrite=True,
279+
)
277280
pouter_ord = processor.mc.pouter_ord
278281
cdeform_field = processor.mc.cdeform_field
279282
rdeform_field = processor.mc.rdeform_field
280283
# load features
281284
processor = SedProcessor(
282285
folder=df_folder,
283286
config=config,
284-
folder_config=f"sed_config{len(features)}.yaml",
287+
folder_config=f"sed_config_momentum_correction{len(features)}.yaml",
285288
user_config={},
286289
system_config={},
287290
)
@@ -290,7 +293,7 @@ def test_momentum_correction_workflow(features: np.ndarray):
290293
np.testing.assert_allclose(processor.mc.pouter_ord, pouter_ord)
291294
np.testing.assert_allclose(processor.mc.cdeform_field, cdeform_field)
292295
np.testing.assert_allclose(processor.mc.rdeform_field, rdeform_field)
293-
os.remove(f"sed_config{len(features)}.yaml")
296+
os.remove(f"sed_config_momentum_correction{len(features)}.yaml")
294297

295298

296299
def test_pose_adjustment():
@@ -378,10 +381,11 @@ def test_momentum_calibration_workflow():
378381
apply=True,
379382
)
380383
assert processor.mc.calibration["kx_scale"] != processor.mc.calibration["ky_scale"]
381-
processor.save_momentum_calibration()
384+
processor.save_momentum_calibration(filename="sed_config_momentum_calibration.yaml")
382385
processor = SedProcessor(
383386
folder=df_folder,
384387
config=config,
388+
folder_config="sed_config_momentum_calibration.yaml",
385389
user_config={},
386390
system_config={},
387391
)
@@ -392,7 +396,7 @@ def test_momentum_calibration_workflow():
392396
)
393397
assert "kx" in processor.dataframe.columns
394398
assert "ky" in processor.dataframe.columns
395-
os.remove("sed_config.yaml")
399+
os.remove("sed_config_momentum_calibration.yaml")
396400

397401

398402
def test_energy_correction():
@@ -521,19 +525,22 @@ def test_energy_calibration_workflow(energy_scale: str, calibration_method: str)
521525
method=calibration_method,
522526
)
523527
assert processor.ec.calibration["energy_scale"] == energy_scale
524-
processor.save_energy_calibration()
528+
processor.save_energy_calibration(
529+
filename=f"sed_config_energy_calibration_{energy_scale}-{calibration_method}.yaml",
530+
)
525531
processor.append_energy_axis()
526532
assert "energy" in processor.dataframe.columns
527533
processor = SedProcessor(
528534
folder=df_folder + "../mpes/",
529535
config=config,
536+
folder_config=f"sed_config_energy_calibration_{energy_scale}-{calibration_method}.yaml",
530537
user_config={},
531538
system_config={},
532539
)
533540
processor.append_energy_axis(preview=True)
534541
assert "energy" in processor.dataframe.columns
535542
assert processor.attributes["energy_calibration"]["calibration"]["energy_scale"] == energy_scale
536-
os.remove("sed_config.yaml")
543+
os.remove(f"sed_config_energy_calibration_{energy_scale}-{calibration_method}.yaml")
537544

538545

539546
def test_delay_calibration_workflow():

0 commit comments

Comments
 (0)