WIP: AcquireData_NG

Author: t-b

Packages/MIES/MIES_AcquireData.ipf

@@ -142,7 +142,7 @@ End
 /// @brief Fill the #ACD_DAQSettings structure from a specially crafted string
 Function ACD_InitDAQSettingsFromString(STRUCT ACD_DAQSettings &s, string str)
 
-	variable md, ra, idx, lidx, bkg_daq, res, headstage, clampMode, ttl
+	variable md, ra, idx, lidx, bkg_daq, res, headstage, clampMode, ttl, async
 	string elem, output
 
 	sscanf str, "MD%d_RA%d_I%d_L%d_BKG%d", md, ra, idx, lidx, bkg_daq
@@ -176,6 +176,8 @@ Function ACD_InitDAQSettingsFromString(STRUCT ACD_DAQSettings &s, string str)
 
 	s.tbp = ACD_ParseNumber(str, "_TBP", defValue = NaN)
 
+	s.tad = ACD_ParseNumber(str, "_TAD", defValue = 0)
+
 	// default to DAQ if nothing is choosen
 	if(IsNaN(s.daq) && IsNaN(s.tp))
 		s.daq = 1
@@ -216,6 +218,13 @@ Function ACD_InitDAQSettingsFromString(STRUCT ACD_DAQSettings &s, string str)
 		Make/FREE/N=(NUM_HEADSTAGES) s.da = NaN
 		Make/FREE/N=(NUM_HEADSTAGES) s.cm = NaN
 		Make/FREE/N=(NUM_HEADSTAGES) s.aso = NaN
+		Make/FREE/N=(NUM_HEADSTAGES) s.ab = NaN
+		Make/FREE/N=(NUM_HEADSTAGES)/D s.abv = NaN
+		Make/FREE/N=(NUM_HEADSTAGES)/D s.abvv = NaN
+		Make/FREE/N=(NUM_HEADSTAGES) s.asyncAD = NaN
+		Make/FREE/N=(NUM_HEADSTAGES) s.asyncAlarm = NaN
+		Make/FREE/N=(NUM_HEADSTAGES)/D s.da_scale = NaN
+
 		Make/FREE/T/N=(NUM_HEADSTAGES) s.st, s.ist, s.af, s.st_ttl, s.iaf
 
 		for(elem : hsConfig)
@@ -227,6 +236,12 @@ Function ACD_InitDAQSettingsFromString(STRUCT ACD_DAQSettings &s, string str)
 
 				s.st_ttl[ttl] = ACD_ParseString(elem, "_ST", defValue = "")
 				continue
+			elseif(GrepString(elem, "^ASYNC"))
+				async            = ACD_ParseNumber(elem, "ASYNC")
+				s.asyncAD[async] = 1
+
+				s.asyncAlarm[async] = ACD_ParseNumber(elem, "_ALARM")
+				continue
 			endif
 
 			headstage = ACD_ParseNumber(elem, "HS")
@@ -262,6 +277,12 @@ Function ACD_InitDAQSettingsFromString(STRUCT ACD_DAQSettings &s, string str)
 			s.iaf[headstage] = ACD_ParseString(elem, "_IAF", defValue = "")
 
 			s.aso[headstage] = ACD_ParseNumber(elem, "_ASO", defValue = 1)
+
+			s.ab[headstage]   = ACD_ParseNumber(str, "_AB", defValue = NaN)
+			s.abv[headstage]  = ACD_ParseNumber(str, "_ABV", defValue = NaN)
+			s.abvv[headstage] = ACD_ParseNumber(str, "_ABVV", defValue = NaN)
+
+			s.da_scale[headstage] = ACD_ParseNumber(elem, "_DS", defValue = NaN)
 		endfor
 	endif
 End
@@ -324,6 +345,8 @@ End
 /// - TP Baseline Percentage: (TBP: [25, 49])
 /// - Fixed frequency acquisition: (FFR: see @ref DAP_GetSamplingFrequencies() for available values)
 /// - TP Duration: (TPD: [5, inf[)
+/// - TP Amplitute IC: (TAI) @todo check if this is really HS independent
+/// - TP After DAQ: (TAD: 1/0)
 ///
 /// HeadstageConfig:
 /// - Full specification: __HSXX_ADXX_DAXX_CM:XX:_ST:XX:_IST:XX:_AF:XX:_IAF:XX:_ASOXX
@@ -333,6 +356,7 @@ End
 ///      - DA
 ///      - CM (VC/IC/IZ): clamp mode
 ///   Optional:
+///      - TAI: Testpulse Amplitude IC
 ///      - ST: stimulus set
 ///      - IST: indexing stimulus set
 ///      - AF: analysis function for stimulus set
@@ -347,6 +371,10 @@ End
 ///   Optional:
 ///      - ST: TTL stimulus set
 ///
+/// AsyncConfig:
+/// - Full specification: __ASYNCXX_ADXX_AlARMXX_TTE:XX:_UN:XX:
+///   TODO
+///
 /// For tweaking data acquisition with full flexibility we also support
 /// customization functions before initialization, preInit aka before the DAEphys
 /// panel is created, and before acquisition, preAcq aka before the Start DAQ/TP
@@ -407,7 +435,7 @@ Function ACD_AcquireData(STRUCT ACD_DAQSettings &s, string device)
 		PGC_SetAndActivateControl(device, "Popup_Settings_IC_AD", str = num2str(s.ad[i]))
 #endif // !TESTS_WITH_SUTTER_HARDWARE
 
-		if(s.aso[i] != 1)
+		if(WaveExists(s.aso) && s.aso[i] != 1)
 #ifdef TESTS_WITH_SUTTER_HARDWARE
 			INFO("Unassociated channel %d is setup on an existing HS", n0 = i)
 			CHECK_GT_VAR(i + 1, deviceInfo[%DA])
@@ -467,6 +495,17 @@ Function ACD_AcquireData(STRUCT ACD_DAQSettings &s, string device)
 		PGC_SetAndActivateControl(device, ctrl, val = 1)
 		DoUpdate/W=$device
 
+		if(s.cm[i] == I_CLAMP_MODE)
+			PGC_SetAndActivateControl(device, "check_DataAcq_AutoBias", val = s.ab[i])
+			PGC_SetAndActivateControl(device, "setvar_DataAcq_AutoBiasV", val = s.abv[i])
+			PGC_SetAndActivateControl(device, "setvar_DataAcq_AutoBiasVrange", val = s.abvv[i])
+		endif
+
+		if(IsFinite(s.da_scale[i]))
+			ctrl = GetPanelControl(s.da[i], CHANNEL_TYPE_DAC, CHANNEL_CONTROL_SCALE)
+			PGC_SetAndActivateControl(device, ctrl, val = s.da_scale[i])
+		endif
+
 		activeHS += 1
 	endfor
 
@@ -492,6 +531,31 @@ Function ACD_AcquireData(STRUCT ACD_DAQSettings &s, string device)
 		endif
 	endfor
 
+	for(i = 0; i < NUM_ASYNC_CHANNELS; i += 1)
+
+		if(s.asyncAD[i] != 1)
+			continue
+		endif
+
+		ctrl = GetPanelControl(i, CHANNEL_TYPE_ASYNC, CHANNEL_CONTROL_CHECK)
+		PGC_SetAndActivateControl(device, ctrl, val = s.asyncAD[i])
+
+		ctrl = GetPanelControl(i, CHANNEL_TYPE_ALARM, CHANNEL_CONTROL_CHECK)
+		PGC_SetAndActivateControl(device, ctrl, val = s.asyncAlarm[i])
+
+		ctrl = GetPanelControl(i, CHANNEL_TYPE_ASYNC, CHANNEL_CONTROL_ALARM_MIN)
+		PGC_SetAndActivateControl(device, ctrl, val = s.asyncAlarmMin[i])
+
+		ctrl = GetPanelControl(i, CHANNEL_TYPE_ASYNC, CHANNEL_CONTROL_ALARM_MAX)
+		PGC_SetAndActivateControl(device, ctrl, val = s.asyncAlarmMax[i])
+
+		ctrl = GetPanelControl(i, CHANNEL_TYPE_ASYNC, CHANNEL_CONTROL_TITLE)
+		PGC_SetAndActivateControl(device, ctrl, str = s.asyncTitle[i])
+
+		ctrl = GetPanelControl(i, CHANNEL_TYPE_ASYNC, CHANNEL_CONTROL_UNIT)
+		PGC_SetAndActivateControl(device, ctrl, str = s.asyncUnit[i])
+	endfor
+
 	PGC_SetAndActivateControl(device, "check_Settings_RequireAmpConn", val = (s.amp ? CHECKBOX_SELECTED : CHECKBOX_UNSELECTED))
 	PGC_SetAndActivateControl(device, "check_Settings_MD", val = s.MD)
 	PGC_SetAndActivateControl(device, "Check_DataAcq1_RepeatAcq", val = s.RA)
@@ -505,6 +569,8 @@ Function ACD_AcquireData(STRUCT ACD_DAQSettings &s, string device)
 	PGC_SetAndActivateControl(device, "setvar_DataAcq_TerminationDelay", val = s.td)
 	PGC_SetAndActivateControl(device, "Setvar_DataAcq_dDAQDelay", val = s.ddl)
 
+	PGC_SetAndActivateControl(device, "check_Settings_TPAfterDAQ", val = s.tad)
+
 	PGC_SetAndActivateControl(device, "Check_DataAcq_Get_Set_ITI", val = s.gsi)
 
 	PGC_SetAndActivateControl(device, "Popup_Settings_SampIntMult", str = num2str(s.sim))
@@ -535,6 +601,10 @@ Function ACD_AcquireData(STRUCT ACD_DAQSettings &s, string device)
 	PGC_SetAndActivateControl(device, "SetVar_DataAcq_SetRepeats", val = s.RES)
 	PGC_SetAndActivateControl(device, "check_Settings_TP_SaveTP", val = s.STP)
 
+	if(IsFinite(s.TAI))
+		PGC_SetAndActivateControl(device, "SetVar_DataAcq_TPAmplitudeIC", val = s.TAI)
+	endif
+
 	if(IsFinite(s.TBP))
 		PGC_SetAndActivateControl(device, "SetVar_DataAcq_TPBaselinePerc", val = s.TBP)
 	endif

Packages/MIES/MIES_Structures.ipf

@@ -674,11 +674,18 @@ EndStructure
 
 Structure ACD_DAQSettings
 	variable MD, RA, IDX, LIDX, BKG_DAQ, RES, DB, AMP, ITP, FAR
-	variable oodDAQ, dDAQ, OD, TD, TP, ITI, GSI, TPI, DAQ, DDL, SIM, STP, TBP, TPD
+	variable oodDAQ, dDAQ, OD, TD, TP, ITI, GSI, TPI, DAQ, DDL, SIM, STP, TBP, TPD, TAD
+	variable tai
 	string FFR
 
 	WAVE hs, da, ad, cm, ttl, aso
+	WAVE/D da_scale
 	WAVE/T st, ist, af, st_ttl, iaf
 	FUNCREF ACD_CALLABLE_PROTO preAcquireFunc, preInitFunc
 	FUNCREF ACD_CALLABLE_PROTO globalPreAcquireFunc, globalPreInitFunc
+	WAVE ab
+	WAVE/D abv, abvv
+	WAVE asyncAD, asyncAlarm
+	WAVE/D asyncAlarmMin, asyncAlarmMax
+	WAVE/T asyncTitle, asyncUnit
 EndStructure