Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
t-b committed Aug 6, 2024
1 parent f745847 commit 9526a6e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Packages/MIES/MIES_AnalysisFunctions_MultiPatchSeq.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@ Function MSQ_DAScale(device, s)
string device
STRUCT AnalysisFunction_V3 &s

variable i, index, ret, headstagePassed, val, sweepNo
variable i, index, ret, headstagePassed, val, sweepNo, limitCheck, retCheckDAScale
string msg, key, ctrl

switch(s.eventType)
Expand Down Expand Up @@ -1270,14 +1270,14 @@ Function MSQ_DAScale(device, s)

index = mod(DAScalesIndex[i], DimSize(DAScales, ROWS))

limitsCheck = (s.eventType == POST_SWEEP_EVENT)
limitCheck = (s.eventType == POST_SWEEP_EVENT)
retCheckDAScale = 0

ASSERT(isFinite(daScaleOffset[i]), "DAScale offset is non-finite")
retCheckDAScale = SetDAScale(device, i, s.sweepNo, absolute = (DAScales[index] + daScaleOffset[i]) * PICO_TO_ONE, limitsCheck = limitsCheck)
retCheckDAScale = SetDAScale(device, i, s.sweepNo, absolute = (DAScales[index] + daScaleOffset[i]) * PICO_TO_ONE, limitCheck = limitCheck)
DAScalesIndex[i] += 1

if(limitsCheck && retCheckDAScale)
if(limitCheck && retCheckDAScale)
ComplainOutOfRangeDAScale(device, s.sweepNo, MSQ_DA_SCALE)
break
endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ static Function SC_GetSweepPassed(string device, variable sweepNo)
FindValue/RMD=[][setSweepCount]/V=(0.0) headstageQCTotalPerSweepCount
setSweepQC = (V_Value == -1)

Make/N=(NUM_HEADSTAGES)/FREE DAScaleOOR = MSQ_GetLBNEntryForHSSCIBool(numericalValues, s.sweepNo, \
Make/N=(NUM_HEADSTAGES)/FREE DAScaleOOR = MSQ_GetLBNEntryForHSSCIBool(numericalValues, sweepNo, \
MSQ_FAST_RHEO_EST, MSQ_FMT_LBN_DASCALE_OOR, p)

return setSweepQC && Sum(DAScaleOOR) == 0
Expand Down Expand Up @@ -791,7 +791,7 @@ static Function SC_ReactToQCFailures(string device, variable sweepNo, string par
endif

if(retCheckDAScale)
ComplainOutOfRangeDAScale(device, s.sweepNo, SC_SPIKE_CONTROL)
ComplainOutOfRangeDAScale(device, sweepNo, SC_SPIKE_CONTROL)
endif
End

Expand Down

0 comments on commit 9526a6e

Please sign in to comment.