diff --git a/broker/JFJochBrokerHttp.cpp b/broker/JFJochBrokerHttp.cpp index 4218f404..8ce6442d 100644 --- a/broker/JFJochBrokerHttp.cpp +++ b/broker/JFJochBrokerHttp.cpp @@ -363,7 +363,8 @@ inline DatasetSettings Convert(const org::openapitools::server::model::Dataset_s throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Unknown output format"); } - ret.Summation(input.getSummation()); + if (input.imageTimeUsIsSet()) + ret.ImageTime(std::chrono::microseconds(input.getImageTimeUs())); ret.BeamX_pxl(input.getBeamXPxl()); ret.BeamY_pxl(input.getBeamYPxl()); ret.DetectorDistance_mm(input.getDetectorDistanceMm()); diff --git a/broker/JFJochBrokerParser.cpp b/broker/JFJochBrokerParser.cpp index 01bd9916..f2db7659 100644 --- a/broker/JFJochBrokerParser.cpp +++ b/broker/JFJochBrokerParser.cpp @@ -283,7 +283,8 @@ DetectorSetup ParseDetectorSetup(const nlohmann::json &j) { setup.UDPInterfaceCount(GET_I64(j, "udp_interface_count", 2)) .SensorThickness_um(GET_FLOAT(j, "sensor_thickness_um", 320.0f)) .PixelSize_um(GET_FLOAT(j, "pixel_size_um", 75.0f)) - .SensorMaterial(GET_STR(j, "sensor_material", "Si")); + .SensorMaterial(GET_STR(j, "sensor_material", "Si")) + .SerialNumber(GET_STR(j, "serial_number","")); if (j.contains("tx_delay")) setup.TxDelay(GET_I64_ARR(j, "tx_delay")); diff --git a/broker/gen/api/DefaultApi.cpp b/broker/gen/api/DefaultApi.cpp index d7548c01..48b528fd 100644 --- a/broker/gen/api/DefaultApi.cpp +++ b/broker/gen/api/DefaultApi.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/api/DefaultApi.h b/broker/gen/api/DefaultApi.h index 94ec0de4..45a15a8f 100644 --- a/broker/gen/api/DefaultApi.h +++ b/broker/gen/api/DefaultApi.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Broker_status.cpp b/broker/gen/model/Broker_status.cpp index 732395e8..1f415cab 100644 --- a/broker/gen/model/Broker_status.cpp +++ b/broker/gen/model/Broker_status.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Broker_status.h b/broker/gen/model/Broker_status.h index 944a6fc8..0d8212bc 100644 --- a/broker/gen/model/Broker_status.h +++ b/broker/gen/model/Broker_status.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Calibration_statistics_inner.cpp b/broker/gen/model/Calibration_statistics_inner.cpp index 099660fb..aab6c727 100644 --- a/broker/gen/model/Calibration_statistics_inner.cpp +++ b/broker/gen/model/Calibration_statistics_inner.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Calibration_statistics_inner.h b/broker/gen/model/Calibration_statistics_inner.h index 6c7e3a28..4c81705e 100644 --- a/broker/gen/model/Calibration_statistics_inner.h +++ b/broker/gen/model/Calibration_statistics_inner.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Dataset_settings.cpp b/broker/gen/model/Dataset_settings.cpp index 76738582..4c83e300 100644 --- a/broker/gen/model/Dataset_settings.cpp +++ b/broker/gen/model/Dataset_settings.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech @@ -25,8 +25,8 @@ Dataset_settings::Dataset_settings() m_Images_per_triggerIsSet = false; m_Ntrigger = 1L; m_NtriggerIsSet = false; - m_Summation = 1L; - m_SummationIsSet = false; + m_Image_time_us = 0L; + m_Image_time_usIsSet = false; m_Beam_x_pxl = 0.0f; m_Beam_y_pxl = 0.0f; m_Detector_distance_mm = 0.0f; @@ -111,21 +111,16 @@ bool Dataset_settings::validate(std::stringstream& msg, const std::string& pathP } - if (summationIsSet()) + if (imageTimeUsIsSet()) { - const int64_t& value = m_Summation; - const std::string currentValuePath = _pathPrefix + ".summation"; + const int64_t& value = m_Image_time_us; + const std::string currentValuePath = _pathPrefix + ".imageTimeUs"; - if (value < 1ll) + if (value < 0ll) { success = false; - msg << currentValuePath << ": must be greater than or equal to 1;"; - } - if (value > 256ll) - { - success = false; - msg << currentValuePath << ": must be less than or equal to 256;"; + msg << currentValuePath << ": must be greater than or equal to 0;"; } } @@ -277,7 +272,7 @@ bool Dataset_settings::operator==(const Dataset_settings& rhs) const ((!ntriggerIsSet() && !rhs.ntriggerIsSet()) || (ntriggerIsSet() && rhs.ntriggerIsSet() && getNtrigger() == rhs.getNtrigger())) && - ((!summationIsSet() && !rhs.summationIsSet()) || (summationIsSet() && rhs.summationIsSet() && getSummation() == rhs.getSummation())) && + ((!imageTimeUsIsSet() && !rhs.imageTimeUsIsSet()) || (imageTimeUsIsSet() && rhs.imageTimeUsIsSet() && getImageTimeUs() == rhs.getImageTimeUs())) && (getBeamXPxl() == rhs.getBeamXPxl()) && @@ -357,8 +352,8 @@ void to_json(nlohmann::json& j, const Dataset_settings& o) j["images_per_trigger"] = o.m_Images_per_trigger; if(o.ntriggerIsSet()) j["ntrigger"] = o.m_Ntrigger; - if(o.summationIsSet()) - j["summation"] = o.m_Summation; + if(o.imageTimeUsIsSet()) + j["image_time_us"] = o.m_Image_time_us; j["beam_x_pxl"] = o.m_Beam_x_pxl; j["beam_y_pxl"] = o.m_Beam_y_pxl; j["detector_distance_mm"] = o.m_Detector_distance_mm; @@ -411,10 +406,10 @@ void from_json(const nlohmann::json& j, Dataset_settings& o) j.at("ntrigger").get_to(o.m_Ntrigger); o.m_NtriggerIsSet = true; } - if(j.find("summation") != j.end()) + if(j.find("image_time_us") != j.end()) { - j.at("summation").get_to(o.m_Summation); - o.m_SummationIsSet = true; + j.at("image_time_us").get_to(o.m_Image_time_us); + o.m_Image_time_usIsSet = true; } j.at("beam_x_pxl").get_to(o.m_Beam_x_pxl); j.at("beam_y_pxl").get_to(o.m_Beam_y_pxl); @@ -538,22 +533,22 @@ void Dataset_settings::unsetNtrigger() { m_NtriggerIsSet = false; } -int64_t Dataset_settings::getSummation() const +int64_t Dataset_settings::getImageTimeUs() const { - return m_Summation; + return m_Image_time_us; } -void Dataset_settings::setSummation(int64_t const value) +void Dataset_settings::setImageTimeUs(int64_t const value) { - m_Summation = value; - m_SummationIsSet = true; + m_Image_time_us = value; + m_Image_time_usIsSet = true; } -bool Dataset_settings::summationIsSet() const +bool Dataset_settings::imageTimeUsIsSet() const { - return m_SummationIsSet; + return m_Image_time_usIsSet; } -void Dataset_settings::unsetSummation() +void Dataset_settings::unsetImage_time_us() { - m_SummationIsSet = false; + m_Image_time_usIsSet = false; } float Dataset_settings::getBeamXPxl() const { diff --git a/broker/gen/model/Dataset_settings.h b/broker/gen/model/Dataset_settings.h index 7dc259ca..a0c1b898 100644 --- a/broker/gen/model/Dataset_settings.h +++ b/broker/gen/model/Dataset_settings.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech @@ -76,12 +76,12 @@ public: bool ntriggerIsSet() const; void unsetNtrigger(); /// - /// FPGA frame summation. For summation above two 32-bit pixel format will be used, unless explicitly specified. Frame summation factor applies only to conversion mode (assumed as 1 for raw data). In XFEL mode: summation happens for frames collected with multiple triggers. Ignored for storage cells (assumed as 1). + /// Image time. If not provided (or zero value) the frame time is assumed as default. For JUNGFRAU, image time must be multiple of frame time, up to 256 * frame_time. In XFEL mode: summation happens for frames collected with multiple triggers. Ignored for storage cells and if raw data are saved. /// - int64_t getSummation() const; - void setSummation(int64_t const value); - bool summationIsSet() const; - void unsetSummation(); + int64_t getImageTimeUs() const; + void setImageTimeUs(int64_t const value); + bool imageTimeUsIsSet() const; + void unsetImage_time_us(); /// /// /entry/detector/beam_center_x in NXmx Beam center in X direction [pixels] /// @@ -227,8 +227,8 @@ protected: bool m_Images_per_triggerIsSet; int64_t m_Ntrigger; bool m_NtriggerIsSet; - int64_t m_Summation; - bool m_SummationIsSet; + int64_t m_Image_time_us; + bool m_Image_time_usIsSet; float m_Beam_x_pxl; float m_Beam_y_pxl; diff --git a/broker/gen/model/Dataset_settings_roi_sum_area.cpp b/broker/gen/model/Dataset_settings_roi_sum_area.cpp deleted file mode 100644 index a0e81811..00000000 --- a/broker/gen/model/Dataset_settings_roi_sum_area.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/** -* Jungfraujoch -* Jungfraujoch Broker Web API -* -* The version of the OpenAPI document: 1.0.1 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ - - -#include "Dataset_settings_roi_sum_area.h" -#include "Helpers.h" - -#include - -namespace org::openapitools::server::model -{ - -Dataset_settings_roi_sum_area::Dataset_settings_roi_sum_area() -{ - m_X_min = 0L; - m_X_max = 0L; - m_Y_min = 0L; - m_Y_max = 0L; - -} - -void Dataset_settings_roi_sum_area::validate() const -{ - std::stringstream msg; - if (!validate(msg)) - { - throw org::openapitools::server::helpers::ValidationException(msg.str()); - } -} - -bool Dataset_settings_roi_sum_area::validate(std::stringstream& msg) const -{ - return validate(msg, ""); -} - -bool Dataset_settings_roi_sum_area::validate(std::stringstream& msg, const std::string& pathPrefix) const -{ - bool success = true; - const std::string _pathPrefix = pathPrefix.empty() ? "Dataset_settings_roi_sum_area" : pathPrefix; - - - return success; -} - -bool Dataset_settings_roi_sum_area::operator==(const Dataset_settings_roi_sum_area& rhs) const -{ - return - - - (getXMin() == rhs.getXMin()) - && - - (getXMax() == rhs.getXMax()) - && - - (getYMin() == rhs.getYMin()) - && - - (getYMax() == rhs.getYMax()) - - - ; -} - -bool Dataset_settings_roi_sum_area::operator!=(const Dataset_settings_roi_sum_area& rhs) const -{ - return !(*this == rhs); -} - -void to_json(nlohmann::json& j, const Dataset_settings_roi_sum_area& o) -{ - j = nlohmann::json(); - j["x_min"] = o.m_X_min; - j["x_max"] = o.m_X_max; - j["y_min"] = o.m_Y_min; - j["y_max"] = o.m_Y_max; - -} - -void from_json(const nlohmann::json& j, Dataset_settings_roi_sum_area& o) -{ - j.at("x_min").get_to(o.m_X_min); - j.at("x_max").get_to(o.m_X_max); - j.at("y_min").get_to(o.m_Y_min); - j.at("y_max").get_to(o.m_Y_max); - -} - -int64_t Dataset_settings_roi_sum_area::getXMin() const -{ - return m_X_min; -} -void Dataset_settings_roi_sum_area::setXMin(int64_t const value) -{ - m_X_min = value; -} -int64_t Dataset_settings_roi_sum_area::getXMax() const -{ - return m_X_max; -} -void Dataset_settings_roi_sum_area::setXMax(int64_t const value) -{ - m_X_max = value; -} -int64_t Dataset_settings_roi_sum_area::getYMin() const -{ - return m_Y_min; -} -void Dataset_settings_roi_sum_area::setYMin(int64_t const value) -{ - m_Y_min = value; -} -int64_t Dataset_settings_roi_sum_area::getYMax() const -{ - return m_Y_max; -} -void Dataset_settings_roi_sum_area::setYMax(int64_t const value) -{ - m_Y_max = value; -} - - -} // namespace org::openapitools::server::model - diff --git a/broker/gen/model/Dataset_settings_roi_sum_area.h b/broker/gen/model/Dataset_settings_roi_sum_area.h deleted file mode 100644 index c7fda428..00000000 --- a/broker/gen/model/Dataset_settings_roi_sum_area.h +++ /dev/null @@ -1,97 +0,0 @@ -/** -* Jungfraujoch -* Jungfraujoch Broker Web API -* -* The version of the OpenAPI document: 1.0.1 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -/* - * Dataset_settings_roi_sum_area.h - * - * Rectangle for ROI summation - */ - -#ifndef Dataset_settings_roi_sum_area_H_ -#define Dataset_settings_roi_sum_area_H_ - - -#include - -namespace org::openapitools::server::model -{ - -/// -/// Rectangle for ROI summation -/// -class Dataset_settings_roi_sum_area -{ -public: - Dataset_settings_roi_sum_area(); - virtual ~Dataset_settings_roi_sum_area() = default; - - - /// - /// Validate the current data in the model. Throws a ValidationException on failure. - /// - void validate() const; - - /// - /// Validate the current data in the model. Returns false on error and writes an error - /// message into the given stringstream. - /// - bool validate(std::stringstream& msg) const; - - /// - /// Helper overload for validate. Used when one model stores another model and calls it's validate. - /// Not meant to be called outside that case. - /// - bool validate(std::stringstream& msg, const std::string& pathPrefix) const; - - bool operator==(const Dataset_settings_roi_sum_area& rhs) const; - bool operator!=(const Dataset_settings_roi_sum_area& rhs) const; - - ///////////////////////////////////////////// - /// Dataset_settings_roi_sum_area members - - /// - /// - /// - int64_t getXMin() const; - void setXMin(int64_t const value); - /// - /// - /// - int64_t getXMax() const; - void setXMax(int64_t const value); - /// - /// - /// - int64_t getYMin() const; - void setYMin(int64_t const value); - /// - /// - /// - int64_t getYMax() const; - void setYMax(int64_t const value); - - friend void to_json(nlohmann::json& j, const Dataset_settings_roi_sum_area& o); - friend void from_json(const nlohmann::json& j, Dataset_settings_roi_sum_area& o); -protected: - int64_t m_X_min; - - int64_t m_X_max; - - int64_t m_Y_min; - - int64_t m_Y_max; - - -}; - -} // namespace org::openapitools::server::model - -#endif /* Dataset_settings_roi_sum_area_H_ */ diff --git a/broker/gen/model/Dataset_settings_unit_cell.cpp b/broker/gen/model/Dataset_settings_unit_cell.cpp index 88247e89..c63fe6e4 100644 --- a/broker/gen/model/Dataset_settings_unit_cell.cpp +++ b/broker/gen/model/Dataset_settings_unit_cell.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Dataset_settings_unit_cell.h b/broker/gen/model/Dataset_settings_unit_cell.h index c98f75f9..b5fb8fa8 100644 --- a/broker/gen/model/Dataset_settings_unit_cell.h +++ b/broker/gen/model/Dataset_settings_unit_cell.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_list.cpp b/broker/gen/model/Detector_list.cpp index 0309926e..e7e1a0f8 100644 --- a/broker/gen/model/Detector_list.cpp +++ b/broker/gen/model/Detector_list.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_list.h b/broker/gen/model/Detector_list.h index bfbff8d7..cd0469e7 100644 --- a/broker/gen/model/Detector_list.h +++ b/broker/gen/model/Detector_list.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_list_detectors_inner.cpp b/broker/gen/model/Detector_list_detectors_inner.cpp index 8010177e..80f8fb7f 100644 --- a/broker/gen/model/Detector_list_detectors_inner.cpp +++ b/broker/gen/model/Detector_list_detectors_inner.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_list_detectors_inner.h b/broker/gen/model/Detector_list_detectors_inner.h index 859f4736..fe3aeae9 100644 --- a/broker/gen/model/Detector_list_detectors_inner.h +++ b/broker/gen/model/Detector_list_detectors_inner.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_selection.cpp b/broker/gen/model/Detector_selection.cpp index d0b53cd8..4bc6787c 100644 --- a/broker/gen/model/Detector_selection.cpp +++ b/broker/gen/model/Detector_selection.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_selection.h b/broker/gen/model/Detector_selection.h index 198b39ed..01943228 100644 --- a/broker/gen/model/Detector_selection.h +++ b/broker/gen/model/Detector_selection.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_settings.cpp b/broker/gen/model/Detector_settings.cpp index 24b4a9bc..9ad08be8 100644 --- a/broker/gen/model/Detector_settings.cpp +++ b/broker/gen/model/Detector_settings.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_settings.h b/broker/gen/model/Detector_settings.h index 5f32ff88..53aa3e43 100644 --- a/broker/gen/model/Detector_settings.h +++ b/broker/gen/model/Detector_settings.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_status.cpp b/broker/gen/model/Detector_status.cpp index 7c8b5889..68041369 100644 --- a/broker/gen/model/Detector_status.cpp +++ b/broker/gen/model/Detector_status.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Detector_status.h b/broker/gen/model/Detector_status.h index 146d810e..56266cf5 100644 --- a/broker/gen/model/Detector_status.h +++ b/broker/gen/model/Detector_status.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Error_message.cpp b/broker/gen/model/Error_message.cpp index 41c0cdac..df72b607 100644 --- a/broker/gen/model/Error_message.cpp +++ b/broker/gen/model/Error_message.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Error_message.h b/broker/gen/model/Error_message.h index 05f3fbc1..c50a5e81 100644 --- a/broker/gen/model/Error_message.h +++ b/broker/gen/model/Error_message.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Helpers.cpp b/broker/gen/model/Helpers.cpp index 506d5fa4..e0fdbefd 100644 --- a/broker/gen/model/Helpers.cpp +++ b/broker/gen/model/Helpers.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Helpers.h b/broker/gen/model/Helpers.h index 6ef73eee..3b8721d7 100644 --- a/broker/gen/model/Helpers.h +++ b/broker/gen/model/Helpers.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Measurement_statistics.cpp b/broker/gen/model/Measurement_statistics.cpp index 8a9b986a..67dca8a7 100644 --- a/broker/gen/model/Measurement_statistics.cpp +++ b/broker/gen/model/Measurement_statistics.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Measurement_statistics.h b/broker/gen/model/Measurement_statistics.h index 1dcf1f72..f020ec10 100644 --- a/broker/gen/model/Measurement_statistics.h +++ b/broker/gen/model/Measurement_statistics.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Plot.cpp b/broker/gen/model/Plot.cpp index 72cc47b6..b3c73734 100644 --- a/broker/gen/model/Plot.cpp +++ b/broker/gen/model/Plot.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Plot.h b/broker/gen/model/Plot.h index b0899da4..6cbf172a 100644 --- a/broker/gen/model/Plot.h +++ b/broker/gen/model/Plot.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Plot_request.cpp b/broker/gen/model/Plot_request.cpp deleted file mode 100644 index b347371b..00000000 --- a/broker/gen/model/Plot_request.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/** -* Jungfraujoch -* Jungfraujoch Broker Web API -* -* The version of the OpenAPI document: 1.0.1 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ - - -#include "Plot_request.h" -#include "Helpers.h" - -#include - -namespace org::openapitools::server::model -{ - -Plot_request::Plot_request() -{ - m_Binning = 0L; - m_BinningIsSet = false; - -} - -void Plot_request::validate() const -{ - std::stringstream msg; - if (!validate(msg)) - { - throw org::openapitools::server::helpers::ValidationException(msg.str()); - } -} - -bool Plot_request::validate(std::stringstream& msg) const -{ - return validate(msg, ""); -} - -bool Plot_request::validate(std::stringstream& msg, const std::string& pathPrefix) const -{ - bool success = true; - const std::string _pathPrefix = pathPrefix.empty() ? "Plot_request" : pathPrefix; - - - return success; -} - -bool Plot_request::operator==(const Plot_request& rhs) const -{ - return - - - - ((!binningIsSet() && !rhs.binningIsSet()) || (binningIsSet() && rhs.binningIsSet() && getBinning() == rhs.getBinning())) - - ; -} - -bool Plot_request::operator!=(const Plot_request& rhs) const -{ - return !(*this == rhs); -} - -void to_json(nlohmann::json& j, const Plot_request& o) -{ - j = nlohmann::json(); - if(o.binningIsSet()) - j["binning"] = o.m_Binning; - -} - -void from_json(const nlohmann::json& j, Plot_request& o) -{ - if(j.find("binning") != j.end()) - { - j.at("binning").get_to(o.m_Binning); - o.m_BinningIsSet = true; - } - -} - -int64_t Plot_request::getBinning() const -{ - return m_Binning; -} -void Plot_request::setBinning(int64_t const value) -{ - m_Binning = value; - m_BinningIsSet = true; -} -bool Plot_request::binningIsSet() const -{ - return m_BinningIsSet; -} -void Plot_request::unsetBinning() -{ - m_BinningIsSet = false; -} - - -} // namespace org::openapitools::server::model - diff --git a/broker/gen/model/Plot_request.h b/broker/gen/model/Plot_request.h deleted file mode 100644 index 006ce4fb..00000000 --- a/broker/gen/model/Plot_request.h +++ /dev/null @@ -1,78 +0,0 @@ -/** -* Jungfraujoch -* Jungfraujoch Broker Web API -* -* The version of the OpenAPI document: 1.0.1 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -/* - * Plot_request.h - * - * - */ - -#ifndef Plot_request_H_ -#define Plot_request_H_ - - -#include - -namespace org::openapitools::server::model -{ - -/// -/// -/// -class Plot_request -{ -public: - Plot_request(); - virtual ~Plot_request() = default; - - - /// - /// Validate the current data in the model. Throws a ValidationException on failure. - /// - void validate() const; - - /// - /// Validate the current data in the model. Returns false on error and writes an error - /// message into the given stringstream. - /// - bool validate(std::stringstream& msg) const; - - /// - /// Helper overload for validate. Used when one model stores another model and calls it's validate. - /// Not meant to be called outside that case. - /// - bool validate(std::stringstream& msg, const std::string& pathPrefix) const; - - bool operator==(const Plot_request& rhs) const; - bool operator!=(const Plot_request& rhs) const; - - ///////////////////////////////////////////// - /// Plot_request members - - /// - /// - /// - int64_t getBinning() const; - void setBinning(int64_t const value); - bool binningIsSet() const; - void unsetBinning(); - - friend void to_json(nlohmann::json& j, const Plot_request& o); - friend void from_json(const nlohmann::json& j, Plot_request& o); -protected: - int64_t m_Binning; - bool m_BinningIsSet; - -}; - -} // namespace org::openapitools::server::model - -#endif /* Plot_request_H_ */ diff --git a/broker/gen/model/Plots.cpp b/broker/gen/model/Plots.cpp index a94d2e4e..f8ca7236 100644 --- a/broker/gen/model/Plots.cpp +++ b/broker/gen/model/Plots.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Plots.h b/broker/gen/model/Plots.h index 7a79bce2..4d4dcafd 100644 --- a/broker/gen/model/Plots.h +++ b/broker/gen/model/Plots.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Preview_settings.cpp b/broker/gen/model/Preview_settings.cpp index 9e4db3fa..32349411 100644 --- a/broker/gen/model/Preview_settings.cpp +++ b/broker/gen/model/Preview_settings.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Preview_settings.h b/broker/gen/model/Preview_settings.h index 4d814e70..ed7afbf5 100644 --- a/broker/gen/model/Preview_settings.h +++ b/broker/gen/model/Preview_settings.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Rad_int_settings.cpp b/broker/gen/model/Rad_int_settings.cpp index 67f80064..05221beb 100644 --- a/broker/gen/model/Rad_int_settings.cpp +++ b/broker/gen/model/Rad_int_settings.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Rad_int_settings.h b/broker/gen/model/Rad_int_settings.h index adc365cf..d38d2ace 100644 --- a/broker/gen/model/Rad_int_settings.h +++ b/broker/gen/model/Rad_int_settings.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Roi_box.cpp b/broker/gen/model/Roi_box.cpp index d1ae2970..e5e4e701 100644 --- a/broker/gen/model/Roi_box.cpp +++ b/broker/gen/model/Roi_box.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Roi_box.h b/broker/gen/model/Roi_box.h index dbfd8f30..72a47cb4 100644 --- a/broker/gen/model/Roi_box.h +++ b/broker/gen/model/Roi_box.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Roi_box_list.cpp b/broker/gen/model/Roi_box_list.cpp index 51ec78ae..624e94f5 100644 --- a/broker/gen/model/Roi_box_list.cpp +++ b/broker/gen/model/Roi_box_list.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Roi_box_list.h b/broker/gen/model/Roi_box_list.h index 714dc69f..b0abb374 100644 --- a/broker/gen/model/Roi_box_list.h +++ b/broker/gen/model/Roi_box_list.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Roi_circle.cpp b/broker/gen/model/Roi_circle.cpp index 7b7c4902..8f8f3578 100644 --- a/broker/gen/model/Roi_circle.cpp +++ b/broker/gen/model/Roi_circle.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Roi_circle.h b/broker/gen/model/Roi_circle.h index 6c33e5e0..d703754c 100644 --- a/broker/gen/model/Roi_circle.h +++ b/broker/gen/model/Roi_circle.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Roi_circle_list.cpp b/broker/gen/model/Roi_circle_list.cpp index 4028505d..21714cc4 100644 --- a/broker/gen/model/Roi_circle_list.cpp +++ b/broker/gen/model/Roi_circle_list.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Roi_circle_list.h b/broker/gen/model/Roi_circle_list.h index 96cf0db1..ef6f6184 100644 --- a/broker/gen/model/Roi_circle_list.h +++ b/broker/gen/model/Roi_circle_list.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Rotation_axis.cpp b/broker/gen/model/Rotation_axis.cpp index 45150ddf..b41eaf63 100644 --- a/broker/gen/model/Rotation_axis.cpp +++ b/broker/gen/model/Rotation_axis.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Rotation_axis.h b/broker/gen/model/Rotation_axis.h index 548cce22..76355194 100644 --- a/broker/gen/model/Rotation_axis.h +++ b/broker/gen/model/Rotation_axis.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Spot_finding_settings.cpp b/broker/gen/model/Spot_finding_settings.cpp index 8b147dc3..8ae56287 100644 --- a/broker/gen/model/Spot_finding_settings.cpp +++ b/broker/gen/model/Spot_finding_settings.cpp @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/gen/model/Spot_finding_settings.h b/broker/gen/model/Spot_finding_settings.h index c7640ef0..afcbe7a6 100644 --- a/broker/gen/model/Spot_finding_settings.h +++ b/broker/gen/model/Spot_finding_settings.h @@ -2,8 +2,8 @@ * Jungfraujoch * Jungfraujoch Broker Web API * -* The version of the OpenAPI document: 1.0.1 -* +* The version of the OpenAPI document: 1.0.0_rc.10 +* Contact: filip.leonarski@psi.ch * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml index 46ab122f..a3e5a710 100644 --- a/broker/jfjoch_api.yaml +++ b/broker/jfjoch_api.yaml @@ -2,7 +2,9 @@ openapi: 3.0.3 info: title: Jungfraujoch description: Jungfraujoch Broker Web API - version: 1.0.1 + version: 1.0.0_rc.10 + contact: + email: filip.leonarski@psi.ch components: schemas: rotation_axis: @@ -61,17 +63,16 @@ components: minimum: 1 description: | Number of TTL trigger that the detector is expected to receive during data collection - summation: + image_time_us: type: integer format: int64 - minimum: 1 - maximum: 256 - default: 1 + minimum: 0 description: | - FPGA frame summation. For summation above two 32-bit pixel format will be used, unless explicitly specified. - Frame summation factor applies only to conversion mode (assumed as 1 for raw data). + Image time. + If not provided (or zero value) the frame time is assumed as default. + Image time must be multiple of frame time; max value is 256 * frame_time. In XFEL mode: summation happens for frames collected with multiple triggers. - Ignored for storage cells (assumed as 1). + Ignored for storage cells and if raw data are saved. beam_x_pxl: type: number format: float diff --git a/broker/redoc-static.html b/broker/redoc-static.html index 5c641678..712a6996 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -239,6 +239,13 @@ data-styled.g68[id="sc-cmfnrN"]{content:"iOjfOC,"}/*!sc*/ data-styled.g91[id="sc-eFyDpN"]{content:"ObWVe,"}/*!sc*/ .iGcmRf{border:1px solid #32329f;color:#32329f;font-weight:normal;margin-left:0.5em;padding:4px 8px 4px;display:inline-block;text-decoration:none;cursor:pointer;}/*!sc*/ data-styled.g92[id="sc-crHHJw"]{content:"iGcmRf,"}/*!sc*/ +.bTPOee::before{content:'|';display:inline-block;opacity:0.5;width:15px;text-align:center;}/*!sc*/ +.bTPOee:last-child::after{display:none;}/*!sc*/ +data-styled.g93[id="sc-dEFUer"]{content:"bTPOee,"}/*!sc*/ +.fiaqWn{overflow:hidden;}/*!sc*/ +data-styled.g94[id="sc-bqOYya"]{content:"fiaqWn,"}/*!sc*/ +.jqfeha{display:flex;flex-wrap:wrap;margin-left:-15px;}/*!sc*/ +data-styled.g95[id="sc-gHjVMF"]{content:"jqfeha,"}/*!sc*/ .gxSVta{width:9ex;display:inline-block;height:13px;line-height:13px;background-color:#333;border-radius:3px;background-repeat:no-repeat;background-position:6px 4px;font-size:7px;font-family:Verdana,sans-serif;color:white;text-transform:uppercase;text-align:center;font-weight:bold;vertical-align:middle;margin-right:6px;margin-top:2px;}/*!sc*/ .gxSVta.get{background-color:#2F8132;}/*!sc*/ .gxSVta.post{background-color:#186FAF;}/*!sc*/ @@ -359,7 +366,7 @@ data-styled.g137[id="sc-cMdfCE"]{content:"dvQijr,"}/*!sc*/ 55.627 l 55.6165,55.627 -231.245496,231.24803 c -127.185,127.1864 -231.5279,231.248 -231.873,231.248 -0.3451,0 -104.688, -104.0616 -231.873,-231.248 z - " fill="currentColor">

Jungfraujoch (1.0.1)

Download OpenAPI specification:Download

Jungfraujoch (1.0.0_rc.10)

Download OpenAPI specification:Download

E-mail: filip.leonarski@psi.ch

Jungfraujoch Broker Web API

Initialize detector and data acquisition

ntrigger
integer <int64> >= 1
Default: 1

Number of TTL trigger that the detector is expected to receive during data collection

-
summation
integer <int64> [ 1 .. 256 ]
Default: 1

FPGA frame summation. For summation above two 32-bit pixel format will be used, unless explicitly specified. -Frame summation factor applies only to conversion mode (assumed as 1 for raw data). -In XFEL mode: summation happens for frames collected with multiple triggers. -Ignored for storage cells (assumed as 1).

+
image_time_us
integer <int64> >= 0

Image time. If not provided (or zero value) the frame time is assumed as default. +For JUNGFRAU, image time must be multiple of frame time, up to 256 * frame_time.
In XFEL mode: summation happens for frames collected with multiple triggers. +Ignored for storage cells and if raw data are saved.

beam_x_pxl
required
number <float>

/entry/detector/beam_center_x in NXmx @@ -473,6 +478,14 @@ If not provided, the number will be automatically incremented.</p> Transferred over CBOR stream as "series ID", though not saved in HDF5 file. It is highly recommended to keep this number unique for each data collection during experimental series. If not provided, the number will be automatically incremented.

+
run_name
string

Unique ID of run. +Transferred over CBOR stream as "unique series ID", though not saved in HDF5 file. +It is highly recommended to keep this name unique for each data collection during experimental series. +If not provided, the name will be automatically generated as number + colon + file_prefix.

experiment_group
string

Name of group owning the data (e.g. p-group or proposal number). @@ -485,7 +498,7 @@ Transferred over CBOR stream, though not saved in HDF5 file.

" class="sc-iKOmoZ sc-cCzLxZ WVNwY VEBGS sc-ckdEwu LxEPk">

Input parsing or validation error

Request samples

Content type
application/json
{
  • "images_per_trigger": 1,
  • "ntrigger": 1,
  • "summation": 1,
  • "beam_x_pxl": 0.1,
  • "beam_y_pxl": 0.1,
  • "detector_distance_mm": 0.1,
  • "incident_energy_keV": 0.1,
  • "file_prefix": "",
  • "images_per_file": 1000,
  • "space_group_number": 0,
  • "sample_name": "string",
  • "fpga_output": "auto",
  • "compression": "bslz4",
  • "total_flux": 0.1,
  • "transmission": 1,
  • "goniometer": {
    },
  • "header_appendix": null,
  • "image_appendix": null,
  • "energy_multiplier": 1,
  • "data_reduction_factor_serialmx": 1,
  • "run_number": 0,
  • "experiment_group": "string",
  • "unit_cell": {
    }
}

Response samples

Content type
application/json
{
  • "msg": "Detector in wrong state",
  • "reason": "WrongDAQState"
}

Wait for acquisition done

Request samples

Content type
application/json
{
  • "images_per_trigger": 1,
  • "ntrigger": 1,
  • "image_time_us": 0,
  • "beam_x_pxl": 0.1,
  • "beam_y_pxl": 0.1,
  • "detector_distance_mm": 0.1,
  • "incident_energy_keV": 0.1,
  • "file_prefix": "",
  • "images_per_file": 1000,
  • "space_group_number": 0,
  • "sample_name": "string",
  • "fpga_output": "auto",
  • "compression": "bslz4",
  • "total_flux": 0.1,
  • "transmission": 1,
  • "goniometer": {
    },
  • "header_appendix": null,
  • "image_appendix": null,
  • "energy_multiplier": 1,
  • "data_reduction_factor_serialmx": 1,
  • "run_number": 0,
  • "run_name": "string",
  • "experiment_group": "string",
  • "unit_cell": {
    }
}

Response samples

Content type
application/json
{
  • "msg": "Detector in wrong state",
  • "reason": "WrongDAQState"
}

Wait for acquisition done

Block execution of external script till initialization, data collection or pedestal is finished. @@ -859,7 +872,7 @@ User mask is not automatically applied - i.e. pixels with user mask will have a " class="sc-iKOmoZ sc-cCzLxZ WVNwY VEBGS sc-ckdEwu LxEPk">

Release number of Jungfraujoch