Skip to content

Commit 8efb3ab

Browse files
t-bt-b
committed
ACD_InitDAQSettingsFromString: Return the struct via MRS
This is better practice.
1 parent e0413b7 commit 8efb3ab

30 files changed

Lines changed: 499 additions & 666 deletions

‎Packages/MIES/MIES_AcquireData.ipf‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static Function/S ACD_ParseString(string str, string name, [string defValue])
140140
End
141141

142142
/// @brief Fill the #ACD_DAQSettings structure from a specially crafted string
143-
Function ACD_InitDAQSettingsFromString(STRUCT ACD_DAQSettings &s, string str)
143+
Function [STRUCT ACD_DAQSettings s] ACD_InitDAQSettingsFromString(string str)
144144

145145
variable md, ra, idx, lidx, bkg_daq, res, headstage, clampMode, ttl, async
146146
string elem, output
@@ -299,9 +299,8 @@ End
299299
/// /// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
300300
/// static Function MyTest([string str])
301301
///
302-
/// struct ACD_DAQSettings s
303-
/// ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1" + \
304-
/// "__HS0_DA0_AD0_CM:IC:_ST:ABCD:")
302+
/// [STRUCT ACD_DAQSettings s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1" + \
303+
/// "__HS0_DA0_AD0_CM:IC:_ST:ABCD:")
305304
///
306305
/// ACD_AcquireData(s, md.s0)
307306
/// End

‎Packages/tests/HardwareAnalysisFunctions/UTF_MultiPatchSeqDaScale.ipf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ static Constant SINGLE_SCI = 0x08
1010

1111
static Function [STRUCT ACD_DAQSettings s] MSQ_GetDAQSettings(string device)
1212

13-
ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_DB1" + \
14-
"__HS0_DA0_AD0_CM:IC:_ST:MSQ_DAScale_DA_0:")
13+
[s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1_DB1" + \
14+
"__HS0_DA0_AD0_CM:IC:_ST:MSQ_DAScale_DA_0:")
1515

1616
return [s]
1717
End

‎Packages/tests/HardwareAnalysisFunctions/UTF_MultiPatchSeqFastRheoEstimate.ipf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ static Constant SINGLE_SCI = 0x08
1010

1111
static Function [STRUCT ACD_DAQSettings s] MSQ_GetDAQSettings(string device)
1212

13-
ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_DB1_SIM4" + \
14-
"__HS0_DA0_AD0_CM:IC:_ST:MSQ_FastRheoEst_DA_0:" + \
15-
"__HS1_DA1_AD1_CM:IC:_ST:MSQ_FastRheoEst_DA_0:")
13+
[s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1_DB1_SIM4" + \
14+
"__HS0_DA0_AD0_CM:IC:_ST:MSQ_FastRheoEst_DA_0:" + \
15+
"__HS1_DA1_AD1_CM:IC:_ST:MSQ_FastRheoEst_DA_0:")
1616

1717
return [s]
1818
End

‎Packages/tests/HardwareAnalysisFunctions/UTF_MultiPatchSeqSpikeControl.ipf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ static Constant INDEP_SINGLE_SCI = 0x10
1111

1212
static Function [STRUCT ACD_DAQSettings s] MSQ_GetDAQSettings(string device)
1313

14-
ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_DB1" + \
15-
"__HS0_DA0_AD0_CM:IC:_ST:SC_SpikeControl_DA_0:" + \
16-
"__HS1_DA1_AD1_CM:IC:_ST:SC_SpikeControl_DA_0:")
14+
[s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1_DB1" + \
15+
"__HS0_DA0_AD0_CM:IC:_ST:SC_SpikeControl_DA_0:" + \
16+
"__HS1_DA1_AD1_CM:IC:_ST:SC_SpikeControl_DA_0:")
1717

1818
return [s]
1919
End

‎Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqAccessResistanceSmoke.ipf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
static Function [STRUCT ACD_DAQSettings s] PS_GetDAQSettings(string device)
2828

29-
ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_DB1" + \
30-
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:VC:_ST:PSQ_QC_stimsets_DA_0:")
29+
[s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1_DB1" + \
30+
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:VC:_ST:PSQ_QC_stimsets_DA_0:")
3131
return [s]
3232
End
3333

‎Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqChirp.ipf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
static Function [STRUCT ACD_DAQSettings s] PS_GetDAQSettings(string device)
77

8-
ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_DB1" + \
9-
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:IC:_ST:PatchSeqChirp_DA_0:")
8+
[s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1_DB1" + \
9+
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:IC:_ST:PatchSeqChirp_DA_0:")
1010

1111
return [s]
1212
End

‎Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqDAScale_Adapt.ipf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141

4242
static Function [STRUCT ACD_DAQSettings s] PS_GetDAQSettings(string device)
4343

44-
ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_DB1" + \
45-
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:IC:_ST:PSQ_DaScale_Adapt_DA_0:")
44+
[s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1_DB1" + \
45+
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:IC:_ST:PSQ_DaScale_Adapt_DA_0:")
4646
return [s]
4747
End
4848

‎Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqDAScale_Sub.ipf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
static Function [STRUCT ACD_DAQSettings s] PS_GetDAQSettings(string device)
99

10-
ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_DB1" + \
11-
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:IC:_ST:PSQ_DaScale_Sub_DA_0:")
10+
[s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1_DB1" + \
11+
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:IC:_ST:PSQ_DaScale_Sub_DA_0:")
1212

1313
AdjustAnalysisParamsForPSQ(device, "PSQ_DaScale_Sub_DA_0")
1414

‎Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqDAScale_Supra.ipf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
static Function [STRUCT ACD_DAQSettings s] PS_GetDAQSettings(string device, string stimset)
77

8-
ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_DB1" + \
9-
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:IC:_ST:" + stimset + ":")
8+
[s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1_DB1" + \
9+
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:IC:_ST:" + stimset + ":")
1010

1111
AdjustAnalysisParamsForPSQ(device, stimset)
1212

‎Packages/tests/HardwareAnalysisFunctions/UTF_PatchSeqPipetteInBath.ipf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
static Function [STRUCT ACD_DAQSettings s] PS_GetDAQSettings(string device)
77

8-
ACD_InitDAQSettingsFromString(s, "MD1_RA1_I0_L0_BKG1_DB1" + \
9-
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:VC:_ST:PSQ_QC_stimsets_DA_0:")
8+
[s] = ACD_InitDAQSettingsFromString("MD1_RA1_I0_L0_BKG1_DB1" + \
9+
"__HS" + num2str(PSQ_TEST_HEADSTAGE) + "_DA0_AD0_CM:VC:_ST:PSQ_QC_stimsets_DA_0:")
1010

1111
return [s]
1212
End

0 commit comments

Comments
 (0)