Various PSX fixes

Packages/MIES/MIES_Cache.ipf

@@ -462,7 +462,7 @@ End
 /// @param psxParameters JSON dump of the psx/psxKernel operation parameters
 Function/S CA_PSXEventsKey(string comboKey, string psxParameters)
 
-	return CA_PSXBaseKey(comboKey, psxParameters) + " Events " + ":Version 2"
+	return CA_PSXBaseKey(comboKey, psxParameters) + " Events " + ":Version 3"
 End
 
 Function/S CA_PSXOperationKey(string comboKey, string psxParameters)
@@ -472,7 +472,7 @@ End
 
 Function/S CA_PSXAnalyzePeaks(string comboKey, string psxParameters)
 
-	return CA_PSXBaseKey(comboKey, psxParameters) + " Analyze Peaks " + ":Version 2"
+	return CA_PSXBaseKey(comboKey, psxParameters) + " Analyze Peaks " + ":Version 3"
 End
 
 /// @brief Return the key for the igor info entries
@@ -512,6 +512,11 @@ Function/S CA_GetLabnotebookNamesKey(WAVE/Z/T textualValues, WAVE/Z/T numericalV
 	return "Version 1:" + Hash(key, HASH_SHA2_256)
 End
 
+Function/S CA_GetGoodFFTSizesKeys()
+
+	return "GetGoodFFTSizes Version 1"
+End
+
 ///@}
 
 /// @brief Make space for one new entry in the cache waves

Packages/MIES/MIES_Constants.ipf

@@ -1933,6 +1933,14 @@ Constant SF_DM_NORMAL     = 1
 Constant SF_DM_SUBWINDOWS = 2
 ///@}
 
+/// @name Constants for SF_SetStatusDisplay
+/// @anchor SweepFormulaStatusDisplayModes
+///@{
+Constant SF_MSG_OK    = 1
+Constant SF_MSG_ERROR = 0
+Constant SF_MSG_WARN  = -1
+///@}
+
 /// @name Parameters for GetTTLLabnotebookEntry()
 /// @anchor LabnotebookTTLNames
 ///
@@ -2343,12 +2351,13 @@ Constant SECONDS_PER_DAY = 86400
 StrConstant DB_AXIS_PART_EPOCHS = "_EP"
 ///@}
 
-StrConstant SF_OP_PSX               = "psx"
-StrConstant SF_OP_PSX_KERNEL        = "psxKernel"
-StrConstant SF_OP_PSX_STATS         = "psxStats"
-StrConstant SF_OP_PSX_RISETIME      = "psxRiseTime"
-StrConstant SF_OP_PSX_PREP          = "psxPrep"
-StrConstant SF_OP_PSX_DECONV_FILTER = "psxDeconvFilter"
+StrConstant SF_OP_PSX                  = "psx"
+StrConstant SF_OP_PSX_KERNEL           = "psxKernel"
+StrConstant SF_OP_PSX_STATS            = "psxStats"
+StrConstant SF_OP_PSX_RISETIME         = "psxRiseTime"
+StrConstant SF_OP_PSX_PREP             = "psxPrep"
+StrConstant SF_OP_PSX_DECONV_BP_FILTER = "psxDeconvBPFilter"
+StrConstant SF_OP_PSX_SWEEP_BP_FILTER  = "psxSweepBPFilter"
 
 /// @name Available PSX states
 /// @anchor PSXStates
@@ -2377,10 +2386,12 @@ Constant PSX_MARKER_UNDET  = 18
 /// @name Custom error codes for PSX_FitEventDecay()
 /// @anchor FitEventDecayCustomErrors
 ///@{
-Constant PSX_DECAY_FIT_ERROR = -10000
+Constant PSX_DECAY_FIT_ERROR               = -10000
+Constant PSX_DECAY_FIT_INVALID_RANGE_ERROR = -10001
+
 ///@}
 
-StrConstant PSX_STATS_LABELS = "Average;Median;Average Deviation;Standard deviation;Skewness;Kurtosis"
+StrConstant PSX_STATS_LABELS = "Average;Median;Average Deviation;Standard deviation;Skewness;Kurtosis;Lower quartile;Upper quartile;Inter-quartile range;Median absolute deviation;Most frequent value"
 
 /// @name Horizontal offset modes in all event graph
 ///
@@ -2393,9 +2404,8 @@ Constant PSX_HORIZ_OFFSET_PEAK  = 1
 Constant PSX_HORIZ_OFFSET_SLEW  = 2
 ///@}
 
-Constant PSX_DECONV_FILTER_DEF_LOW   = 500
-Constant PSX_DECONV_FILTER_DEF_HIGH  = 50
-Constant PSX_DECONV_FILTER_DEF_ORDER = 7
+Constant PSX_SWEEP_FILTER_DEF_ORDER  = 4
+Constant PSX_DECONV_FILTER_DEF_ORDER = 4
 
 StrConstant PSX_JWN_COMBO_KEYS_NAME = "ComboKeys"
 

Packages/MIES/MIES_MiesUtilities_Algorithm.ipf

@@ -641,3 +641,80 @@ threadsafe Function/WAVE FindIndizes(WAVE numericOrTextWave, [variable col, stri
 
 	return result
 End
+
+/// @brief Band‑pass filters a wave while automatically reducing IIR filter
+/// order until the output contains no NaNs/Infs and its SEM is not larger than
+/// the original (simple ringing detection).
+///
+/// @param src      – input wave
+/// @param fHigh    – pass‑band edge frequencies in Hz (Igor’s band‑pass requires fLow > fHigh; the routine swaps them if needed)
+/// @param fLow     – low part
+/// @param maxOrder – starting (maximum) IIR filter order to try (>0)
+///
+///  Logic: iteratively lowers the filter order until three conditions are met:
+///           1. FilterIIR executes without error.
+///           2. WaveStats reports       V_numNaNs = 0 and V_numInfs = 0.
+///           3. SEM(filtered) ≤ SEM(original).
+///
+/// @retval realOrder filter order that finally succeeded (NaN if every order failed)
+/// @retval filtered filtered data
+Function [variable realOrder, WAVE filtered] BandPassWithRingingDetection(WAVE src, variable fHigh, variable fLow, variable maxOrder)
+
+	variable err, samp, semOrig, offset, i
+	string msg
+
+	ASSERT(IsInteger(maxOrder) && maxOrder > 0 && isEven(maxOrder), "maxOrder must be a positive and even integer")
+
+	// Igor band-pass expects fLow > fHigh
+	[fHigh, fLow] = MinMax(fLow, fHigh)
+
+	// Sampling rate (Hz) – assumes X scaling is in milliseconds
+	samp = 1 / (DeltaX(src) * MILLI_TO_ONE)
+
+	// Pre-compute SEM(original) once
+	WaveStats/Q src
+	semOrig = V_sem
+	offset  = v_avg
+	ASSERT(V_numNaNs == 0 && V_numInfs == 0, "Expected only finite value in input data")
+
+	// Prepare destination wave
+	Duplicate/FREE src, filtered
+
+	for(i = maxOrder; i > 0; i -= 2)
+		Multithread filtered = src - offset
+
+		FilterIIR/LO=(fLow / samp)/HI=(fHigh / samp)/DIM=(ROWS)/ORD=(i) filtered; err = GetRTError(1)
+		if(err)
+			continue
+		endif
+
+		WaveStats/Q filtered
+		if(V_numNaNs > 0 || V_numInfs > 0)
+			sprintf msg, "V_numNaNs: %g, V_numInfs: %g", V_numNaNs, V_numInfs
+			DEBUGPRINT(msg)
+
+			// bad numerical output → lower order
+			continue
+		endif
+
+		if(V_sem > semOrig)
+			sprintf msg, "V_sem: %g,semOrig: %g", V_sem, semOrig
+			DEBUGPRINT(msg)
+
+			// noisier than original → ringing
+			continue
+		endif
+
+		Multithread filtered += offset
+
+		sprintf msg, "maxOrder: %g, realOrder: %g", maxOrder, i
+		DEBUGPRINT(msg)
+
+		return [i, filtered]
+	endfor
+
+	sprintf msg, "maxOrder: %g, realOrder: NaN", maxOrder
+	DEBUGPRINT(msg)
+
+	return [NaN, $""]
+End

Packages/MIES/MIES_SweepFormula.ipf

@@ -184,10 +184,6 @@ static StrConstant SF_PLOTTER_GUIDENAME = "HOR"
 
 static StrConstant SF_XLABEL_USER = ""
 
-static Constant SF_MSG_OK    = 1
-static Constant SF_MSG_ERROR = 0
-static Constant SF_MSG_WARN  = -1
-
 static Constant SF_NUMTRACES_ERROR_THRESHOLD = 10000
 static Constant SF_NUMTRACES_WARN_THRESHOLD  = 1000
 
@@ -252,7 +248,8 @@ Function/WAVE SF_GetNamedOperations()
 	                  SF_OP_LOG10, SF_OP_APFREQUENCY, SF_OP_CURSORS, SF_OP_SELECTSWEEPS, SF_OP_AREA, SF_OP_SETSCALE, SF_OP_BUTTERWORTH, \
 	                  SF_OP_SELECTCHANNELS, SF_OP_DATA, SF_OP_LABNOTEBOOK, SF_OP_WAVE, SF_OP_FINDLEVEL, SF_OP_EPOCHS, SF_OP_TP,         \
 	                  SF_OP_STORE, SF_OP_SELECT, SF_OP_POWERSPECTRUM, SF_OP_TPSS, SF_OP_TPBASE, SF_OP_TPINST, SF_OP_TPFIT,              \
-	                  SF_OP_PSX, SF_OP_PSX_KERNEL, SF_OP_PSX_STATS, SF_OP_PSX_RISETIME, SF_OP_PSX_PREP, SF_OP_PSX_DECONV_FILTER,        \
+	                  SF_OP_PSX, SF_OP_PSX_KERNEL, SF_OP_PSX_STATS, SF_OP_PSX_RISETIME, SF_OP_PSX_PREP, SF_OP_PSX_DECONV_BP_FILTER,     \
+	                  SF_OP_PSX_SWEEP_BP_FILTER,                                                                                        \
 	                  SF_OP_MERGE, SF_OP_FIT, SF_OP_FITLINE, SF_OP_DATASET, SF_OP_SELECTVIS, SF_OP_SELECTCM, SF_OP_SELECTSTIMSET,       \
 	                  SF_OP_SELECTIVSCCSWEEPQC, SF_OP_SELECTIVSCCSETQC, SF_OP_SELECTRANGE, SF_OP_SELECTEXP, SF_OP_SELECTDEV,            \
 	                  SF_OP_SELECTEXPANDSCI, SF_OP_SELECTEXPANDRAC, SF_OP_SELECTSETCYCLECOUNT, SF_OP_SELECTSETSWEEPCOUNT,               \
@@ -1164,8 +1161,11 @@ static Function/WAVE SF_FormulaExecutor(string graph, variable jsonID, [string j
 		case SF_OP_PSX_PREP:
 			WAVE out = PSX_OperationPrep(jsonId, jsonPath, graph)
 			break
-		case SF_OP_PSX_DECONV_FILTER:
-			WAVE out = PSX_OperationDeconvFilter(jsonId, jsonPath, graph)
+		case SF_OP_PSX_DECONV_BP_FILTER:
+			WAVE out = PSX_OperationDeconvBPFilter(jsonId, jsonPath, graph)
+			break
+		case SF_OP_PSX_SWEEP_BP_FILTER:
+			WAVE out = PSX_OperationSweepBPFilter(jsonId, jsonPath, graph)
 			break
 		case SF_OP_MERGE:
 			WAVE out = SF_OperationMerge(jsonId, jsonPath, graph)
@@ -2857,7 +2857,7 @@ static Function/S SF_PreprocessInput(string formula)
 	return formula
 End
 
-static Function SF_SetStatusDisplay(string bsPanel, string errMsg, variable errState)
+Function SF_SetStatusDisplay(string bsPanel, string errMsg, variable errState)
 
 	ASSERT(errState == SF_MSG_ERROR || errState == SF_MSG_OK || errState == SF_MSG_WARN, "Unknown error state for SF status")
 	SetValDisplay(bsPanel, "status_sweepFormula_parser", var = errState)
@@ -2916,16 +2916,18 @@ End
 static Function SF_CheckInputCode(string code, string graph)
 
 	variable i, numGraphs, jsonIDy, jsonIDx, subFormulaCnt
-	string jsonPath, xFormula, yFormula, formulasRemain, subPath, yAndXFormula
+	string jsonPath, xFormula, yFormula, formulasRemain, subPath, yAndXFormula, codeWithoutVariables, preProcCode
 
 	NVAR jsonID = $GetSweepFormulaJSONid(SF_GetBrowserDF(graph))
 	JSON_Release(jsonID, ignoreErr = 1)
 	jsonID = JSON_New()
 	JSON_AddObjects(jsonID, "")
 
-	code = SF_CheckVariableAssignments(code, jsonID)
+	preProcCode = SF_PreprocessInput(code)
+
+	codeWithoutVariables = SF_CheckVariableAssignments(preProcCode, jsonID)
 
-	WAVE/T graphCode = SF_SplitCodeToGraphs(SF_PreprocessInput(code))
+	WAVE/T graphCode = SF_SplitCodeToGraphs(codeWithoutVariables)
 
 	numGraphs = DimSize(graphCode, ROWS)
 	for(i = 0; i < numGraphs; i += 1)

Packages/MIES/MIES_SweepFormula_Helpers.ipf

@@ -53,6 +53,7 @@ Function SFH_GetArgumentAsNumeric(variable jsonId, string jsonPath, string graph
 	endif
 
 	if(ParamIsDefault(defValue))
+		ASSERT(ParamIsDefault(checkDefault), "Without defValue passing checkDefault does not make sense")
 		checkExist = 1
 	else
 		checkExist = 0