Skip to content

Commit 7120a6e

Browse files
committed
[core] Bump DCS client to latest protofile
1 parent 8847cf7 commit 7120a6e

11 files changed

Lines changed: 134 additions & 106 deletions

File tree

apricot/protos/apricot.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coconut/protos/o2control.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/integration/dcs/plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func (p *Plugin) ObjectStack(data interface{}) (stack map[string]interface{}) {
140140
log.WithError(err).Error("cannot acquire run number for DCS SOR")
141141
}
142142

143-
rt := dcspb.RunType_RT_TECHNICAL
143+
rt := dcspb.RunType_TECHNICAL
144144
runTypeS, ok := varStack["run_type"]
145145
if ok {
146146
// a detector is defined in the var stack

core/integration/dcs/protos/dcs.pb.go

Lines changed: 108 additions & 86 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/integration/dcs/protos/dcs.proto

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ enum EventType {
130130
ACK_EVENT = 4;
131131
SOR_EVENT = 20;
132132
EOR_EVENT = 30;
133+
TIMEOUT = 40;
133134
}
134135

135136
enum Detector {
@@ -149,27 +150,32 @@ enum Detector {
149150
TPC = 13;
150151
TRD = 14;
151152
ZDC = 15;
152-
DCS = 16;
153+
LHC = 16;
154+
DCS = 17;
153155
}
154156

155157
enum DetectorState {
156158
NULL_STATE = 0;
157159
READY = 1;
158160
RUN_OK = 2;
159161
RUN_FAILURE = 3;
160-
SOR_PROGRESSING = 4;
161-
EOR_PROGRESSING = 5;
162-
SOR_FAILURE = 6;
163-
EOR_FAILURE = 7;
164-
ERROR = 8;
162+
RUN_INHIBIT = 4;
163+
SOR_PROGRESSING = 5;
164+
EOR_PROGRESSING = 6;
165+
SOR_FAILURE = 7;
166+
EOR_FAILURE = 8;
167+
ERROR = 9;
168+
DEAD = 10;
165169
}
166170

167171
enum RunType {
168-
RT_NULL = 0;
169-
RT_PHYSICS = 1;
170-
RT_TECHNICAL = 2;
172+
NULL_RUNTYPE = 0;
173+
PHYSICS = 1;
174+
TECHNICAL = 2;
175+
PEDESTALS = 3;
176+
PULSER = 4;
171177
}
172178
enum TriggerMode {
173-
TM_CONTINUOUS = 0;
174-
TM_TRIGGERED = 1;
179+
CONTINUOUS = 0;
180+
TRIGGERED = 1;
175181
}

core/integration/ddsched/protos/ddsched.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)