Skip to content

Commit 96fdf24

Browse files
committed
TP: Remove TPStorage field %TimeInSeconds
The field was redundant to %TimeStamp and even less precise. Since the TimeStamp field was updated in a recent commit to include the precise acquisition start time of the TP, the field %TimeInSeconds is obsolete and is removed. The TPStorage version was increased. The WaveUpgrade removes the %TimeInSeconds. The x-axis of the TP resistance fit uses now %TimeStamp, which makes the fit results much more reliable with fewer data points. The element was also removed from ZMQ publishing of the TP data.
1 parent e40aeab commit 96fdf24

8 files changed

+86
-101
lines changed

Packages/MIES/MIES_Constants.ipf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2428,7 +2428,7 @@ StrConstant CONF_DEFAULT_SAVE_LOCATION = "C:MiesSave"
24282428
// TP_TSAnalysis
24292429
// GetTPResultAsyncBuffer
24302430
// GetTPResults (reuses same dimlabels partially)
2431-
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;"
2431+
StrConstant TP_ANALYSIS_DATA_LABELS = "BASELINE;STEADYSTATERES;INSTANTRES;ELEVATED_SS;ELEVATED_INST;HEADSTAGE;MARKER;NUMBER_OF_TP_CHANNELS;TIMESTAMP;TIMESTAMPUTC;CLAMPMODE;CLAMPAMP;BASELINEFRAC;CYCLEID;TPLENGTHPOINTSADC;PULSELENGTHPOINTSADC;PULSESTARTPOINTSADC;SAMPLINGINTERVALADC;TPLENGTHPOINTSDAC;PULSELENGTHPOINTSDAC;PULSESTARTPOINTSDAC;SAMPLINGINTERVALDAC;"
24322432

24332433
// Object names for thread data transfer out of ITC Fifothread @ref TFH_FifoLoop
24342434
StrConstant ITC_THREAD_FIFOPOS = "fifopos"

Packages/MIES/MIES_Oscilloscope.ipf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,6 @@ Function SCOPE_UpdateOscilloscopeData(string device, variable dataAcqOrTP, [vari
550550
tpInput.pulseStartPointsDAC = (dataAcqOrTP == TEST_PULSE_MODE) ? TPSettingsCalc[%pulseStartPointsTP] : TPSettingsCalc[%pulseStartPointsDAQ]
551551
tpInput.samplingIntervalDAC = DimDelta(scaledDataWave[0], ROWS)
552552
tpInput.baselineFrac = TPSettingsCalc[%baselineFrac]
553-
tpInput.readTimeStamp = ticks * TICKS_TO_SECONDS
554553
tpInput.activeADCs = tpChannels
555554
tpInput.cycleId = ROVAR(GetTestpulseCycleID(device))
556555

Packages/MIES/MIES_Publish.ipf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,6 @@ threadsafe Function PUB_TPResult(string device, WAVE tpData, WAVE ampParamStorag
847847
JSON_AddVariable(jsonID, path + "/headstage", tpData[%HEADSTAGE])
848848
JSON_AddVariable(jsonID, path + "/clamp mode", tpData[%CLAMPMODE])
849849

850-
PUB_AddTPResultEntry(jsonId, path + "/time of tp acquisition", tpData[%NOW], "s")
851850
PUB_AddTPResultEntry(jsonId, path + "/clamp amplitude", tpData[%CLAMPAMP], daUnit)
852851
PUB_AddTPResultEntry(jsonId, path + "/tp length ADC", tpData[%TPLENGTHPOINTSADC], "points")
853852
PUB_AddTPResultEntry(jsonId, path + "/pulse duration ADC", tpData[%PULSELENGTHPOINTSADC], "points")

Packages/MIES/MIES_Structures.ipf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ Structure TPAnalysisInput
308308
variable pulseStartPointsDAC
309309
variable samplingIntervalDAC
310310
variable baselineFrac
311-
variable readTimeStamp
312311
variable headstage
313312
string device
314313
variable measurementMarker

Packages/MIES/MIES_TestPulse.ipf

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ Function TP_ROAnalysis(STRUCT ASYNC_ReadOutStruct &ar)
366366
MultiThread TPResults[%ResistanceInst][] = asyncBuffer[i][%INSTANTRES][q]
367367
MultiThread TPResults[%ElevatedSteadyState][] = asyncBuffer[i][%ELEVATED_SS][q]
368368
MultiThread TPResults[%ElevatedInst][] = asyncBuffer[i][%ELEVATED_INST][q]
369-
MultiThread TPResults[%NOW][] = asyncBuffer[i][%NOW][q]
370369
MultiThread TPResults[%HEADSTAGE][] = asyncBuffer[i][%HEADSTAGE][q]
371370
MultiThread TPResults[%MARKER][] = asyncBuffer[i][%MARKER][q]
372371
MultiThread TPResults[%NUMBER_OF_TP_CHANNELS][] = asyncBuffer[i][%NUMBER_OF_TP_CHANNELS][q]
@@ -405,7 +404,7 @@ Function TP_ROAnalysis(STRUCT ASYNC_ReadOutStruct &ar)
405404

406405
TP_AutoAmplitudeAndBaseline(device, TPResults, marker)
407406
DQ_ApplyAutoBias(device, TPResults)
408-
TP_RecordTP(device, TPResults, inData[%NOW])
407+
TP_RecordTP(device, TPResults)
409408
endif
410409
End
411410

@@ -1040,7 +1039,6 @@ threadsafe Function/DF TP_TSAnalysis(DFREF dfrInp)
10401039
variable pulseLengthPointsADC = ASYNC_FetchVariable(dfrInp, "pulseLengthPointsADC")
10411040
variable baselineFrac = ASYNC_FetchVariable(dfrInp, "baselineFrac")
10421041
variable tpLengthPointsADC = ASYNC_FetchVariable(dfrInp, "tpLengthPointsADC")
1043-
variable now = ASYNC_FetchVariable(dfrInp, "now")
10441042
variable headstage = ASYNC_FetchVariable(dfrInp, "headstage")
10451043
string device = ASYNC_FetchString(dfrInp, "device")
10461044
variable marker = ASYNC_FetchVariable(dfrInp, "marker")
@@ -1140,7 +1138,6 @@ threadsafe Function/DF TP_TSAnalysis(DFREF dfrInp)
11401138

11411139
// additional data copy
11421140
string/G dfrOut:device = device
1143-
tpData[%NOW] = now
11441141
tpData[%HEADSTAGE] = headstage
11451142
tpData[%MARKER] = marker
11461143
tpData[%NUMBER_OF_TP_CHANNELS] = activeADCs
@@ -1195,18 +1192,15 @@ End
11951192
/// @brief Records values from TPResults into TPStorage at defined intervals.
11961193
///
11971194
/// Used for analysis of TP over time.
1198-
static Function TP_RecordTP(string device, WAVE TPResults, variable now)
1195+
static Function TP_RecordTP(string device, WAVE TPResults)
11991196

1200-
variable delta, i, ret, lastPressureCtrl
1197+
variable delta, i, ret, lastPressureCtrl, now
12011198
WAVE TPStorage = GetTPStorage(device)
12021199
WAVE hsProp = GetHSProperties(device)
12031200
variable count = GetNumberFromWaveNote(TPStorage, NOTE_INDEX)
12041201
variable lastRescaling = GetNumberFromWaveNote(TPStorage, DIMENSION_SCALING_LAST_INVOC)
12051202

12061203
if(!count)
1207-
// time of the first sweep
1208-
TPStorage[0][][%TimeInSeconds] = now
1209-
12101204
WAVE statusHS = DAG_GetChannelState(device, CHANNEL_TYPE_HEADSTAGE)
12111205

12121206
for(i = 0; i < NUM_HEADSTAGES; i += 1)
@@ -1237,7 +1231,6 @@ static Function TP_RecordTP(string device, WAVE TPResults, variable now)
12371231
: TPStorage[count][q][%HoldingCmd_IC]
12381232
endif
12391233

1240-
TPStorage[count][][%TimeInSeconds] = TPResults[%NOW][q]
12411234
TPStorage[count][][%TimeStamp] = TPResults[%TIMESTAMP][q]
12421235
TPStorage[count][][%TimeStampSinceIgorEpochUTC] = TPResults[%TIMESTAMPUTC][q]
12431236

@@ -1255,7 +1248,7 @@ static Function TP_RecordTP(string device, WAVE TPResults, variable now)
12551248
TPStorage[count][][%Baseline_VC] = (hsProp[q][%ClampMode] == V_CLAMP_MODE) ? TPResults[%BaselineSteadyState][q] : NaN
12561249
TPStorage[count][][%Baseline_IC] = (hsProp[q][%ClampMode] == I_CLAMP_MODE) ? TPResults[%BaselineSteadyState][q] : NaN
12571250

1258-
TPStorage[count][][%DeltaTimeInSeconds] = (count > 0) ? (now - TPStorage[0][0][%TimeInSeconds]) : 0
1251+
TPStorage[count][][%DeltaTimeInSeconds] = TPResults[%TIMESTAMP][q] - TPStorage[0][q][%TimeStamp]
12591252
TPStorage[count][][%TPMarker] = TPResults[%MARKER][q]
12601253

12611254
TPStorage[count][][%TPCycleID] = TPResults[%CYCLEID][q]
@@ -1278,6 +1271,7 @@ static Function TP_RecordTP(string device, WAVE TPResults, variable now)
12781271
TPStorage[count][][%AutoTPCycleID] = hsProp[q][%Enabled] ? TPSettings[%autoTPCycleID][q] : NaN
12791272

12801273
lastPressureCtrl = GetNumberFromWaveNote(TPStorage, PRESSURE_CTRL_LAST_INVOC)
1274+
now = DateTime
12811275
if((now - lastPressureCtrl) > TP_PRESSURE_INTERVAL)
12821276
P_PressureControl(device)
12831277
SetNumberInWaveNote(TPStorage, PRESSURE_CTRL_LAST_INVOC, now, format = "%.06f")
@@ -1312,7 +1306,7 @@ threadsafe static Function TP_FitResistance(WAVE TPStorage, variable startRow, v
13121306
try
13131307
V_FitError = 0
13141308
V_AbortCode = 0
1315-
CurveFit/Q/N=1/NTHR=1/M=0/W=2 line, kwCWave=coefWave, TPStorage[startRow, endRow][headstage][%SteadyStateResistance]/X=TPStorage[startRow, endRow][headstage][%TimeInSeconds]/AD=0/AR=0; AbortOnRTE
1309+
CurveFit/Q/N=1/NTHR=1/M=0/W=2 line, kwCWave=coefWave, TPStorage[startRow, endRow][headstage][%SteadyStateResistance]/X=TPStorage[startRow, endRow][headstage][%TimeStamp]/AD=0/AR=0; AbortOnRTE
13161310
return coefWave[1]
13171311
catch
13181312
ClearRTError()
@@ -1679,7 +1673,6 @@ Function/DF TP_PrepareAnalysisDF(string device, STRUCT TPAnalysisInput &tpInput)
16791673
ASYNC_AddParam(threadDF, var = tpInput.pulseLengthPointsADC, name = "pulseLengthPointsADC")
16801674
ASYNC_AddParam(threadDF, var = tpInput.baselineFrac, name = "baselineFrac")
16811675
ASYNC_AddParam(threadDF, var = tpInput.tpLengthPointsADC, name = "tpLengthPointsADC")
1682-
ASYNC_AddParam(threadDF, var = tpInput.readTimeStamp, name = "now")
16831676
ASYNC_AddParam(threadDF, var = tpInput.headstage, name = "headstage")
16841677
ASYNC_AddParam(threadDF, str = tpInput.device, name = "device")
16851678
ASYNC_AddParam(threadDF, var = tpInput.measurementMarker, name = "marker")

Packages/MIES/MIES_WaveDataFolderGetters.ipf

Lines changed: 79 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -3019,49 +3019,49 @@ End
30193019
/// - 1: Amplifier bias current (Current Clamp)
30203020
/// - 2: (Peak/Instantaneous) Resistance
30213021
/// - 3: (Steady State) Resistance
3022-
/// - 4: Time in s (arbitrary zero)
3023-
/// - 5: Delta time in s relative to the entry in the first row of layer 3
3024-
/// - 6: (Steady State) Resistance slope
3025-
/// - 7: Pressure in psi
3026-
/// - 8: Timestamp since igor epoch (*with* timezone offsets)
3027-
/// - 9: Timestamp in UTC since igor epoch
3028-
/// - 10: Pressure changed
3029-
/// - 11: Holding current (pA, Voltage Clamp)
3030-
/// - 12: Vrest (mV, Current Clamp)
3031-
/// - 13: AD channel
3032-
/// - 14: DA channel
3033-
/// - 15: Headstage
3034-
/// - 16: ClampMode
3035-
/// - 17: UserPressure
3036-
/// - 18: PressureMethod (see @ref PressureModeConstants)
3037-
/// - 19: ValidState (true if the entry is considered valid, false otherwise)
3038-
/// - 20: UserPressureType (see @ref PressureTypeConstants)
3039-
/// - 21: UserPressureTimeStampUTC timestamp since Igor Pro epoch in UTC where
3022+
/// - 4: Delta time in s relative to the entry in the first row of layer 3
3023+
/// - 5: (Steady State) Resistance slope
3024+
/// - 6: Pressure in psi
3025+
/// - 7: Timestamp since igor epoch (*with* timezone offsets)
3026+
/// - 8: Timestamp in UTC since igor epoch
3027+
/// - 9: Pressure changed
3028+
/// - 10: Holding current (pA, Voltage Clamp)
3029+
/// - 11: Vrest (mV, Current Clamp)
3030+
/// - 12: AD channel
3031+
/// - 13: DA channel
3032+
/// - 14: Headstage
3033+
/// - 15: ClampMode
3034+
/// - 16: UserPressure
3035+
/// - 17: PressureMethod (see @ref PressureModeConstants)
3036+
/// - 18: ValidState (true if the entry is considered valid, false otherwise)
3037+
/// - 19: UserPressureType (see @ref PressureTypeConstants)
3038+
/// - 20: UserPressureTimeStampUTC timestamp since Igor Pro epoch in UTC where
30403039
/// the user pressure was acquired
3041-
/// - 22: TPMarker unique number identifying this set of TPs
3042-
/// - 23: Cell state: Pressure control values defining the cell state, one of @ref CellStateValues
3043-
/// - 24: Testpulse Cycle Id (changes whenever TP is started, allows to group TPs together)
3044-
/// - 25: Auto TP Amplitude: success/fail state
3045-
/// - 26: Auto TP Baseline: success/fail state
3046-
/// - 27: Auto TP Baseline Range Exceeded: True/False
3047-
/// - 28: Auto TP Cycle ID: Unique number which is constant until the "Auto TP"
3040+
/// - 21: TPMarker unique number identifying this set of TPs
3041+
/// - 22: Cell state: Pressure control values defining the cell state, one of @ref CellStateValues
3042+
/// - 23: Testpulse Cycle Id (changes whenever TP is started, allows to group TPs together)
3043+
/// - 24: Auto TP Amplitude: success/fail state
3044+
/// - 25: Auto TP Baseline: success/fail state
3045+
/// - 26: Auto TP Baseline Range Exceeded: True/False
3046+
/// - 27: Auto TP Cycle ID: Unique number which is constant until the "Auto TP"
30483047
/// state is switched (aka on->off or off->on)
3049-
/// - 29: Auto TP Baseline Fit result: One of @ref TPBaselineFitResults
3050-
/// - 30: Auto TP Delta V [mV]
3051-
/// - 31: Clamp Amplitude [mV] or [pA] depending on Clamp Mode
3052-
/// - 32: Testpulse full length in points for AD channel [points]
3053-
/// - 33: Testpulse pulse length in points for AD channel [points]
3054-
/// - 34: Point index of pulse start for AD channel [point]
3055-
/// - 35: Sampling interval for AD channel [ms]
3056-
/// - 36: Testpulse full length in points for DA channel [points]
3057-
/// - 37: Testpulse pulse length in points for DA channel [points]
3058-
/// - 38: Point index of pulse start for DA channel [point]
3059-
/// - 39: Sampling interval for DA channel [ms]
3048+
/// - 28: Auto TP Baseline Fit result: One of @ref TPBaselineFitResults
3049+
/// - 29: Auto TP Delta V [mV]
3050+
/// - 30: Clamp Amplitude [mV] or [pA] depending on Clamp Mode
3051+
/// - 31: Testpulse full length in points for AD channel [points]
3052+
/// - 32: Testpulse pulse length in points for AD channel [points]
3053+
/// - 33: Point index of pulse start for AD channel [point]
3054+
/// - 34: Sampling interval for AD channel [ms]
3055+
/// - 35: Testpulse full length in points for DA channel [points]
3056+
/// - 36: Testpulse pulse length in points for DA channel [points]
3057+
/// - 37: Point index of pulse start for DA channel [point]
3058+
/// - 38: Sampling interval for DA channel [ms]
30603059
Function/WAVE GetTPStorage(string device)
30613060

30623061
DFREF dfr = GetDeviceTestPulse(device)
3063-
variable versionOfNewWave = 16
3064-
variable numLayers = 40
3062+
variable versionOfNewWave = 17
3063+
variable numLayersV16 = 40
3064+
variable numLayers = 39
30653065

30663066
WAVE/Z/D/SDFR=dfr wv = TPStorage
30673067

@@ -3070,7 +3070,7 @@ Function/WAVE GetTPStorage(string device)
30703070
endif
30713071

30723072
if(WaveExists(wv))
3073-
Redimension/N=(-1, NUM_HEADSTAGES, numLayers)/D wv
3073+
Redimension/N=(-1, NUM_HEADSTAGES, numLayersV16)/D wv
30743074

30753075
if(WaveVersionIsSmaller(wv, 10))
30763076
wv[][][17] = NaN
@@ -3092,6 +3092,11 @@ Function/WAVE GetTPStorage(string device)
30923092
if(WaveVersionIsSmaller(wv, 16))
30933093
wv[][][31, numLayers - 1] = NaN
30943094
endif
3095+
if(WaveVersionIsSmaller(wv, 17))
3096+
// Delete the former layer for %TimeInSeconds that was layer 4
3097+
// The functionality is replaced by a precise %TimeStamp
3098+
DeletePoints/M=(LAYERS) 4, 1, wv
3099+
endif
30953100
else
30963101
Make/N=(MINIMUM_WAVE_SIZE_LARGE, NUM_HEADSTAGES, numLayers)/D dfr:TPStorage/WAVE=wv
30973102

@@ -3106,45 +3111,44 @@ Function/WAVE GetTPStorage(string device)
31063111
SetDimLabel LAYERS, 1, HoldingCmd_IC, wv
31073112
SetDimLabel LAYERS, 2, PeakResistance, wv
31083113
SetDimLabel LAYERS, 3, SteadyStateResistance, wv
3109-
SetDimLabel LAYERS, 4, TimeInSeconds, wv
3110-
SetDimLabel LAYERS, 5, DeltaTimeInSeconds, wv
3111-
SetDimLabel LAYERS, 6, Rss_Slope, wv
3112-
SetDimLabel LAYERS, 7, Pressure, wv
3113-
SetDimLabel LAYERS, 8, TimeStamp, wv
3114-
SetDimLabel LAYERS, 9, TimeStampSinceIgorEpochUTC, wv
3115-
SetDimLabel LAYERS, 10, PressureChange, wv
3116-
SetDimLabel LAYERS, 11, Baseline_VC, wv
3117-
SetDimLabel LAYERS, 12, Baseline_IC, wv
3118-
SetDimLabel LAYERS, 13, ADC, wv
3119-
SetDimLabel LAYERS, 14, DAC, wv
3120-
SetDimLabel LAYERS, 15, Headstage, wv
3121-
SetDimLabel LAYERS, 16, ClampMode, wv
3122-
SetDimLabel LAYERS, 17, UserPressure, wv
3123-
SetDimLabel LAYERS, 18, PressureMethod, wv
3124-
SetDimLabel LAYERS, 19, ValidState, wv
3125-
SetDimLabel LAYERS, 20, UserPressureType, wv
3126-
SetDimLabel LAYERS, 21, UserPressureTimeStampUTC, wv
3127-
SetDimLabel LAYERS, 22, TPMarker, wv
3128-
SetDimLabel LAYERS, 23, CellState, wv
3129-
SetDimLabel LAYERS, 24, TPCycleID, wv
3130-
SetDimLabel LAYERS, 25, AutoTPAmplitude, wv
3131-
SetDimLabel LAYERS, 26, AutoTPBaseline, wv
3132-
SetDimLabel LAYERS, 27, AutoTPBaselineRangeExceeded, wv
3133-
SetDimLabel LAYERS, 28, AutoTPCycleID, wv
3134-
SetDimLabel LAYERS, 29, AutoTPBaselineFitResult, wv
3135-
SetDimLabel LAYERS, 30, AutoTPDeltaV, wv
3114+
SetDimLabel LAYERS, 4, DeltaTimeInSeconds, wv
3115+
SetDimLabel LAYERS, 5, Rss_Slope, wv
3116+
SetDimLabel LAYERS, 6, Pressure, wv
3117+
SetDimLabel LAYERS, 7, TimeStamp, wv
3118+
SetDimLabel LAYERS, 8, TimeStampSinceIgorEpochUTC, wv
3119+
SetDimLabel LAYERS, 9, PressureChange, wv
3120+
SetDimLabel LAYERS, 10, Baseline_VC, wv
3121+
SetDimLabel LAYERS, 11, Baseline_IC, wv
3122+
SetDimLabel LAYERS, 12, ADC, wv
3123+
SetDimLabel LAYERS, 13, DAC, wv
3124+
SetDimLabel LAYERS, 14, Headstage, wv
3125+
SetDimLabel LAYERS, 15, ClampMode, wv
3126+
SetDimLabel LAYERS, 16, UserPressure, wv
3127+
SetDimLabel LAYERS, 17, PressureMethod, wv
3128+
SetDimLabel LAYERS, 18, ValidState, wv
3129+
SetDimLabel LAYERS, 19, UserPressureType, wv
3130+
SetDimLabel LAYERS, 20, UserPressureTimeStampUTC, wv
3131+
SetDimLabel LAYERS, 21, TPMarker, wv
3132+
SetDimLabel LAYERS, 22, CellState, wv
3133+
SetDimLabel LAYERS, 23, TPCycleID, wv
3134+
SetDimLabel LAYERS, 24, AutoTPAmplitude, wv
3135+
SetDimLabel LAYERS, 25, AutoTPBaseline, wv
3136+
SetDimLabel LAYERS, 26, AutoTPBaselineRangeExceeded, wv
3137+
SetDimLabel LAYERS, 27, AutoTPCycleID, wv
3138+
SetDimLabel LAYERS, 28, AutoTPBaselineFitResult, wv
3139+
SetDimLabel LAYERS, 29, AutoTPDeltaV, wv
31363140
// Dimlabels starting from here are taken from TP_ANALYSIS_DATA_LABELS
31373141
// This is not required but convenient because in @ref TP_RecordTP data from TPResults (@ref GetTPResults)
31383142
// is transferred to tpStorage and TPResults also uses dimlabels from TP_ANALYSIS_DATA_LABELS partially.
3139-
SetDimLabel LAYERS, 31, CLAMPAMP, wv
3140-
SetDimLabel LAYERS, 32, TPLENGTHPOINTSADC, wv
3141-
SetDimLabel LAYERS, 33, PULSELENGTHPOINTSADC, wv
3142-
SetDimLabel LAYERS, 34, PULSESTARTPOINTSADC, wv
3143-
SetDimLabel LAYERS, 35, SAMPLINGINTERVALADC, wv
3144-
SetDimLabel LAYERS, 36, TPLENGTHPOINTSDAC, wv
3145-
SetDimLabel LAYERS, 37, PULSELENGTHPOINTSDAC, wv
3146-
SetDimLabel LAYERS, 38, PULSESTARTPOINTSDAC, wv
3147-
SetDimLabel LAYERS, 39, SAMPLINGINTERVALDAC, wv
3143+
SetDimLabel LAYERS, 30, CLAMPAMP, wv
3144+
SetDimLabel LAYERS, 31, TPLENGTHPOINTSADC, wv
3145+
SetDimLabel LAYERS, 32, PULSELENGTHPOINTSADC, wv
3146+
SetDimLabel LAYERS, 33, PULSESTARTPOINTSADC, wv
3147+
SetDimLabel LAYERS, 34, SAMPLINGINTERVALADC, wv
3148+
SetDimLabel LAYERS, 35, TPLENGTHPOINTSDAC, wv
3149+
SetDimLabel LAYERS, 36, PULSELENGTHPOINTSDAC, wv
3150+
SetDimLabel LAYERS, 37, PULSESTARTPOINTSDAC, wv
3151+
SetDimLabel LAYERS, 38, SAMPLINGINTERVALDAC, wv
31483152

31493153
SetNumberInWaveNote(wv, AUTOBIAS_LAST_INVOCATION_KEY, 0)
31503154
SetNumberInWaveNote(wv, DIMENSION_SCALING_LAST_INVOC, 0)

Packages/tests/Basic/UTF_ZeroMQPublishing.ipf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,6 @@ End
450450
static Function/WAVE PrepareTPData()
451451

452452
WAVE tpData = GetTPAnalysisDataWave()
453-
tpData[%NOW] = 1E6
454453
tpData[%HEADSTAGE] = 1
455454
tpData[%MARKER] = 1234
456455
tpData[%NUMBER_OF_TP_CHANNELS] = 2
@@ -495,10 +494,6 @@ static Function CheckTPData(variable jsonId)
495494
CHECK_EQUAL_STR(stv, "TestDevice")
496495
var = JSON_GetVariable(jsonID, "/properties/clamp mode")
497496
CHECK_EQUAL_VAR(var, clampMode)
498-
var = JSON_GetVariable(jsonID, "/properties/time of tp acquisition/value")
499-
CHECK_EQUAL_VAR(var, 1E6)
500-
stv = JSON_GetString(jsonID, "/properties/time of tp acquisition/unit")
501-
CHECK_EQUAL_STR(stv, "s")
502497
var = JSON_GetVariable(jsonID, "/properties/clamp amplitude/value")
503498
CHECK_EQUAL_VAR(var, 10)
504499
stv = JSON_GetString(jsonID, "/properties/clamp amplitude/unit")

Packages/tests/HardwareBasic/UTF_TestPulseAndTPDuringDAQ.ipf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,10 +1493,6 @@ static Function TestTPPublishing_REENTRY([string str])
14931493
daUnit = GetDAChannelUnit(var)
14941494
adUnit = GetADChannelUnit(var)
14951495

1496-
var = JSON_GetVariable(jsonID, "/properties/time of tp acquisition/value")
1497-
CHECK_EQUAL_VAR(var, tpStorage[index][headstage][%TimeInSeconds])
1498-
stv = JSON_GetString(jsonID, "/properties/time of tp acquisition/unit")
1499-
CHECK_EQUAL_STR(stv, "s")
15001496
var = JSON_GetVariable(jsonID, "/properties/clamp amplitude/value")
15011497
CHECK_EQUAL_VAR(var, tpStorage[index][headstage][%CLAMPAMP])
15021498
stv = JSON_GetString(jsonID, "/properties/clamp amplitude/unit")

0 commit comments

Comments
 (0)