Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip some more function instrumentation #2001

Merged
merged 4 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Packages/MIES/MIES_AnalysisFunctionManagement.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ Function AFM_CallAnalysisFunctions(device, eventType)
WAVE/Z dataWave = $""
break
case MID_SWEEP_EVENT:
if(fifoPositionAD == 0)
// no data yet to analyse
return 0
endif
sweepNo = DAG_GetNumericalValue(device, "SetVar_Sweep")
WAVE/Z/WAVE scaledDataWave = GetScaledDataWave(device)
if(!WaveExists(scaledDataWave))
Expand Down
2 changes: 2 additions & 0 deletions Packages/MIES/MIES_DAEphys.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -4170,6 +4170,8 @@ End
/// Counterpart to GetPanelControl()
///
/// @return 0 if the control name could be parsed, one otherwise
///
/// UTF_NOINSTRUMENTATION
Function DAP_ParsePanelControl(ctrl, channelIndex, channelType, controlType)
string ctrl
variable &channelIndex, &channelType, &controlType
Expand Down
2 changes: 2 additions & 0 deletions Packages/MIES/MIES_DAEphys_GuiState.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ End
/// @param ctrl control name
/// @param index [optional, default to NaN] Some control entries have multiple
/// entries per headstage/channel/etc.
///
/// UTF_NOINSTRUMENTATION
Function DAG_GetNumericalValue(device, ctrl, [index])
string device, ctrl
variable index
Expand Down
2 changes: 2 additions & 0 deletions Packages/MIES/MIES_GuiUtilities.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,8 @@ Function SetSetVariableLimits(win, Control, low, high, increment)
End

/// @brief Returns the contents of a SetVariable
///
/// UTF_NOINSTRUMENTATION
Function GetSetVariable(win, control)
string win, control

Expand Down
4 changes: 4 additions & 0 deletions Packages/MIES/MIES_MiesUtilities.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,8 @@ End
///
/// @param channelType channel type
/// @param allowFail [optional, defaults to false] return NaN on unknown channel types (true) or assert (false)
///
/// UTF_NOINSTRUMENTATION
Function ParseChannelTypeFromString(string channelType, [variable allowFail])

allowFail = ParamIsDefault(allowFail) ? 0 : !!allowFail
Expand Down Expand Up @@ -2364,6 +2366,8 @@ End
/// @brief Return the hardware type of the device
///
/// @return One of @ref HardwareDACTypeConstants
///
/// UTF_NOINSTRUMENTATION
threadsafe Function GetHardwareType(device)
string device

Expand Down
12 changes: 12 additions & 0 deletions Packages/MIES/MIES_Utilities.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -1611,6 +1611,8 @@ End
/// the begin of str
/// @param regExp [optional, defaults to false] If start is a simple string (false)
/// or a regular expression (true)
///
/// UTF_NOINSTRUMENTATION
threadsafe Function/S RemovePrefix(string str, [string start, variable regExp])
variable length, pos, skipLength, err
string regExpResult
Expand Down Expand Up @@ -2493,6 +2495,8 @@ End

/// @brief Remove a string prefix from each list item and
/// return the new list
///
/// UTF_NOINSTRUMENTATION
threadsafe Function/S RemovePrefixFromListItem(string prefix, string list, [string listSep, variable regExp])
string result, entry
variable numEntries, i
Expand Down Expand Up @@ -3338,6 +3342,8 @@ End
/// @param var2 second variable
/// @param tol [optional, defaults to 1e-8] tolerance
/// @param strong_or_weak [optional, defaults to strong] type of condition, can be zero for weak or 1 for strong
///
/// UTF_NOINSTRUMENTATION
Function CheckIfClose(var1, var2, [tol, strong_or_weak])
variable var1, var2, tol, strong_or_weak

Expand Down Expand Up @@ -4177,6 +4183,8 @@ End

/// @brief Normalize the line endings in the given string to either classic Mac OS/Igor Pro EOLs (`\r`)
/// or Unix EOLs (`\n`)
///
/// UTF_NOINSTRUMENTATION
threadsafe Function/S NormalizeToEOL(str, eol)
string str, eol

Expand Down Expand Up @@ -5793,6 +5801,8 @@ threadsafe Function/WAVE RemoveUnusedRows(WAVE wv)
End

/// @brief Check wether `val1` and `val2` are equal or both NaN
///
/// UTF_NOINSTRUMENTATION
threadsafe Function EqualValuesOrBothNaN(variable left, variable right)

return (IsNaN(left) && IsNaN(right)) || (left == right)
Expand All @@ -5803,6 +5813,8 @@ End
/// @param wv wave to check
/// @param val value to check
/// @param ignoreNaN [optional, defaults to true] ignore NaN in wv
///
/// UTF_NOINSTRUMENTATION
threadsafe Function IsConstant(WAVE wv, variable val, [variable ignoreNaN])

variable minimum, maximum
Expand Down
6 changes: 6 additions & 0 deletions Packages/MIES/MIES_WaveDataFolderGetters.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,8 @@ threadsafe Function/S GetDeviceTypePathAsString(deviceType)
End

/// @brief Return a datafolder reference to the device folder
///
/// UTF_NOINSTRUMENTATION
threadsafe Function/DF GetDevicePath(device)
string device
return createDFWithAllParents(GetDevicePathAsString(device))
Expand Down Expand Up @@ -5713,6 +5715,8 @@ End
/// - 15: Internal number stored in control min_AsyncAD__RowNum. The minium value alarm trigger.
/// - 16: Internal number stored in control max_AsyncAD_RowNum. The max value alarm trigger.
/// - 17+: Unique controls
///
/// UTF_NOINSTRUMENTATION
Function/Wave GetDA_EphysGuiStateNum(device)
string device

Expand Down Expand Up @@ -5781,6 +5785,8 @@ End
/// - 8: (Async) Title
/// - 9: (Async) Unit
/// - 10+: Unique controls (SetVariable and PopupMenu only)
///
/// UTF_NOINSTRUMENTATION
Function/Wave GetDA_EphysGuiStateTxT(device)
string device

Expand Down