From ae1a136a301371b5096d80d154b447f502a7b0c4 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 10 Nov 2023 14:29:24 +0100 Subject: [PATCH] changes --- .../MIES/MIES_AnalysisFunctions_PatchSeq.ipf | 4 ++- .../HardwareAnalysisFunctions.pxp | Bin 1796 -> 1787 bytes .../UTF_PatchSeqDAScale.ipf | 34 +++++++++--------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Packages/MIES/MIES_AnalysisFunctions_PatchSeq.ipf b/Packages/MIES/MIES_AnalysisFunctions_PatchSeq.ipf index c45eb13878..03a8dea9f6 100644 --- a/Packages/MIES/MIES_AnalysisFunctions_PatchSeq.ipf +++ b/Packages/MIES/MIES_AnalysisFunctions_PatchSeq.ipf @@ -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 diff --git a/Packages/tests/HardwareAnalysisFunctions/HardwareAnalysisFunctions.pxp b/Packages/tests/HardwareAnalysisFunctions/HardwareAnalysisFunctions.pxp index 7e7f619bf96419930ce25a67c506fbe5b7dc129e..efd15e7db0299433fbaf6f37725e06190f2c08a5 100644 GIT binary patch literal 1787 zcmVaFnrqIGR_#x5yq`}4%xs+Ik zALde)VW1|4yN~2lyF2XcP#-|hzo9t==(X1zb1RIZ|3UtO^lG3$dPq-25#`NtDecOn zY$5HT?Fh@^zVG?XdvAuiscG6OJ|Ey;jd^CrkW@${%ovrWbH-1U?%Y_nX;azb!kMXv za^VrvV&m68{^d!0E*_ul@qd%^Q(V@TkKLR2a}XZmZfOAK!L-%RU%>9o{~cOWP)Q)| z^B{5Gl_JL|5XMY>-^D*Qejd-nzCQi>bR+&G){mdee-+nae~3-EN%RB(tNrYRuO{rv6)EUYrs0KVnaOoEPFP#QFaGzy53G(m)Z(f^!S30Q#&@$SOP;NhHe`V?o43Lt!eQ%oj(uETK=c!7e$cP0E@r-ya zy#0zAkIhA87OusjGS_2jgv>51T=23O-XFzVT!=?y6d^*IzZlrP*agyEBt%F*_6Z@< zo%o%o#O>JasKl-Kt*Fv13~q8Vy>my@LPCIESvR!AE9-_j%awIQxprmU(6(J!_xd@a zAL7?fgJKzQ2QI_<*T_`QWLVm_r>CbcE+%Tg*7HNbe**^+@(u$p&H7yAo76m@eem)U zJn7|ksj!ZyfTBz76OVb7k!wmk486Rj0{bioEYPZO+X68qLKA7~IS&luI(;=Guu^`{ z!!tK8alO>b7l*?#l{DYt)WHJI@6$u5ffUU2@>PtPGzBMH=aJW{x{=pzqpxmI{w*-U zmHW)K_|dfb&s-?>M`hyoCG?PCgPvBj4ykK`McRCLMhg%jyhqMZ8A}J8;Kk*V`jCy^ zkC{jIB(s@B%rk7LNZf6M4SnU3?1DY?B}-HSuI_|1Z7#>kCGI%XwI(mF=($(^60q75y26ALm}X(rHp@VkiA= zxoDWwMjfQz40Qtkj;g!rJf1nichtKm)ed&)MWczgTM4u7xCG_Gx)I#gS2Yk7W`p;5 zl8h=36w+QAnHt3e1Wn+D~_ODHHL_u8 zG_)|un$!jRu{u}O`SABY{rMhF%Ab+_oi@32sP{X_&t|d8#y_A6K^LjFQ>41nXazqG z3R{`wN6RTfg*jjnOgR!zsJasD6!A_x2~Hc1rS6*C!m27H11ss3+*&S~A_L}0EcK`i z)?0cLnb@VxBZe*F5(5HE0e+jgRIEEX9y!M+{%Efuz#}TO7e0bWk#rsKXI@)OiU^_LXfoFu;uYblaMaG#hwI#jc14; zTZ&S6-^|5`5;cAZ<2=eXaf3E98*8cD)|Q$!@og=&v9=bGDv_;KByVl5;O9ziYh8)1 z0?ucS^f@>8XM31teiEDOFR%w}AHxObj8I1up5LX>2aI3bkT{Dw}=BTFx9y z14D&Lj+h*fdX-E-Rt6{7C?Ji_ezm>ZsaHF@#a4O0*wQaIRc)76HusF}kijYDCQ?^0 zy1u*|3G!?QLs2TTC>OE1#Ck3QMrJK$3V%v;Go+%xCJgd`ER4ODa7;mjVXM9)dE=_eC4pluN z-Gz!M7alPqHvRn7pZ4NQ@%Z8u|2H|`!)@h!>^_Y@1?e%tO9QZ;&D-trCG0-^ze8&d zDhZ_hHb~r;rN{&Y!kFpzBmC*{gLpdj+4*PZkK%i=e*A3t&v7I6%h-&oB{cf>bdLLp zx@0Wjdn71>Zy4WS`p7p(7JGADpKpXr{kQnMy1?hZ$M$@jSK>{?`R?*p|3RF;i9Wm^ z;1&t+E=9kLIne#G^8r5FssJcI=JVCDQ9ih>*VH z6GEgr@jFq8+p*hGiCghoQKehx-0Wm}X+-o!LV#XdH?+lT>xMeZwRJ9u#KR1k-E>kYiWDp+)j-9x#sZUlpe+Xl!3=79I+EZuaZHEP}lG7X9;28J}! z2E+E>!*#18N3oJa-QlBbb`szO5``N^1?AoYDXLGjvO;YKe-z)CAq?(Ysa49wC+-CK z!Uj9}R>s2lZ3B}CvwZ&@^GB_EO>4707ZU9BOd$DYGI0~Q-9A3>J;Sjl5peyY4a^2p z7DBS6WngWxrq)Jlbj?|F*IDW;l8?Jv8kr5J zvTywH7s33S>8!Dz_2>)iuZUe3dtDMg#%IZ|B*Xaphrcu5|I6@`tKxoLo^I>9J^%Ih ze|Q5Y-46CY|G=1?`TF|~@-rDs=js11g`kLQ?G&jT)|Oqdg}MhY^G z%oAL>g?-CXEo{-ef44SryCC<^9>dw)q#rZ0*+N`(pQ-SkxSPFqkGx$VJ1LSxatl$?k4`-+{!&nKhpEV?ex}8M6iL8 z+||sjTux8B__dRIw1ZNQnd3|m^AJHPgv$3%s_1SF6Hh0J-}=JYl9=5R^eyERtdoB( zrB-KRQcbt&6&~EYiP?pRE^%?!l9RsAAk?zJ^N0(0659mN7~<(;SCKIu!2vg&SWT?1 zGj2H}8%Q#bWz$)BYe@RSHuM+=Qao85fq@}N-8cwLhQK|Bep~t2fQ7&S2o%J{ZMiy;m4u6h!3#6ip%{F@f{(Vx%l$^h0 mDolT2sTa86C5Su1kaZ!*02{L(?***);`|RcE$M&i6951w+LjFf diff --git a/Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqDAScale.ipf b/Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqDAScale.ipf index 52f08b336b..cb24cf4efa 100644 --- a/Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqDAScale.ipf +++ b/Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqDAScale.ipf @@ -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}) @@ -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}) @@ -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}) @@ -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}) @@ -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}) @@ -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}) @@ -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}) @@ -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) @@ -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) @@ -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 @@ -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}) @@ -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}) @@ -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}) @@ -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}) @@ -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}) @@ -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}) @@ -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})