Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@t-b
t-b committed Nov 10, 2023
1 parent 25cb5a7 commit ae1a136
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
4 changes: 3 additions & 1 deletion Packages/MIES/MIES_AnalysisFunctions_PatchSeq.ipf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2902,9 +2902,11 @@ Function PSQ_DAScale(device, s)
ret = PSQ_DS_AdaptiveDetermineSweepQCResults(device, s.sweepNo, s.headstage)
if(ret == PSQ_RESULTS_DONE)
break
elseif(ret == PSQ_RESULTS_CONT)
DAScalesIndex[s.headstage] += 1
endif

// todo calcuate new DAScale value and apply overshoot correction if required
// todo calculate new DAScale value and apply overshoot correction if required
//
// we append to the futureDAScales LBN entry and use DAScalesIndex to navigate

Expand Down
Binary file modified Packages/tests/HardwareAnalysisFunctions/HardwareAnalysisFunctions.pxp
View file
Binary file not shown.
34 changes: 17 additions & 17 deletions Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqDAScale.ipf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ static Function PS_DS_Sub1_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520})
Expand Down Expand Up @@ -444,7 +444,7 @@ static Function PS_DS_Sub2_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520, 2520, 3020, 3020, 3520})
Expand Down Expand Up @@ -619,7 +619,7 @@ static Function PS_DS_Sub3_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), 4)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), 4)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520})
Expand Down Expand Up @@ -839,7 +839,7 @@ static Function PS_DS_Sub4_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), 4)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), 4)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520, 2520, 3020, 3020, 3520})
Expand Down Expand Up @@ -992,7 +992,7 @@ static Function PS_DS_Sub5_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520})
Expand Down Expand Up @@ -1145,7 +1145,7 @@ static Function PS_DS_Sub5a_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520})
Expand Down Expand Up @@ -1366,7 +1366,7 @@ static Function PS_DS_Sub6_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), 4)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), 4)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520, 2520, 3020})
Expand Down Expand Up @@ -1543,7 +1543,7 @@ static Function PS_DS_Sub7_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), 6)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), 6)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520}, sweep = 0)
Expand Down Expand Up @@ -1733,7 +1733,7 @@ static Function PS_DS_Sub8_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), 8)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), 8)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520}, sweep = 0)
Expand Down Expand Up @@ -1897,7 +1897,7 @@ static Function PS_DS_Sub9_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
End
Expand Down Expand Up @@ -2076,7 +2076,7 @@ static Function PS_DS_Sub10_REENTRY([str])

CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520})
Expand Down Expand Up @@ -2181,7 +2181,7 @@ static Function PS_DS_Supra1_REENTRY([str])
Make/FREE/D/N=(numEntries) stimScaleRef = {PSQ_DS_OFFSETSCALE_FAKE + 20, PSQ_DS_OFFSETSCALE_FAKE + 40}
CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520})
Expand Down Expand Up @@ -2285,7 +2285,7 @@ static Function PS_DS_Supra2_REENTRY([str])
Make/FREE/D/N=(numEntries) stimScaleRef = {PSQ_DS_OFFSETSCALE_FAKE * 20, PSQ_DS_OFFSETSCALE_FAKE * 40}
CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520})
Expand Down Expand Up @@ -2392,7 +2392,7 @@ static Function PS_DS_Supra3_REENTRY([str])
Make/FREE/D/N=(numEntries) stimScaleRef = {PSQ_DS_OFFSETSCALE_FAKE + 20, PSQ_DS_OFFSETSCALE_FAKE + 40, PSQ_DS_OFFSETSCALE_FAKE + 60, PSQ_DS_OFFSETSCALE_FAKE + 80, PSQ_DS_OFFSETSCALE_FAKE + 100}
CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520})
Expand Down Expand Up @@ -2499,7 +2499,7 @@ static Function PS_DS_Supra4_REENTRY([str])
Make/FREE/D/N=(numEntries) stimScaleRef = {PSQ_DS_OFFSETSCALE_FAKE + 20, PSQ_DS_OFFSETSCALE_FAKE + 40, PSQ_DS_OFFSETSCALE_FAKE + 60, PSQ_DS_OFFSETSCALE_FAKE + 80, PSQ_DS_OFFSETSCALE_FAKE + 100}
CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520})
Expand Down Expand Up @@ -2622,7 +2622,7 @@ static Function PS_DS_Supra5_REENTRY([str])
// 5. last above
CHECK_EQUAL_WAVES(stimScale, stimScaleRef, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520})
Expand Down Expand Up @@ -2730,7 +2730,7 @@ static Function PS_DS_Supra6_REENTRY([str])
WAVE/Z stimScale = GetLBNEntries_IGNORE(str, sweepNo, STIMSET_SCALE_FACTOR_KEY)
CHECK_EQUAL_WAVES(stimScale, {43, 43, 43, 43, 43}, mode = WAVE_DATA, tol = 1e-14)

CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScaleSub(str, PSQ_TEST_HEADSTAGE), -1)
CHECK_EQUAL_VAR(MIES_PSQ#PSQ_GetLastPassingDAScale(str, PSQ_TEST_HEADSTAGE, PSQ_DS_SUB), -1)

CommonAnalysisFunctionChecks(str, sweepNo, setPassed)
CheckPSQChunkTimes(str, {20, 520, 2020, 2520})
Expand Down

0 comments on commit ae1a136

Please sign in to comment.