Skip to content

Commit 37508f0

Browse files
t-bt-b
authored
Merge pull request #2717 from AllenInstitute/feature/2717-make-acquire-data-available-for-all
Make AcquireData available for all (replay data prep)
2 parents 48bf60c + 7615b5b commit 37508f0

38 files changed

Lines changed: 1885 additions & 1864 deletions

‎Packages/MIES/MIES_AcquireData.ipf‎

Lines changed: 564 additions & 0 deletions
Large diffs are not rendered by default.

‎Packages/MIES/MIES_MiesUtilities_Logbook.ipf‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2013,16 +2013,21 @@ Function InvalidateLBIndexAndRowCaches()
20132013

20142014
// labnotebook (numerical and textual) of all devices
20152015
for(device : devices)
2016-
Make/FREE/WAVE valuesWave = {GetLBNumericalValues(device), GetLBTextualValues(device)}
2017-
2018-
InvalidateLBIndexAndRowCaches_Impl(valuesWave)
2016+
InvalidateLBIndexAndRowCachesForDevice(device)
20192017
endfor
20202018

20212019
Make/FREE/WAVE valuesWave = {GetNumericalResultsValues(), GetTextualResultsValues()}
20222020
InvalidateLBIndexAndRowCaches_Impl(valuesWave)
20232021
End
20242022

2025-
static Function InvalidateLBIndexAndRowCaches_Impl(WAVE valuesWave)
2023+
Function InvalidateLBIndexAndRowCachesForDevice(string device)
2024+
2025+
Make/FREE/WAVE valuesWave = {GetLBNumericalValues(device), GetLBTextualValues(device)}
2026+
2027+
InvalidateLBIndexAndRowCaches_Impl(valuesWave)
2028+
End
2029+
2030+
static Function InvalidateLBIndexAndRowCaches_Impl(WAVE/WAVE valuesWave)
20262031

20272032
string key
20282033

‎Packages/MIES/MIES_Structures.ipf‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,3 +671,14 @@ Structure SF_ExecutionData
671671
variable jsonId // jsonId of parsed SF formula
672672
string jsonPath // current path for execution of the parsed formula
673673
EndStructure
674+
675+
Structure ACD_DAQSettings
676+
variable MD, RA, IDX, LIDX, BKG_DAQ, RES, DB, AMP, ITP, FAR
677+
variable oodDAQ, dDAQ, OD, TD, TP, ITI, GSI, TPI, DAQ, DDL, SIM, STP, TBP, TPD
678+
string FFR
679+
680+
WAVE hs, da, ad, cm, ttl, aso
681+
WAVE/T st, ist, af, st_ttl, iaf
682+
FUNCREF ACD_CALLABLE_PROTO preAcquireFunc, preInitFunc
683+
FUNCREF ACD_CALLABLE_PROTO globalPreAcquireFunc, globalPreInitFunc
684+
EndStructure

‎Packages/MIES/MIES_WaveDataFolderGetters.ipf‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4799,12 +4799,13 @@ End
47994799
/// - 2: Tolerance Factor
48004800
///
48014801
/// Columns:
4802-
/// - 0: Async AD $Channel OnOff
4803-
/// - 1: Async AD $Channel Gain
4804-
/// - 2: Async Alarm $Channel OnOff
4802+
/// - 0: Async $Channel On/Off
4803+
/// - 1: Async $Channel Gain
4804+
/// - 2: Async Alarm $Channel On/Off
48054805
/// - 3: Async Alarm $Channel Min
48064806
/// - 4: Async Alarm $Channel Max
48074807
/// - 5: Async AD $Channel [$Title]
4808+
/// - 6: Async Alarm $Channel State
48084809
Function/WAVE GetAsyncSettingsKeyWave(WAVE settingsWave, variable channel, string title, string unit)
48094810

48104811
string prefix
@@ -4892,8 +4893,8 @@ End
48924893
/// - Just one
48934894
///
48944895
/// Columns:
4895-
/// - 0: Async $Channel Title
4896-
/// - 1: Async $Channel Unit
4896+
/// - 0: Async AD$Channel Title
4897+
/// - 1: Async AD$Channel Unit
48974898
Function/WAVE GetAsyncSettingsTextKeyWave(WAVE/T settingsWave, variable channel)
48984899

48994900
string prefix

‎Packages/MIES_Include.ipf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ End
167167

168168
// our includes
169169
#include "MIES_AcceleratedModifyGraph"
170+
#include "MIES_AcquireData"
170171
#include "MIES_AcquisitionStateHandling"
171172
#include "MIES_AmplifierInteraction"
172173
#include "MIES_AnalysisBrowser"

‎Packages/tests/HardwareAnalysisFunctions/UTF_MultiPatchSeqDaScale.ipf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ static Constant EACH_SCI = 0x02
88
static Constant INDEP = 0x04
99
static Constant SINGLE_SCI = 0x08
1010

11-
static Function [STRUCT DAQSettings s] MSQ_GetDAQSettings(string device)
11+
static Function [STRUCT ACD_DAQSettings s] MSQ_GetDAQSettings(string device)
1212

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

1616
return [s]
1717
End
@@ -61,8 +61,8 @@ End
6161
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
6262
static Function MSQ_DS1([string str])
6363

64-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
65-
AcquireData_NG(s, str)
64+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
65+
ACD_AcquireData(s, str)
6666
End
6767

6868
static Function MSQ_DS1_REENTRY([string str])
@@ -97,8 +97,8 @@ static Function MSQ_DS2([string str])
9797

9898
AFH_AddAnalysisParameter("MSQ_DAScale_DA_0", "DAScales", wv = {1000, 1500, 2000, 3000, 5000})
9999

100-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
101-
AcquireData_NG(s, str)
100+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
101+
ACD_AcquireData(s, str)
102102
End
103103

104104
static Function MSQ_DS2_REENTRY([string str])

‎Packages/tests/HardwareAnalysisFunctions/UTF_MultiPatchSeqFastRheoEstimate.ipf‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ static Constant EACH_SCI = 0x02
88
static Constant INDEP = 0x04
99
static Constant SINGLE_SCI = 0x08
1010

11-
static Function [STRUCT DAQSettings s] MSQ_GetDAQSettings(string device)
11+
static Function [STRUCT ACD_DAQSettings s] MSQ_GetDAQSettings(string device)
1212

13-
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+
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:")
1616

1717
return [s]
1818
End
@@ -57,8 +57,8 @@ End
5757
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
5858
static Function MSQ_FRE1([string str])
5959

60-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
61-
AcquireData_NG(s, str)
60+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
61+
ACD_AcquireData(s, str)
6262

6363
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
6464
// all tests fail
@@ -149,8 +149,8 @@ End
149149
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
150150
static Function MSQ_FRE2([string str])
151151

152-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
153-
AcquireData_NG(s, str)
152+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
153+
ACD_AcquireData(s, str)
154154

155155
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
156156
// all tests fail
@@ -244,8 +244,8 @@ End
244244
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
245245
static Function MSQ_FRE3([string str])
246246

247-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
248-
AcquireData_NG(s, str)
247+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
248+
ACD_AcquireData(s, str)
249249

250250
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
251251
// spike detected on second sweep, but never again
@@ -337,8 +337,8 @@ End
337337
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
338338
static Function MSQ_FRE4([string str])
339339

340-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
341-
AcquireData_NG(s, str)
340+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
341+
ACD_AcquireData(s, str)
342342

343343
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
344344
// HS0: no spikes
@@ -435,8 +435,8 @@ End
435435
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
436436
static Function MSQ_FRE5([string str])
437437

438-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
439-
AcquireData_NG(s, str)
438+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
439+
ACD_AcquireData(s, str)
440440

441441
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
442442

@@ -546,8 +546,8 @@ End
546546
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
547547
static Function MSQ_FRE6([string str])
548548

549-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
550-
AcquireData_NG(s, str)
549+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
550+
ACD_AcquireData(s, str)
551551

552552
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
553553

@@ -650,8 +650,8 @@ End
650650
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
651651
static Function MSQ_FRE7([string str])
652652

653-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
654-
AcquireData_NG(s, str)
653+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
654+
ACD_AcquireData(s, str)
655655

656656
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
657657

@@ -761,8 +761,8 @@ End
761761
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
762762
static Function MSQ_FRE8([string str])
763763

764-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
765-
AcquireData_NG(s, str)
764+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
765+
ACD_AcquireData(s, str)
766766

767767
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
768768

@@ -868,8 +868,8 @@ End
868868
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
869869
static Function MSQ_FRE9([string str])
870870

871-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
872-
AcquireData_NG(s, str)
871+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
872+
ACD_AcquireData(s, str)
873873

874874
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
875875

@@ -972,8 +972,8 @@ End
972972
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
973973
static Function MSQ_FRE10([string str])
974974

975-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
976-
AcquireData_NG(s, str)
975+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
976+
ACD_AcquireData(s, str)
977977

978978
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
979979

@@ -1078,8 +1078,8 @@ static Function MSQ_FRE11([string str])
10781078

10791079
ST_SetStimsetParameter("MSQ_FastRheoEst_DA_0", "Total number of steps", var = 50)
10801080

1081-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
1082-
AcquireData_NG(s, str)
1081+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
1082+
ACD_AcquireData(s, str)
10831083

10841084
WAVE wv = MSQ_CreateOverrideResults(str, 0, MSQ_FAST_RHEO_EST)
10851085
// all tests fail

‎Packages/tests/HardwareAnalysisFunctions/UTF_MultiPatchSeqSpikeControl.ipf‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ static Constant INDEP = 0x04
99
static Constant SINGLE_SCI = 0x08
1010
static Constant INDEP_SINGLE_SCI = 0x10
1111

12-
static Function [STRUCT DAQSettings s] MSQ_GetDAQSettings(string device)
12+
static Function [STRUCT ACD_DAQSettings s] MSQ_GetDAQSettings(string device)
1313

14-
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+
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:")
1717

1818
return [s]
1919
End
@@ -166,8 +166,8 @@ End
166166
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
167167
static Function SC_Test1([string str])
168168

169-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
170-
AcquireData_NG(s, str)
169+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
170+
ACD_AcquireData(s, str)
171171

172172
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
173173

@@ -251,8 +251,8 @@ End
251251
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
252252
static Function SC_Test2([string str])
253253

254-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
255-
AcquireData_NG(s, str)
254+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
255+
ACD_AcquireData(s, str)
256256

257257
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
258258

@@ -340,8 +340,8 @@ End
340340
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
341341
static Function SC_Test3([string str])
342342

343-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
344-
AcquireData_NG(s, str)
343+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
344+
ACD_AcquireData(s, str)
345345

346346
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
347347

@@ -438,8 +438,8 @@ End
438438
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
439439
static Function SC_Test4([string str])
440440

441-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
442-
AcquireData_NG(s, str)
441+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
442+
ACD_AcquireData(s, str)
443443

444444
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
445445

@@ -536,8 +536,8 @@ End
536536
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
537537
static Function SC_Test5([string str])
538538

539-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
540-
AcquireData_NG(s, str)
539+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
540+
ACD_AcquireData(s, str)
541541

542542
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
543543

@@ -635,8 +635,8 @@ End
635635
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
636636
static Function SC_Test6([string str])
637637

638-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
639-
AcquireData_NG(s, str)
638+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
639+
ACD_AcquireData(s, str)
640640

641641
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
642642

@@ -724,8 +724,8 @@ End
724724
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
725725
static Function SC_Test7([string str])
726726

727-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
728-
AcquireData_NG(s, str)
727+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
728+
ACD_AcquireData(s, str)
729729

730730
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
731731

@@ -846,8 +846,8 @@ End
846846
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
847847
static Function SC_Test8([string str])
848848

849-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
850-
AcquireData_NG(s, str)
849+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
850+
ACD_AcquireData(s, str)
851851

852852
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
853853

@@ -992,8 +992,8 @@ End
992992
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
993993
static Function SC_Test9([string str])
994994

995-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
996-
AcquireData_NG(s, str)
995+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
996+
ACD_AcquireData(s, str)
997997

998998
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
999999

@@ -1084,8 +1084,8 @@ End
10841084
// UTF_TD_GENERATOR DataGenerators#DeviceNameGeneratorMD1
10851085
static Function SC_Test10([string str])
10861086

1087-
[STRUCT DAQSettings s] = MSQ_GetDAQSettings(str)
1088-
AcquireData_NG(s, str)
1087+
[STRUCT ACD_DAQSettings s] = MSQ_GetDAQSettings(str)
1088+
ACD_AcquireData(s, str)
10891089

10901090
WAVE/T wv = MSQ_CreateOverrideResults(str, 0, SC_SPIKE_CONTROL)
10911091

0 commit comments

Comments
 (0)