OpenAPI: Add orientation only refinement
This commit is contained in:
@@ -943,6 +943,9 @@ IndexingSettings Convert(const org::openapitools::server::model::Indexing_settin
|
||||
case org::openapitools::server::model::Geom_refinement_algorithm::eGeom_refinement_algorithm::BEAMCENTER:
|
||||
ret.GeomRefinementAlgorithm(GeomRefinementAlgorithmEnum::BeamCenter);
|
||||
break;
|
||||
case org::openapitools::server::model::Geom_refinement_algorithm::eGeom_refinement_algorithm::ORIENTATIONONLY:
|
||||
ret.GeomRefinementAlgorithm(GeomRefinementAlgorithmEnum::OrientationOnly);
|
||||
break;
|
||||
case org::openapitools::server::model::Geom_refinement_algorithm::eGeom_refinement_algorithm::NONE:
|
||||
ret.GeomRefinementAlgorithm(GeomRefinementAlgorithmEnum::None);
|
||||
break;
|
||||
|
||||
@@ -78,6 +78,9 @@ void to_json(nlohmann::json& j, const Geom_refinement_algorithm& o)
|
||||
case Geom_refinement_algorithm::eGeom_refinement_algorithm::BEAMCENTER:
|
||||
j = "BeamCenter";
|
||||
break;
|
||||
case Geom_refinement_algorithm::eGeom_refinement_algorithm::ORIENTATIONONLY:
|
||||
j = "OrientationOnly";
|
||||
break;
|
||||
case Geom_refinement_algorithm::eGeom_refinement_algorithm::NONE:
|
||||
j = "None";
|
||||
break;
|
||||
@@ -91,6 +94,9 @@ void from_json(const nlohmann::json& j, Geom_refinement_algorithm& o)
|
||||
if (s == "BeamCenter") {
|
||||
o.setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm::BEAMCENTER);
|
||||
}
|
||||
else if (s == "OrientationOnly") {
|
||||
o.setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm::ORIENTATIONONLY);
|
||||
}
|
||||
else if (s == "None") {
|
||||
o.setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm::NONE);
|
||||
} else {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
/*
|
||||
* Geom_refinement_algorithm.h
|
||||
*
|
||||
* Selection of an post-indexing detector geometry refinement algorithm used by Jungfraujoch. This option is using non-linear least squares optimization to find unit cell and beam center.
|
||||
* Selection of an post-indexing least-square diffraction geometry refinement algorithm used by Jungfraujoch. BeamCenter - This option is refining both beam center and lattice (restricted to a chosen/detected Bravais lattice). OrientationOnly - This option is refining only orientation of the lattice.
|
||||
*/
|
||||
|
||||
#ifndef Geom_refinement_algorithm_H_
|
||||
@@ -25,7 +25,7 @@ namespace org::openapitools::server::model
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Selection of an post-indexing detector geometry refinement algorithm used by Jungfraujoch. This option is using non-linear least squares optimization to find unit cell and beam center.
|
||||
/// Selection of an post-indexing least-square diffraction geometry refinement algorithm used by Jungfraujoch. BeamCenter - This option is refining both beam center and lattice (restricted to a chosen/detected Bravais lattice). OrientationOnly - This option is refining only orientation of the lattice.
|
||||
/// </summary>
|
||||
class Geom_refinement_algorithm
|
||||
{
|
||||
@@ -39,6 +39,7 @@ public:
|
||||
// enum values
|
||||
INVALID_VALUE_OPENAPI_GENERATED = 0,
|
||||
BEAMCENTER,
|
||||
ORIENTATIONONLY,
|
||||
NONE
|
||||
};
|
||||
|
||||
|
||||
@@ -330,10 +330,12 @@ components:
|
||||
geom_refinement_algorithm:
|
||||
type: string
|
||||
description: |
|
||||
Selection of an post-indexing detector geometry refinement algorithm used by Jungfraujoch.
|
||||
This option is using non-linear least squares optimization to find unit cell and beam center.
|
||||
Selection of an post-indexing least-square diffraction geometry refinement algorithm used by Jungfraujoch.
|
||||
BeamCenter - This option is refining both beam center and lattice (restricted to a chosen/detected Bravais lattice).
|
||||
OrientationOnly - This option is refining only orientation of the lattice.
|
||||
enum:
|
||||
- "BeamCenter"
|
||||
- "OrientationOnly"
|
||||
- "None"
|
||||
dataset_settings:
|
||||
type: object
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,11 +1,13 @@
|
||||
# GeomRefinementAlgorithm
|
||||
|
||||
Selection of an post-indexing detector geometry refinement algorithm used by Jungfraujoch. This option is using non-linear least squares optimization to find unit cell and beam center.
|
||||
Selection of an post-indexing least-square diffraction geometry refinement algorithm used by Jungfraujoch. BeamCenter - This option is refining both beam center and lattice (restricted to a chosen/detected Bravais lattice). OrientationOnly - This option is refining only orientation of the lattice.
|
||||
|
||||
## Enum
|
||||
|
||||
* `BEAMCENTER` (value: `'BeamCenter'`)
|
||||
|
||||
* `ORIENTATIONONLY` (value: `'OrientationOnly'`)
|
||||
|
||||
* `NONE` (value: `'None'`)
|
||||
|
||||
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "jungfraujoch-frontend",
|
||||
"version": "1.0.0-rc.145",
|
||||
"version": "1.0.0-rc.146",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "jungfraujoch-frontend",
|
||||
"version": "1.0.0-rc.145",
|
||||
"version": "1.0.0-rc.146",
|
||||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.10.4",
|
||||
|
||||
@@ -203,8 +203,9 @@ class IndexingSettings extends Component<MyProps, MyState> {
|
||||
value={this.state.s.geom_refinement_algorithm}
|
||||
onChange={this.handleRefinementAlgorithmChange}
|
||||
>
|
||||
<MenuItem value={geom_refinement_algorithm.NONE}>Geometry is not refined</MenuItem>
|
||||
<MenuItem value={geom_refinement_algorithm.BEAM_CENTER}>Beam center is refined</MenuItem>
|
||||
<MenuItem value={geom_refinement_algorithm.NONE}>No refinement</MenuItem>
|
||||
<MenuItem value={geom_refinement_algorithm.ORIENTATION_ONLY}>Lattice orientation</MenuItem>
|
||||
<MenuItem value={geom_refinement_algorithm.BEAM_CENTER}>Beam center, lattice orientation and dimensions</MenuItem>
|
||||
</Select>
|
||||
</FormControl>
|
||||
<FormControlLabel
|
||||
|
||||
@@ -4,11 +4,13 @@
|
||||
/* eslint-disable */
|
||||
|
||||
/**
|
||||
* Selection of an post-indexing detector geometry refinement algorithm used by Jungfraujoch.
|
||||
* This option is using non-linear least squares optimization to find unit cell and beam center.
|
||||
* Selection of an post-indexing least-square diffraction geometry refinement algorithm used by Jungfraujoch.
|
||||
* BeamCenter - This option is refining both beam center and lattice (restricted to a chosen/detected Bravais lattice).
|
||||
* OrientationOnly - This option is refining only orientation of the lattice.
|
||||
*
|
||||
*/
|
||||
export enum geom_refinement_algorithm {
|
||||
BEAM_CENTER = 'BeamCenter',
|
||||
ORIENTATION_ONLY = 'OrientationOnly',
|
||||
NONE = 'None',
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user