UTF_BasicHardwareTests.ipf: Prefer TADXX shorthand

Author: t-b

Packages/tests/HardwareBasic/UTF_BasicHardwareTests.ipf

@@ -117,14 +117,12 @@ End
 static Function Abort_ITI_TP_A_TP([STRUCT IUTF_MDATA &md])
 
 	STRUCT ACD_DAQSettings s
-	ACD_InitDAQSettingsFromString(s, "MD" + num2str(md.v0) + "_RA1_I1_L0_BKG1_GSI0_ITI5_RES5"         + \
+	ACD_InitDAQSettingsFromString(s, "MD" + num2str(md.v0) + "_RA1_I1_L0_BKG1_GSI0_ITI5_RES5_TAD1"         + \
 	                                 "__HS0_DA0_AD0_CM:IC:_ST:StimulusSetC_DA_0:_IST:StimulusSetD_DA_0:")
 	ACD_AcquireData(s, md.s0)
 
 	CtrlNamedBackGround StopTPAfterSomeTime, start=(ticks + 420), period=60, proc=StopTP_IGNORE
 	CtrlNamedBackGround Abort_ITI_TP, start, period=30, proc=StartTPDuringITI_IGNORE
-
-	PGC_SetAndActivateControl(md.s0, "check_Settings_TPAfterDAQ", val = 1)
 End
 
 static Function Abort_ITI_TP_A_TP_REENTRY([STRUCT IUTF_MDATA &md])
@@ -254,8 +252,6 @@ static Function Abort_ITI_TP_A_PressAcq([STRUCT IUTF_MDATA &md])
 
 	CtrlNamedBackGround StopTPAfterSomeTime, start=(ticks + 420), period=60, proc=StopTP_IGNORE
 	CtrlNamedBackGround Abort_ITI_PressAcq, start, period=30, proc=StopAcqDuringITI_IGNORE
-
-	PGC_SetAndActivateControl(md.s0, "check_Settings_TPAfterDAQ", val = 1)
 End
 
 static Function Abort_ITI_TP_A_PressAcq_REENTRY([STRUCT IUTF_MDATA &md])
@@ -308,8 +304,6 @@ End
 
 static Function ChangeStimSetDuringDAQ_PreAcq(string device)
 
-	PGC_SetAndActivateControl(device, "check_Settings_TPAfterDAQ", val = 1)
-
 	CtrlNamedBackGround StopTPAfterSomeTime, start=(ticks + 600), period=60, proc=StopTP_IGNORE
 	CtrlNamedBackGround ChangeStimsetDuringDAQ, start, period=30, proc=ChangeStimSet_IGNORE
 End
@@ -318,7 +312,7 @@ End
 static Function ChangeStimSetDuringDAQ([string str])
 
 	STRUCT ACD_DAQSettings s
-	ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_RES1"                    + \
+	ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_RES1_TAD1"                    + \
 	                                 "__HS0_DA0_AD0_CM:IC:_ST:StimulusSetA_DA_0:" + \
 	                                 "__HS1_DA1_AD1_CM:VC:_ST:StimulusSetC_DA_0:")
 	ACD_AcquireData(s, str)