v1.0.0-rc.153 (#63)
Build Packages / Unit tests (push) Successful in 1h31m59s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 8m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m27s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m56s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m24s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 10m27s
Build Packages / build:rpm (rocky8) (push) Successful in 9m20s
Build Packages / build:rpm (rocky9) (push) Successful in 10m50s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 9m54s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m38s
Build Packages / DIALS test (push) Successful in 12m13s
Build Packages / XDS test (durin plugin) (push) Successful in 7m8s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m8s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m50s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / Build documentation (push) Successful in 50s
Build Packages / Create release (push) Skipped
Build Packages / Unit tests (push) Successful in 1h31m59s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 8m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m27s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m56s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m24s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 10m27s
Build Packages / build:rpm (rocky8) (push) Successful in 9m20s
Build Packages / build:rpm (rocky9) (push) Successful in 10m50s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 9m54s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m38s
Build Packages / DIALS test (push) Successful in 12m13s
Build Packages / XDS test (durin plugin) (push) Successful in 7m8s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m8s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m50s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / Build documentation (push) Successful in 50s
Build Packages / Create release (push) Skipped
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * jfjoch_broker: Add EXPERIMENTAL pixelrefine mode for image processing * jfjoch_broker: Allow to load user mask from 8-bit and 16-bit TIFF files * jfjoch_broker: Add ROI calculation in non-FPGA workflow * jfjoch_broker: Fixes to TCP image pusher * jfjoch_broker: Remove NUMA bindings * jfjoch_broker: Improvements to indexing * jfjoch_broker: For PSI EIGER, trimming energies are taken from the detector configuration (now compulsory) instead of hardcoded values * jfjoch_writer: Save ROI definitions and the per-pixel ROI bitmap in the master file; azimuthal ROIs support phi (angular) sectors * jfjoch_viewer: Major redesign with dockable panels and saved layouts, plus on-canvas creation/move/resize of box, circle and azimuthal ROIs * jfjoch_viewer: Run jfjoch_process reprocessing jobs from inside the GUI and overlay per-run results Reviewed-on: #63
This commit was merged in pull request #63.
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
#include <QPushButton>
|
||||
#include <QGridLayout>
|
||||
#include <QLabel>
|
||||
#include "../../common/JFJochMath.h"
|
||||
|
||||
#include "../image_analysis/geom_refinement/AssignSpotsToRings.h"
|
||||
|
||||
@@ -25,7 +26,7 @@ PowderCalibrationWidget::PowderCalibrationWidget(QWidget *parent) : QWidget(pare
|
||||
std::vector<float> rings = CalculateXtalRings(GetCalibrant(), 10);
|
||||
QVector<float> q_rings;
|
||||
for (float ring : rings) {
|
||||
q_rings.append(2 * M_PI / ring);
|
||||
q_rings.append(2 * PI / ring);
|
||||
}
|
||||
emit ringsFromCalibration(q_rings);
|
||||
});
|
||||
@@ -51,6 +52,14 @@ UnitCell PowderCalibrationWidget::GetCalibrant() const {
|
||||
uc = UnitCell(5.1769, 4.7218, 58.380, 89.440, 89.634, 75.854);
|
||||
break;
|
||||
case 2:
|
||||
// CeO2, cubic fluorite (a = 5.4115 Å), NIST SRM 674b.
|
||||
uc = UnitCell(5.4115, 5.4115, 5.4115, 90, 90, 90);
|
||||
break;
|
||||
case 3:
|
||||
// Silicon, cubic (a = 5.43102 Å), NIST SRM 640.
|
||||
uc = UnitCell(5.43102, 5.43102, 5.43102, 90, 90, 90);
|
||||
break;
|
||||
case 4:
|
||||
if (sample_cell)
|
||||
uc = sample_cell.value();
|
||||
break;
|
||||
@@ -65,6 +74,8 @@ void PowderCalibrationWidget::updateCalibrantList() {
|
||||
|
||||
calibrantCombo->addItem("LaB6");
|
||||
calibrantCombo->addItem("Silver Behenate");
|
||||
calibrantCombo->addItem("CeO2");
|
||||
calibrantCombo->addItem("Silicon");
|
||||
if (sample_cell)
|
||||
calibrantCombo->addItem(QString("Current sample (%1 %2 %3 %4 %5 %6)")
|
||||
.arg(QString::number(sample_cell->a, 'f', 1))
|
||||
|
||||
Reference in New Issue
Block a user