Skip to content

Commit 4999e77

Browse files
committed
SFH_CreateSelectDataComp: Factor it out
1 parent 9c7a28e commit 4999e77

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

Packages/MIES/MIES_SweepFormula_Helpers.ipf

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,27 +1721,34 @@ Function/WAVE SFH_MoveDatasetHigherIfCompatible(WAVE/WAVE data)
17211721
return data
17221722
End
17231723

1724-
Function/WAVE SFH_GetSingleSelect(string graph, string opShort, variable sweepNo, variable channelType, variable channelNumber, variable mapIndex)
1725-
1726-
WAVE/WAVE range = SFH_AsDataSet(SFH_GetFullRange())
1727-
WAVE singleSelect = SFH_NewSelectDataWave(1, 1)
1728-
singleSelect[0][%SWEEP] = sweepNo
1729-
singleSelect[0][%CHANNELTYPE] = channelType
1730-
singleSelect[0][%CHANNELNUMBER] = channelNumber
1731-
singleSelect[0][%SWEEPMAPINDEX] = mapIndex
1724+
Function/WAVE SFH_CreateSelectDataComp(string graph, string opShort, WAVE singleSelect, WAVE range)
17321725

17331726
WAVE/WAVE selectDataComp = GetSFSelectDataComp(graph, opShort)
17341727
JWN_SetStringInWaveNote(selectDataComp, SF_META_DATATYPE, SF_DATATYPE_SELECTCOMP)
17351728
JWN_SetStringInWaveNote(singleSelect, SF_META_DATATYPE, SF_DATATYPE_SELECT)
17361729
JWN_SetStringInWaveNote(range, SF_META_DATATYPE, SF_DATATYPE_SELECTRANGE)
17371730
selectDataComp[%SELECTION] = singleSelect
1738-
selectDataComp[%RANGE] = range
1731+
selectDataComp[%RANGE] = SFH_AsDataSet(range)
17391732

17401733
Make/FREE/WAVE selectDataArray = {selectDataComp}
17411734

17421735
return selectDataArray
17431736
End
17441737

1738+
Function/WAVE SFH_GetSingleSelect(string graph, string opShort, variable sweepNo, variable channelType, variable channelNumber, variable mapIndex)
1739+
1740+
WAVE range = SFH_GetFullRange()
1741+
WAVE singleSelect = SFH_NewSelectDataWave(1, 1)
1742+
singleSelect[0][%SWEEP] = sweepNo
1743+
singleSelect[0][%CHANNELTYPE] = channelType
1744+
singleSelect[0][%CHANNELNUMBER] = channelNumber
1745+
singleSelect[0][%SWEEPMAPINDEX] = mapIndex
1746+
1747+
WAVE selectDataArray = SFH_CreateSelectDataComp(graph, opShort, singleSelect, range)
1748+
1749+
return selectDataArray
1750+
End
1751+
17451752
Function/S SFH_GetStimsetName(WAVE numericalValues, WAVE textualValues, variable sweepNo, variable channelNumber, variable channelType)
17461753

17471754
variable index

0 commit comments

Comments
 (0)