diff --git a/broker/JFJochBrokerHttp.cpp b/broker/JFJochBrokerHttp.cpp
index 7d7171c4..bc5aa5ae 100644
--- a/broker/JFJochBrokerHttp.cpp
+++ b/broker/JFJochBrokerHttp.cpp
@@ -19,7 +19,8 @@ inline SpotFindingSettings Convert(const org::openapitools::server::model::Spot_
ret.max_pix_per_spot = input.getMaxPixPerSpot();
ret.high_resolution_limit = input.getHighResolutionLimit();
ret.low_resolution_limit = input.getLowResolutionLimit();
- ret.preview_indexed_only = input.previewIndexedOnlyIsSet() ? input.isPreviewIndexedOnly() : false;
+ ret.preview_indexed_only = input.isPreviewIndexedOnly();
+ ret.enable = input.isEnable();
return ret;
}
@@ -32,6 +33,7 @@ inline org::openapitools::server::model::Spot_finding_settings Convert(const Spo
ret.setHighResolutionLimit(input.high_resolution_limit);
ret.setLowResolutionLimit(input.low_resolution_limit);
ret.setPreviewIndexedOnly(input.preview_indexed_only);
+ ret.setEnable(input.enable);
return ret;
}
diff --git a/broker/gen/model/Spot_finding_settings.cpp b/broker/gen/model/Spot_finding_settings.cpp
index b0f4501e..dbd70994 100644
--- a/broker/gen/model/Spot_finding_settings.cpp
+++ b/broker/gen/model/Spot_finding_settings.cpp
@@ -21,6 +21,7 @@ namespace org::openapitools::server::model
Spot_finding_settings::Spot_finding_settings()
{
+ m_Enable = true;
m_Signal_to_noise_threshold = 0.0f;
m_Photon_count_threshold = 0L;
m_Min_pix_per_spot = 0L;
@@ -51,7 +52,7 @@ bool Spot_finding_settings::validate(std::stringstream& msg, const std::string&
bool success = true;
const std::string _pathPrefix = pathPrefix.empty() ? "Spot_finding_settings" : pathPrefix;
-
+
/* Signal_to_noise_threshold */ {
const float& value = m_Signal_to_noise_threshold;
@@ -116,6 +117,9 @@ bool Spot_finding_settings::operator==(const Spot_finding_settings& rhs) const
return
+ (isEnable() == rhs.isEnable())
+ &&
+
(getSignalToNoiseThreshold() == rhs.getSignalToNoiseThreshold())
&&
@@ -148,6 +152,7 @@ bool Spot_finding_settings::operator!=(const Spot_finding_settings& rhs) const
void to_json(nlohmann::json& j, const Spot_finding_settings& o)
{
j = nlohmann::json();
+ j["enable"] = o.m_Enable;
j["signal_to_noise_threshold"] = o.m_Signal_to_noise_threshold;
j["photon_count_threshold"] = o.m_Photon_count_threshold;
j["min_pix_per_spot"] = o.m_Min_pix_per_spot;
@@ -161,6 +166,7 @@ void to_json(nlohmann::json& j, const Spot_finding_settings& o)
void from_json(const nlohmann::json& j, Spot_finding_settings& o)
{
+ j.at("enable").get_to(o.m_Enable);
j.at("signal_to_noise_threshold").get_to(o.m_Signal_to_noise_threshold);
j.at("photon_count_threshold").get_to(o.m_Photon_count_threshold);
j.at("min_pix_per_spot").get_to(o.m_Min_pix_per_spot);
@@ -175,6 +181,14 @@ void from_json(const nlohmann::json& j, Spot_finding_settings& o)
}
+bool Spot_finding_settings::isEnable() const
+{
+ return m_Enable;
+}
+void Spot_finding_settings::setEnable(bool const value)
+{
+ m_Enable = value;
+}
float Spot_finding_settings::getSignalToNoiseThreshold() const
{
return m_Signal_to_noise_threshold;
diff --git a/broker/gen/model/Spot_finding_settings.h b/broker/gen/model/Spot_finding_settings.h
index 70f47538..7b42a728 100644
--- a/broker/gen/model/Spot_finding_settings.h
+++ b/broker/gen/model/Spot_finding_settings.h
@@ -57,6 +57,11 @@ public:
/////////////////////////////////////////////
/// Spot_finding_settings members
+ /// Inactive or Error states, new settin
" class="sc-iKOmoZ sc-cCzLxZ WVNwY VEBGS sc-ckdEwu LxEPk">
Everything OK
{- "frame_time_us": 450,
- "count_time_us": 0,
- "storage_cell_count": 1,
- "internal_frame_generator": false,
- "internal_frame_generator_images": 1,
- "collect_raw_data": false,
- "pedestal_g0_frames": 0,
- "pedestal_g1_frames": 0,
- "pedestal_g2_frames": 0,
- "storage_cell_delay_us": 0.1,
- "detector_trigger_delay_us": 0.1,
- "fixed_gain_g1": false,
- "use_gain_hg0": false
}Can be done anytime, also while data collection is running
-| signal_to_noise_threshold required | number <float> >= 0 |
| photon_count_threshold required | integer <int64> >= 0 |
| min_pix_per_spot required | integer <int64> >= 1 |
| max_pix_per_spot required | integer <int64> >= 1 |
| high_resolution_limit required | number <float> |
| low_resolution_limit required | number <float> |
| preview_indexed_only | boolean Default: false |
{- "enable": true,
- "signal_to_noise_threshold": 0.1,
- "photon_count_threshold": 0,
- "min_pix_per_spot": 1,
- "max_pix_per_spot": 1,
- "high_resolution_limit": 0.1,
- "low_resolution_limit": 0.1,
- "preview_indexed_only": false
} {- "signal_to_noise_threshold": 0.1,
- "photon_count_threshold": 0,
- "min_pix_per_spot": 1,
- "max_pix_per_spot": 1,
- "high_resolution_limit": 0.1,
- "low_resolution_limit": 0.1,
- "preview_indexed_only": false
} {- "enable": true,
- "signal_to_noise_threshold": 0.1,
- "photon_count_threshold": 0,
- "min_pix_per_spot": 1,
- "max_pix_per_spot": 1,
- "high_resolution_limit": 0.1,
- "low_resolution_limit": 0.1,
- "preview_indexed_only": false
}Can be done when detector is Inactive or Idle
| polarization_factor | number <float> [ -1 .. 1 ] If polarization factor is provided, than polarization correction is enabled. @@ -749,7 +749,7 @@ Changing detector will set detector toInactive state and will requ
" class="sc-iKOmoZ sc-cCzLxZ WVNwY VEBGS sc-ckdEwu LxEPk">No preview image recorded so far |