Skip to content

Commit

Permalink
PUB: Preparation to add four zeromq publishers for TP data
Browse files Browse the repository at this point in the history
- the data is published from the TP analysis thread including additional
information available in the thread through the previous commit.
- The additional values are also returned by the thread and collected in
the async buffer as well then in TPResult and in TPStorage.
- The involved waves and their respective getters were adapted with new
elements that the additional data can be stored.
- As most of the elements store the same information, thus a constant
was introduced with a dimension label list that is used as helper for
the wave creation in the getter functions.
  • Loading branch information
MichaelHuth committed Sep 3, 2024
1 parent 31d1771 commit 2802321
Show file tree
Hide file tree
Showing 4 changed files with 212 additions and 157 deletions.
7 changes: 7 additions & 0 deletions Packages/MIES/MIES_Constants.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -2307,3 +2307,10 @@ Constant SUTTER_MAX_MAX_TP_PULSES = 10000
Constant INVALID_SWEEP_NUMBER = -1

StrConstant PERCENT_F_MAX_PREC = "%.15f"

// If this constant with dimLabels is changed the following functions should be verified:
//
// TP_TSAnalysis
// GetTPResultAsyncBuffer
// GetTPResults (reuses same dimlabels partially)
StrConstant TP_ANALYSIS_DATA_LABELS = "BASELINE;STEADYSTATERES;INSTANTRES;ELEVATED_SS;ELEVATED_INST;NOW;HEADSTAGE;MARKER;NUMBER_OF_TP_CHANNELS;TIMESTAMP;TIMESTAMPUTC;CLAMPMODE;CLAMPAMP;BASELINEFRAC;CYCLEID;TPLENGTHPOINTSADC;PULSELENGTHPOINTSADC;PULSESTARTPOINTSADC;SAMPLINGINTERVALADC;TPLENGTHPOINTSDAC;PULSELENGTHPOINTSDAC;PULSESTARTPOINTSDAC;SAMPLINGINTERVALDAC;"
2 changes: 1 addition & 1 deletion Packages/MIES/MIES_SweepFormula.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -3045,7 +3045,7 @@ static Function/WAVE SF_OperationTPImpl(string graph, WAVE/WAVE mode, WAVE/Z sel
DFREF dfrTPAnalysis = TP_PrepareAnalysisDF(graph, tpInput)
DFREF dfrTPAnalysisInput = dfrTPAnalysis:input
DFREF dfr = TP_TSAnalysis(dfrTPAnalysisInput)
WAVE tpOutData = dfr:outData
WAVE tpOutData = dfr:tpData

// handle waves sent out when TP_ANALYSIS_DEBUGGING is defined
if(WaveExists(dfr:data) && WaveExists(dfr:colors))
Expand Down
Loading

0 comments on commit 2802321

Please sign in to comment.