From bf5af74fdaad875e2e939997298e2864679c998a Mon Sep 17 00:00:00 2001 From: ggggggggg Date: Wed, 12 Jun 2024 16:29:25 -0600 Subject: [PATCH] dont change default behavior of learnCalibrationPlanFromEnergiesAndPeaks --- mass/off/channels.py | 2 +- tests/off/test_nsls2_2024.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mass/off/channels.py b/mass/off/channels.py index 585f9214..5ceeeeae 100644 --- a/mass/off/channels.py +++ b/mass/off/channels.py @@ -673,7 +673,7 @@ def calibrateFollowingPlan(self, uncalibratedName, calibratedName="energy", curv return results @add_group_loop - def learnCalibrationPlanFromEnergiesAndPeaks(self, attr, states, ph_fwhm, line_names, maxacc, polynomial=True): + def learnCalibrationPlanFromEnergiesAndPeaks(self, attr, states, ph_fwhm, line_names, maxacc, polynomial=False): peak_ph_vals, _peak_heights = mass.algorithms.find_local_maxima(self.getAttr(attr, indsOrStates=states), ph_fwhm) if polynomial: _name_e, _energies_out, opt_assignments = mass.algorithms.find_opt_assignment_polynomial(peak_ph_vals, line_names, maxacc=maxacc) diff --git a/tests/off/test_nsls2_2024.py b/tests/off/test_nsls2_2024.py index 27fbbb71..49ac20f9 100644 --- a/tests/off/test_nsls2_2024.py +++ b/tests/off/test_nsls2_2024.py @@ -100,6 +100,7 @@ def test_nsls2_2024(): states=["CAL0"], ph_fwhm=50, line_names=["CKAlpha","NKAlpha","OKAlpha", "FeLAlpha", "NiLAlpha", "CuLAlpha"], + polynomial=True, maxacc=1e4 ) data.learnPhaseCorrection(uncorrectedName="filtValueDC", @@ -112,6 +113,7 @@ def test_nsls2_2024(): states=["CAL0"], ph_fwhm=50, line_names=["CKAlpha","NKAlpha","OKAlpha", "FeLAlpha", "NiLAlpha", "CuLAlpha"], + polynomial=True, maxacc=1e4 ) data.calibrateFollowingPlan("filtValue5LagDCPC", overwriteRecipe=True,