IVS_runInitAccessResisQC: Prefer analysis function PSQ_AccessResistance

Author: t-b

Packages/MIES/MIES_IVSCC.ipf

@@ -196,92 +196,18 @@ Function IVS_runBaselineCheckQC()
 	PGC_SetAndActivateControl(device, "DataAcquireButton")
 End
 
-/// @brief Run the initial access resistance check from the WSE
-///
-/// This will check must be < 20MΩ or 15% of the R input.
-/// The EXTPBREAKN wave will also be run as a way of making sure the reading
-/// is recorded into the data set for post-experiment analysis
+/// @brief Run the initial access resistance smoke from the WSE
 Function IVS_runInitAccessResisQC()
-
-	string device
+	string device, ctrl
 	variable headstage
-	variable baselineValue, instResistanceVal, ssResistanceVal
-	variable qcResult, adChannel, tpBufferSetting
-	string ctrl
 
 	device = IVS_DEFAULT_DEVICE
 	headstage  = IVS_DEFAULT_HEADSTAGE
 
 	ctrl = GetPanelControl(headstage, CHANNEL_TYPE_DAC, CHANNEL_CONTROL_WAVE)
 	PGC_SetAndActivateControl(device, ctrl, str = "EXTPBREAKN*")
 
-	// save the current test pulse buffer setting
-	tpBufferSetting = GetSetVariable(device, "setvar_Settings_TPBuffer")
-
-	// set the test pulse buffer up to a higher value to account for noise...using 5 for now
-	PGC_SetAndActivateControl(device, "setvar_Settings_TPBuffer", val = 5)
-
-	// Check to see if Test Pulse is already running...if not running, turn it on...
-	if(!TP_CheckIfTestpulseIsRunning(device))
-		PGC_SetAndActivateControl(device, "StartTestPulseButton")
-	endif
-
-	// Set up the QC Wave so the background task can get the information it needs
-	Wave tempWave = GetIVSCCTemporaryWave(device)
-	tempWave[%tpBuffer] = tpBufferSetting
-
-	CtrlNamedBackground IVS_finishInitAccessQCCheck, period=2, proc=IVS_finishInitAccessQCCheck
-	CtrlNamedBackground IVS_finishInitAccessQCCheck, start
-End
-
-/// @brief Complete the Baseline QC check in the background
-///
-/// @ingroup BackgroundFunctions
-Function IVS_finishInitAccessQCCheck(s)
-	STRUCT WMBackgroundStruct &s
-
-	string device
-	variable headstage, cycles
-	variable instResistanceVal, ssResistanceVal, tpBufferSetting
-	variable qcResult
-
-	device = IVS_DEFAULT_DEVICE
-	headstage  = IVS_DEFAULT_HEADSTAGE
-
-	Wave tempWave = GetIVSCCTemporaryWave(device)
-	tpBufferSetting = tempWave[%tpBuffer]
-
-	cycles = 5 //define how many cycles the test pulse must run
-	if(TP_TestPulseHasCycled(device, cycles))
-		print "Enough Cycles passed..."
-	else
-		PUB_IVS_QCState(qcResult, "Too few TP cycles")
-		return 0
-	endif
-
-	WAVE TPResults = GetTPResults(device)
-
-	instResistanceVal = TPResults[%ResistanceInst][headstage]
-	ssResistanceVal = TPResults[%ResistanceSteadyState][headstage]
-
-	printf "Initial Access Resistance: %g\r", instResistanceVal
-	printf "SS Resistance: %g\r", ssResistanceVal
-
-	// See if we pass the baseline QC
-	if ((instResistanceVal < 20.0) && (instResistanceVal < (0.15 * ssResistanceVal)))
-		qcResult = instResistanceVal
-		PUB_IVS_QCState(qcResult, "Resistance check")
-	endif
-
-	// and now run the EXTPBREAKN wave so that things are saved into the data record
 	PGC_SetAndActivateControl(device, "DataAcquireButton")
-
-	PUB_IVS_QCState(qcResult, "Result before finishing")
-
-	// set the test pulse buffer back to 1
-	PGC_SetAndActivateControl(device, "setvar_Settings_TPBuffer", val = tpBufferSetting)
-
-	return 1
 End
 
 /// @brief Run PSQ_SealEvaluation()

Packages/MIES/MIES_Publish.ipf

@@ -329,36 +329,6 @@ Function PUB_ClampModeChange(string device, variable headstage, variable oldClam
 	PUB_Publish(jsonID, AMPLIFIER_CLAMP_MODE_FILTER)
 End
 
-/// @brief Push QC results onto ZeroMQ Publisher socket
-///
-/// Filter: #IVS_PUB_FILTER
-///
-/// Payload: JSON-encoded string with three elements in the top-level object
-///
-/// Example:
-///
-/// \rst
-/// .. code-block:: json
-///
-///    {
-///      "Description": "some text",
-///      "Issuer": "My QC Function",
-///      "Value": 123
-///    }
-///
-/// \endrst
-Function PUB_IVS_QCState(variable result, string description)
-	variable jsonID
-
-	jsonID = JSON_New()
-	JSON_AddTreeObject(jsonID, "")
-	JSON_AddString(jsonID, "Issuer", GetRTStackInfo(2))
-	JSON_AddVariable(jsonID, "Value", result)
-	JSON_AddString(jsonID, "Description", description)
-
-	PUB_Publish(jsonID, IVS_PUB_FILTER)
-End
-
 /// Filter: #PRESSURE_STATE_FILTER
 ///
 /// Example:

Packages/MIES/MIES_WaveDataFolderGetters.ipf

@@ -4630,28 +4630,6 @@ Function/WAVE P_PressureDataTxtWaveRef(device)
 End
 /// @}
 
-/// @brief Returns a wave reference to the temporary wave for IVSCC
-///
-/// Rows:
-/// - 0: tpBuffer, used to hold previous tp settings.
-///      Setting will be restored upon completion of qc function.
-Function/Wave GetIVSCCTemporaryWave(device)
-	string device
-
-	DFREF dfr = GetDevSpecLabNBTempFolder(device)
-
-	WAVE/D/Z/SDFR=dfr wv = IVSCCTemporary
-
-	if(WaveExists(wv))
-		return wv
-	endif
-
-	Make/D/N=(1) dfr:IVSCCTemporary/Wave=wv
-	SetDimLabel 0, 0, tpBuffer, wv
-
-	return wv
-End
-
 /// @brief Return the data folder reference to the device specific lab notebook folder for temporary waves
 Function/DF GetDevSpecLabNBTempFolder(device)
 	string device

Packages/Testing-MIES/UTF_ZeroMQPublishing.ipf

@@ -357,24 +357,6 @@ static Function CheckTrueRestMembPot()
 	JSON_Release(jsonID)
 End
 
-static Function CheckIVSCC()
-	string expected, actual
-	variable jsonID
-
-	MIES_PUB#PUB_IVS_QCState(123, "some text")
-
-	jsonID = FetchAndParseMessage(IVS_PUB_FILTER)
-	expected = JSON_GetString(jsonID, "/Issuer")
-	actual   = "CheckIVSCC"
-	CHECK_EQUAL_STR(actual, expected)
-
-	expected = JSON_GetString(jsonID, "/Description")
-	actual   = "some text"
-	CHECK_EQUAL_STR(actual, expected)
-
-	CHECK_EQUAL_VAR(JSON_GetVariable(jsonID, "/Value"), 123)
-End
-
 static Function CheckDAQStateChange_DAQ()
 	string device, actual, expected
 	variable headstage, i, jsonID, type