v1.0.0-rc.135 (#44)
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m55s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m28s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m56s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m47s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m7s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m31s
Build Packages / build:rpm (rocky8) (push) Successful in 12m59s
Build Packages / build:rpm (rocky9) (push) Successful in 14m5s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 15m30s
Build Packages / Generate python client (push) Successful in 1m18s
Build Packages / Build documentation (push) Successful in 1m3s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m8s
Build Packages / XDS test (durin plugin) (push) Successful in 9m16s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m59s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m12s
Build Packages / DIALS test (push) Successful in 11m44s
Build Packages / Unit tests (push) Successful in 1h23m8s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m55s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m28s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m56s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m47s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m7s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m31s
Build Packages / build:rpm (rocky8) (push) Successful in 12m59s
Build Packages / build:rpm (rocky9) (push) Successful in 14m5s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 15m30s
Build Packages / Generate python client (push) Successful in 1m18s
Build Packages / Build documentation (push) Successful in 1m3s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m8s
Build Packages / XDS test (durin plugin) (push) Successful in 9m16s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m59s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m12s
Build Packages / DIALS test (push) Successful in 11m44s
Build Packages / Unit tests (push) Successful in 1h23m8s
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. * Multiple small bug fixes scattered across the whole code base. (detected with GPT-5.4) * jfjoch_viewer: Improve image render performance Reviewed-on: #44 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch> Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
This commit was merged in pull request #44.
This commit is contained in:
@@ -40,6 +40,8 @@ int64_t DiffractionSpot::MaxCount() const {
|
||||
}
|
||||
|
||||
Coord DiffractionSpot::RawCoord() const {
|
||||
if (photons == 0)
|
||||
return {0, 0, 0};
|
||||
return {x / (float)photons, y / (float)photons, 0};
|
||||
}
|
||||
|
||||
@@ -47,10 +49,6 @@ int64_t DiffractionSpot::PixelCount() const {
|
||||
return pixel_count;
|
||||
}
|
||||
|
||||
double DiffractionSpot::GetResolution(const DiffractionGeometry &geom) const {
|
||||
return geom.PxlToRes(x / (float)photons, y / (float)photons);
|
||||
}
|
||||
|
||||
void DiffractionSpot::AddPixel(uint32_t col, uint32_t line, int64_t photons) {
|
||||
this->x += col * (float) photons;
|
||||
this->y += line * (float) photons;
|
||||
@@ -65,7 +63,10 @@ void DiffractionSpot::ConvertToImageCoordinates(const DiffractionExperiment &exp
|
||||
this->y = c_out.y * (float) photons;
|
||||
}
|
||||
|
||||
SpotToSave DiffractionSpot::Export(const DiffractionGeometry &geometry, int64_t image_num) const {
|
||||
std::optional<SpotToSave> DiffractionSpot::Export(const DiffractionGeometry &geometry, int64_t image_num) const {
|
||||
if (photons == 0)
|
||||
return std::nullopt;
|
||||
|
||||
auto d = geometry.PxlToRes(x / (float) photons, y / (float) photons);
|
||||
|
||||
float phi = 0.0f;
|
||||
@@ -75,7 +76,7 @@ SpotToSave DiffractionSpot::Export(const DiffractionGeometry &geometry, int64_t
|
||||
phi = geometry.GetRotation()->GetAngle_deg(image_num) + geometry.GetRotation()->GetWedge_deg() / 2.0f;
|
||||
}
|
||||
|
||||
return {
|
||||
return SpotToSave{
|
||||
.x = x / static_cast<float>(photons),
|
||||
.y = y / static_cast<float>(photons),
|
||||
.phi = phi,
|
||||
|
||||
Reference in New Issue
Block a user