Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadSpecialModules
Commits
92f6ad9e
Commit
92f6ad9e
authored
Jan 06, 2020
by
yannick legoc
Browse files
Added type in numor request of D22AutoConfig
parent
d3286b86
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/controllers/lss/d22autoconfig/D22AutoConfig.cpp
View file @
92f6ad9e
...
...
@@ -259,6 +259,8 @@ void AutoConfig::start() {
request
.
mutable_parameters
()
->
set_wavelength
(
m_d22settings
->
wavelengthPosition
.
setpoint
());
request
.
mutable_parameters
()
->
set_collimation
(
m_d22settings
->
colSetupPosition
.
setpoint
());
request
.
set_type
(
wantedType
());
request
.
set_samplemodel
(
m_simulation
->
displaySampleModelName
());
request
.
set_backgroundmodel
(
m_simulation
->
displayBackgroundModelName
());
request
.
set_samplebackground
(
getSampleBackground
());
...
...
src/controllers/lss/d22autoconfig/NumorMessages.proto
View file @
92f6ad9e
...
...
@@ -29,15 +29,16 @@ message NumorRequest {
required
string
instrumentName
=
1
;
required
InstrumentParameters
parameters
=
2
;
required
string
type
=
3
;
required
string
sampleModel
=
3
;
required
string
backgroundModel
=
4
;
required
string
sampleModel
=
4
;
required
string
backgroundModel
=
5
;
required
double
sampleBackground
=
5
;
required
double
sampleBackground
=
6
;
required
int32
xSize
=
6
;
required
int32
ySize
=
7
;
required
bytes
data
=
8
;
required
int32
xSize
=
7
;
required
int32
ySize
=
8
;
required
bytes
data
=
9
;
}
message
Result
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment