v1.0.0-rc.139 (#49)
Build Packages / Unit tests (push) Successful in 1h17m4s
Build Packages / Generate python client (push) Successful in 1m24s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m34s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 12m37s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m11s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m4s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m59s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 13m4s
Build Packages / build:rpm (rocky8) (push) Successful in 13m12s
Build Packages / XDS test (durin plugin) (push) Successful in 9m57s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m52s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m30s
Build Packages / build:rpm (rocky9) (push) Successful in 13m59s
Build Packages / Build documentation (push) Successful in 1m7s
Build Packages / XDS test (neggia plugin) (push) Successful in 9m24s
Build Packages / Create release (push) Has been skipped
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m54s
Build Packages / DIALS test (push) Successful in 13m14s
Build Packages / Unit tests (push) Successful in 1h17m4s
Build Packages / Generate python client (push) Successful in 1m24s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m34s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 12m37s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m11s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m4s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m59s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 13m4s
Build Packages / build:rpm (rocky8) (push) Successful in 13m12s
Build Packages / XDS test (durin plugin) (push) Successful in 9m57s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m52s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m30s
Build Packages / build:rpm (rocky9) (push) Successful in 13m59s
Build Packages / Build documentation (push) Successful in 1m7s
Build Packages / XDS test (neggia plugin) (push) Successful in 9m24s
Build Packages / Create release (push) Has been skipped
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m54s
Build Packages / DIALS test (push) Successful in 13m14s
This is an UNSTABLE release. The release has significant modifications and bug fixes, if things go wrong, it is better to revert to 1.0.0-rc.132. * jfjoch_broker: Further reduce startup time for DECTRIS detectors by selectively modifying SIMPLON parameters on `/start` * jfjoch_broker: Further reduce startup time for DECTRIS detectors by not setting beam center and detector distance via SIMPLON API on '/start' * jfjoch_broker: Add an extra message to ZeroMQ puller ready to monitor Lite worklow preparation time * jfjoch_broker: Image buffer configuration is postponed for Lite receiver flow till start message is received * jfjoch_broker: Use nanoseconds internally for frame/image/readout time * jfjoch_broker: Extra messages added for receiver operation (to be removed after debugging finished) * jfojch_broker: Improve profiling of different data analysis steps * jfjoch_broker: Record integration reflection count * jfjoch_broker: Fix bug where ZeroMQ preview frequency was confusing time units (micro vs. milliseconds) * jfjoch_broker: Fix bug where '/wait_till_done' got deadlocked * jfjoch_writer: Fix confusion between NaN and zero in floating-point datasets **Breaking changes**: detector definition is now using nanoseconds to define minimum frame time, minimum count time and readout time. Reviewed-on: #49
This commit was merged in pull request #49.
This commit is contained in:
+12
-12
@@ -47,7 +47,7 @@ DetectorSetup::DetectorSetup(std::shared_ptr<DetectorGeometry> in_geometry,
|
||||
detector_type(in_detector_type),
|
||||
read_out_time(0),
|
||||
min_frame_time(std::chrono::milliseconds(1)),
|
||||
min_count_time(std::chrono::microseconds(MIN_COUNT_TIME_IN_US)) {
|
||||
min_count_time(MIN_COUNT_TIME) {
|
||||
|
||||
if (description.empty())
|
||||
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
||||
@@ -56,7 +56,7 @@ DetectorSetup::DetectorSetup(std::shared_ptr<DetectorGeometry> in_geometry,
|
||||
switch (detector_type) {
|
||||
case DetectorType::EIGER:
|
||||
high_voltage = 150;
|
||||
read_out_time = std::chrono::microseconds(20);
|
||||
read_out_time = PSI_EIGER_READOUT_TIME;
|
||||
if (!det_modules_hostname.empty() && (2 * geometry->GetModulesNum() != det_modules_hostname.size()))
|
||||
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
||||
"Mismatch between number of modules in detector geometry and hostname (For EIGER - one module = 2 hostnames)");
|
||||
@@ -64,7 +64,7 @@ DetectorSetup::DetectorSetup(std::shared_ptr<DetectorGeometry> in_geometry,
|
||||
case DetectorType::JUNGFRAU:
|
||||
high_voltage = 120;
|
||||
bit_depth_readout = 16;
|
||||
read_out_time = std::chrono::microseconds(20);
|
||||
read_out_time = PSI_JUNGFRAU_READOUT_TIME;
|
||||
if (!det_modules_hostname.empty() && (geometry->GetModulesNum() != det_modules_hostname.size()))
|
||||
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
||||
"Mismatch between number of modules in detector geometry and hostname");
|
||||
@@ -264,7 +264,7 @@ DetectorSetup &DetectorSetup::ModuleSync(bool input) {
|
||||
return *this;
|
||||
}
|
||||
|
||||
DetectorSetup & DetectorSetup::ReadOutTime(std::chrono::microseconds input) {
|
||||
DetectorSetup & DetectorSetup::ReadOutTime(std::chrono::nanoseconds input) {
|
||||
if (input.count() < 0)
|
||||
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
||||
"Read out time has to be non-negative");
|
||||
@@ -272,18 +272,18 @@ DetectorSetup & DetectorSetup::ReadOutTime(std::chrono::microseconds input) {
|
||||
return *this;
|
||||
}
|
||||
|
||||
std::chrono::microseconds DetectorSetup::GetReadOutTime() const {
|
||||
std::chrono::nanoseconds DetectorSetup::GetReadOutTime() const {
|
||||
return read_out_time;
|
||||
}
|
||||
|
||||
std::chrono::microseconds DetectorSetup::GetMinFrameTime() const {
|
||||
std::chrono::nanoseconds DetectorSetup::GetMinFrameTime() const {
|
||||
switch (GetDetectorType()) {
|
||||
case DetectorType::EIGER:
|
||||
return std::chrono::microseconds(MIN_FRAME_TIME_EIGER_IN_US);
|
||||
return MIN_FRAME_TIME_EIGER;
|
||||
case DetectorType::JUNGFRAU:
|
||||
if (GetUDPInterfaceCount() == 1)
|
||||
return std::chrono::microseconds(MIN_FRAME_TIME_JUNGFRAU_HALF_SPEED_IN_US);
|
||||
return std::chrono::microseconds(MIN_FRAME_TIME_JUNGFRAU_FULL_SPEED_IN_US);
|
||||
return MIN_FRAME_TIME_JUNGFRAU_HALF_SPEED;
|
||||
return MIN_FRAME_TIME_JUNGFRAU_FULL_SPEED;
|
||||
case DetectorType::DECTRIS:
|
||||
return min_frame_time;
|
||||
default:
|
||||
@@ -292,16 +292,16 @@ std::chrono::microseconds DetectorSetup::GetMinFrameTime() const {
|
||||
}
|
||||
}
|
||||
|
||||
std::chrono::microseconds DetectorSetup::GetMinCountTime() const {
|
||||
std::chrono::nanoseconds DetectorSetup::GetMinCountTime() const {
|
||||
return min_count_time;
|
||||
}
|
||||
|
||||
DetectorSetup &DetectorSetup::MinCountTime(std::chrono::microseconds input) {
|
||||
DetectorSetup &DetectorSetup::MinCountTime(std::chrono::nanoseconds input) {
|
||||
min_count_time = input;
|
||||
return *this;
|
||||
}
|
||||
|
||||
DetectorSetup &DetectorSetup::MinFrameTime(std::chrono::microseconds input) {
|
||||
DetectorSetup &DetectorSetup::MinFrameTime(std::chrono::nanoseconds input) {
|
||||
min_frame_time = input;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user