diff --git a/broker/gen/model/Indexing_settings.cpp b/broker/gen/model/Indexing_settings.cpp index a797c2aa..f25a9642 100644 --- a/broker/gen/model/Indexing_settings.cpp +++ b/broker/gen/model/Indexing_settings.cpp @@ -34,7 +34,6 @@ Indexing_settings::Indexing_settings() m_Rotation_indexing_min_angular_range_deg = 20.0f; m_Rotation_indexing_angular_stride_deg = 0.5f; m_Blocking = false; - m_BlockingIsSet = false; } @@ -278,8 +277,8 @@ bool Indexing_settings::operator==(const Indexing_settings& rhs) const (getRotationIndexingAngularStrideDeg() == rhs.getRotationIndexingAngularStrideDeg()) && + (isBlocking() == rhs.isBlocking()) - ((!blockingIsSet() && !rhs.blockingIsSet()) || (blockingIsSet() && rhs.blockingIsSet() && isBlocking() == rhs.isBlocking())) ; } @@ -306,8 +305,7 @@ void to_json(nlohmann::json& j, const Indexing_settings& o) j["rotation_indexing"] = o.m_Rotation_indexing; j["rotation_indexing_min_angular_range_deg"] = o.m_Rotation_indexing_min_angular_range_deg; j["rotation_indexing_angular_stride_deg"] = o.m_Rotation_indexing_angular_stride_deg; - if(o.blockingIsSet()) - j["blocking"] = o.m_Blocking; + j["blocking"] = o.m_Blocking; } @@ -327,11 +325,7 @@ void from_json(const nlohmann::json& j, Indexing_settings& o) j.at("rotation_indexing").get_to(o.m_Rotation_indexing); j.at("rotation_indexing_min_angular_range_deg").get_to(o.m_Rotation_indexing_min_angular_range_deg); j.at("rotation_indexing_angular_stride_deg").get_to(o.m_Rotation_indexing_angular_stride_deg); - if(j.find("blocking") != j.end()) - { - j.at("blocking").get_to(o.m_Blocking); - o.m_BlockingIsSet = true; - } + j.at("blocking").get_to(o.m_Blocking); } @@ -454,15 +448,6 @@ bool Indexing_settings::isBlocking() const void Indexing_settings::setBlocking(bool const value) { m_Blocking = value; - m_BlockingIsSet = true; -} -bool Indexing_settings::blockingIsSet() const -{ - return m_BlockingIsSet; -} -void Indexing_settings::unsetBlocking() -{ - m_BlockingIsSet = false; } diff --git a/broker/gen/model/Indexing_settings.h b/broker/gen/model/Indexing_settings.h index 68ca3bb8..ea81ba7a 100644 --- a/broker/gen/model/Indexing_settings.h +++ b/broker/gen/model/Indexing_settings.h @@ -134,8 +134,6 @@ public: /// bool isBlocking() const; void setBlocking(bool const value); - bool blockingIsSet() const; - void unsetBlocking(); friend void to_json(nlohmann::json& j, const Indexing_settings& o); friend void from_json(const nlohmann::json& j, Indexing_settings& o); @@ -169,7 +167,7 @@ protected: float m_Rotation_indexing_angular_stride_deg; bool m_Blocking; - bool m_BlockingIsSet; + }; diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml index 883c0410..36f4e098 100644 --- a/broker/jfjoch_api.yaml +++ b/broker/jfjoch_api.yaml @@ -1839,6 +1839,7 @@ components: - rotation_indexing - rotation_indexing_min_angular_range_deg - rotation_indexing_angular_stride_deg + - blocking properties: algorithm: $ref: "#/components/schemas/indexing_algorithm" diff --git a/broker/redoc-static.html b/broker/redoc-static.html index 79a96aa0..5938ae3c 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -582,7 +582,7 @@ This option is using non-linear least squares optimization to find unit cell and
Minimum number of indexed spots required for a cell to be considered viable
Include spots marked as ice rings in the indexing run.
If dataset_settings doesn't have detect_ice_rings on, this option will have no effect on processing.
Indexing in Jungfraujoch goes with a dedicated thread pool. +
Indexing in Jungfraujoch goes with a dedicated thread pool. If set to false, the thread pool is non-blocking, i.e. if there are no threads available, image indexing will be skipped. If set to true, the thread pool will block until a thread is available.