Skip to content

Commit 4c3a968

Browse files
t-bt-b
committed
changes
1 parent abd3ea9 commit 4c3a968

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎Packages/MIES/MIES_AnalysisFunctions_PatchSeq.ipf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,14 +2178,14 @@ static Function [WAVE/D fitOffset, WAVE/D fitSlope, string errMsg] PSQ_DS_FitFre
21782178
WAVE numericalValues = GetLBNumericalValues(device)
21792179
WAVE textualValues = GetLBTextualValues(device)
21802180

2181-
// if(sweepNo == 2)
2182-
// debugger
2183-
// endif
2181+
// if(sweepNo == 2)
2182+
// debugger
2183+
// endif
21842184

21852185
[WAVE DAScales, emptySCI] = PSQ_DS_GetLabnotebookData(numericalValues, textualValues, sweepNo, headstage, PSQ_DS_DASCALE, filterPassing = 1, beforeSweepQCResult = beforeSweepQCResult, filterNegSlopeAndNaN = 1, fromRhSuAd = fromRhSuAd)
21862186
[WAVE apfreq, emptySCI] = PSQ_DS_GetLabnotebookData(numericalValues, textualValues, sweepNo, headstage, PSQ_DS_APFREQ, filterPassing = 1, beforeSweepQCResult = beforeSweepQCResult, filterNegSlopeAndNaN = 1, fromRhSuAd = fromRhSuAd)
21872187

2188-
if(!WaveExists(apFreq) && !WaveExists(DAScales) || (emptySCI && !fromRhSuAd))
2188+
if((!WaveExists(apFreq) && !WaveExists(DAScales)) || (emptySCI && !fromRhSuAd))
21892189
return [$"", $"", "No apfreq/DAScales data"]
21902190
endif
21912191

@@ -3122,7 +3122,7 @@ static Function [WAVE data, variable emptySCI] PSQ_DS_GetLabnotebookData(WAVE nu
31223122
WaveClear dataRhSuAdLBN
31233123

31243124
switch(type)
3125-
case PSQ_DS_SWEEP_PASS:
3125+
case PSQ_DS_SWEEP_PASS: // FIXME(CodeStyleFallthroughCaseRequireComment)
31263126
case PSQ_DS_SWEEP_EXCEPT_BL_PP_PASS:
31273127
// we store the sweep number of the passing sweeps for RhSuAd
31283128
// but actually only need if passing or not
@@ -3154,8 +3154,8 @@ static Function [WAVE data, variable emptySCI] PSQ_DS_GetLabnotebookData(WAVE nu
31543154

31553155
WAVE negSlopesPassedRhSuAd = ListToNumericWave(negSlopesPassedRhSuAdLBN[INDEP_HEADSTAGE], ";")
31563156
WaveClear negSlopesPassedRhSuAdLBN
3157-
// can be empty if dataRhSuAd has only one element
3158-
// ASSERT(DimSize(negSlopesPassedRhSuAd, ROWS) > 0, "negSlopesPassedRhSuAd must not be empty")
3157+
// can be empty if dataRhSuAd has only one element
3158+
// ASSERT(DimSize(negSlopesPassedRhSuAd, ROWS) > 0, "negSlopesPassedRhSuAd must not be empty")
31593159

31603160
key = CreateAnaFuncLBNKey(PSQ_DA_SCALE, PSQ_FMT_LBN_DA_AT_RSA_FI_SLOPES, query = 1)
31613161
WAVE/Z/T fISlopesRhSuAdLBN = GetLastSettingTextSCI(numericalValues, textualValues, sweepNo, key, headstage, UNKNOWN_MODE)
@@ -3174,8 +3174,8 @@ static Function [WAVE data, variable emptySCI] PSQ_DS_GetLabnotebookData(WAVE nu
31743174

31753175
WAVE fISlopesRhSuAd = ListToNumericWave(fISlopesRhSuAdLBN[headstage], ";")
31763176
WaveClear fISlopesRhSuAdLBN
3177-
// dito
3178-
// ASSERT(DimSize(fISlopesRhSuAd, ROWS) > 0, "fISlopesRhSuAd must not be empty")
3177+
// dito
3178+
// ASSERT(DimSize(fISlopesRhSuAd, ROWS) > 0, "fISlopesRhSuAd must not be empty")
31793179

31803180
Duplicate/FREE negSlopesPassedRhSuAd, filterPassedRhSuAd
31813181

‎Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqDAScale_Adapt.ipf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ End
262262
static Function CheckSurveyPlot(string device, WAVE/WAVE entries)
263263

264264
PASS()
265-
265+
266266
return NaN
267267

268268
string databrowser, sfgraph, allGraphs, traceList, graph
@@ -291,9 +291,9 @@ static Function CheckSurveyPlot(string device, WAVE/WAVE entries)
291291
else
292292
WAVE fISlopeFiltered = entries[%fiSlopesFromRhSuAd]
293293
endif
294-
294+
295295
Duplicate/FREE sweepPass, sweepPassAndFINegSlopePass
296-
296+
297297
// TODO
298298
sweepPassAndFINegSlopePass[] = sweepPass[p] && !fiNegSlopePass[p] && !IsNaN(fiSlopeFiltered[p])
299299

@@ -398,10 +398,10 @@ static Function PrintSomeValues(WAVE/WAVE entries)
398398

399399
WAVE wv = entries[%fiSlopeReachedPass]
400400
print/D wv
401-
401+
402402
WAVE wv = entries[%fiNegSlopePass]
403403
print/D wv
404-
404+
405405
WAVE wv = entries[%fiNegSlopesPassFromRhSuAd]
406406
print/D wv
407407
End
@@ -1976,7 +1976,7 @@ static Function PS_DS_AD12a_REENTRY([string str])
19761976
variable sweepNo
19771977

19781978
[WAVE/WAVE entries, sweepNo] = GetEntries_IGNORE(str)
1979-
1979+
19801980
CHECK_EQUAL_TEXTWAVES(entries[%opMode], {PSQ_DS_ADAPT}, mode = WAVE_DATA)
19811981

19821982
CHECK_EQUAL_WAVES(entries[%setPass], {1}, mode = WAVE_DATA)
@@ -1990,7 +1990,7 @@ static Function PS_DS_AD12a_REENTRY([string str])
19901990
CHECK_EQUAL_WAVES(entries[%samplingPass], {1, 1, 1, 1, 1, 1, 1}, mode = WAVE_DATA)
19911991
CHECK_EQUAL_WAVES(entries[%fillinPass], {0, 0, 0, 1, 1, 0, 1}, mode = WAVE_DATA)
19921992

1993-
CHECK_EQUAL_WAVES(entries[%futureDAScalesPass], {0, 1, 0, 1, 0,0, 1}, mode = WAVE_DATA)
1993+
CHECK_EQUAL_WAVES(entries[%futureDAScalesPass], {0, 1, 0, 1, 0, 0, 1}, mode = WAVE_DATA)
19941994
CHECK_EQUAL_WAVES(entries[%fiSlopeReachedPass], {0, 0, 1, 0, 0, 0, 0}, mode = WAVE_DATA)
19951995
CHECK_EQUAL_WAVES(entries[%fiNegSlopePass], {0, 0, 1, 0, 0, 1, 0}, mode = WAVE_DATA)
19961996
CHECK_EQUAL_WAVES(entries[%enoughFIPointsPass], {1, 1, 1, 1, 1, 1, 1}, mode = WAVE_DATA)
@@ -2012,8 +2012,8 @@ static Function PS_DS_AD12a_REENTRY([string str])
20122012
CHECK_EQUAL_WAVES(entries[%sweepPassFromRhSuAd], sweepPassedFRomRhSuAd, mode = WAVE_DATA)
20132013

20142014
Make/FREE/D maxSlopeRef = {457.1428571428571, 457.1428571428571, 457.1428571428571, 457.1428571428571, 457.1428571428571, 457.1428571428571, 457.1428571428571}
2015-
Make/FREE/D fiSlopeRef = {457.1428571428571,457.1428571428571,-500,457.1428571428571,244,-533.3333333333333,-2100}
2016-
Make/FREE/D fiOffsetRef = {-2,-2,65,-2,5.460000000000001,67.33333333333333,177}
2015+
Make/FREE/D fiSlopeRef = {457.1428571428571, 457.1428571428571, -500, 457.1428571428571, 244, -533.3333333333333, -2100}
2016+
Make/FREE/D fiOffsetRef = {-2, -2, 65, -2, 5.460000000000001, 67.33333333333333, 177}
20172017
Make/FREE/T futureDAScalesRef = {"RegRhSuAd:7;Reg:9;", \
20182018
"RegRhSuAd:7;Reg:9;", \
20192019
"RegRhSuAd:7;Reg:9;Fillin:6;", \

0 commit comments

Comments
 (0)