dont change default behavior of learnCalibrationPlanFromEnergiesAndPeaks

usnistgov · Jun 12, 2024 · bf5af74 · bf5af74
1 parent 2cc92a8
commit bf5af74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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,