f channelnumber displayed case

AllenInstitute · Sep 16, 2024 · fb45201 · fb45201
1 parent 179b85d
commit fb45201
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Packages/MIES/MIES_SweepFormula.ipf b/Packages/MIES/MIES_SweepFormula.ipf
@@ -2355,24 +2355,25 @@ static Function/WAVE SF_GetSelectData(string graph, STRUCT SF_SelectParameters &
 							continue
 						endif
 					endif
-					channelType = WhichListItem(traces[j][dimPosTChannelType], XOP_CHANNEL_NAMES)
+					channelType   = WhichListItem(traces[j][dimPosTChannelType], XOP_CHANNEL_NAMES)
+					channelNumber = str2num(traces[j][dimPosTChannelNumber])
 					WAVE numericalValues = $traces[j][dimPosTNumericalValues]
 					if(!IsNaN(filter.setCycleCount))
-						[WAVE setting, index] = GetLastSettingChannel(numericalValues, $"", sweepNo, "Set Cycle Count", l, channelType, DATA_ACQUISITION_MODE)
+						[WAVE setting, index] = GetLastSettingChannel(numericalValues, $"", sweepNo, "Set Cycle Count", channelNumber, channelType, DATA_ACQUISITION_MODE)
 						setCycleCount = WaveExists(setting) ? setting[index] : NaN
 					else
 						setCycleCount = NaN
 					endif
 					if(!IsNaN(filter.setSweepCount))
-						[WAVE setting, index] = GetLastSettingChannel(numericalValues, $"", sweepNo, "Set Sweep Count", l, channelType, DATA_ACQUISITION_MODE)
+						[WAVE setting, index] = GetLastSettingChannel(numericalValues, $"", sweepNo, "Set Sweep Count", channelNumber, channelType, DATA_ACQUISITION_MODE)
 						setSweepCount = WaveExists(setting) ? setting[index] : NaN
 					else
 						setSweepCount = NaN
 					endif
 
 					selectDisplayed[outIndex][dimPosSweep]                      = sweepNo
 					selectDisplayed[outIndex][dimPosChannelType]                = channelType
-					selectDisplayed[outIndex][dimPosChannelNumber]              = str2num(traces[j][dimPosTChannelNumber])
+					selectDisplayed[outIndex][dimPosChannelNumber]              = channelNumber
 					selectDisplayed[outIndex][dimPosSweepMapIndex]              = str2num(traces[j][dimPosTSweepMapIndex])
 					sweepPropertiesDisplayed[outIndex][SWEEPPROP_CLAMPMODE]     = str2num(traces[j][dimPosTClampMode])
 					sweepPropertiesDisplayed[outIndex][SWEEPPROP_SETCYCLECOUNT] = setCycleCount