Build Packages / Unit tests (push) Successful in 1h22m15s
Build Packages / build:windows:nocuda (push) Successful in 18m0s
Build Packages / build:windows:cuda (push) Successful in 20m30s
Build Packages / build:viewer-tgz:cpu (push) Successful in 10m32s
Build Packages / build:viewer-tgz:cuda (push) Successful in 11m39s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 8m55s
Build Packages / build:rugnux:windows (push) Successful in 11m25s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 20m6s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 16m27s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 20m19s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 15m34s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 20m25s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m36s
Build Packages / build:rpm (rocky8) (push) Successful in 17m43s
Build Packages / build:rpm (rocky9) (push) Successful in 13m34s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 21m28s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 18m19s
Build Packages / DIALS test (push) Successful in 12m36s
Build Packages / XDS test (durin plugin) (push) Successful in 6m56s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 6m48s
Build Packages / XDS test (neggia plugin) (push) Successful in 6m7s
Build Packages / Generate python client (push) Successful in 11s
Build Packages / Build documentation (push) Successful in 36s
Build Packages / Create release (push) Skipped
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 5m11s
* `rugnux --mode calibration` writes `<prefix>.json` beside the `.poni`, whose `dataset_settings` member is a `jfjoch_broker` `dataset_settings` body as it stands. * `rugnux` and `jfjoch_viewer` read PILATUS miniCBF sweeps natively, without conversion. * Masters written by other facilities open, including Eiger 1.x and third-party NXmx variants. * `rugnux` measures the beam centre on every run, and indexes with it when the file's value indexes nothing. * A detector swung out on a 2theta arm is placed where the file says it stands, and the calibration can hold the tilt fixed. * `rugnux` writes the unmerged MTZ by default, and a P1 merge beside it, so a wrong space group can be re-merged without reprocessing. * Significant improvements to symmetry handling in `rugnux`: the lattice, the point group, the setting and the systematic absences. * The `rugnux` report gives the resolution the CC1/2 fit reached, beside the range the reflections were written to. * The `rugnux` report gives the twinning statistics measured before the space group was decided, beside the ones measured after. * The `rugnux` report gives the strong-direction diffraction limit, and warns when CC1/2 is not monotone with resolution. * `rugnux` ranks screw axes on the evidence their absences carry, rather than on how many control reflections a candidate happens to have. * Twinning is no longer reported when the L-test contradicts it. * The `rugnux` report gives the detector tilt, the measured tilt and the direct beam beside the beam centre, and a post-refined beam centre is judged against the run's own measurement rather than the file's. * `--no-refine-tilt` holds the detector tilt at the value in the file, instead of zeroing it, when the calibration starts from the spots. * The `jfjoch_viewer` grid scan view draws the cells in the proportion of the scan steps, so the map has the shape of the scanned area. Reviewed-on: #76 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
92 lines
4.6 KiB
C++
92 lines
4.6 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include "JFJochException.h"
|
|
#include "Coord.h"
|
|
#include "DetectorOrientation.h"
|
|
#include "GoniometerAxis.h"
|
|
|
|
// The two directions of the PONI convention, as pure functions, so the conversion can be exercised
|
|
// on its own. rot_matrix = Rz(-rot3) * Rx(-rot2) * Ry(+rot1) in the internal frame (x = column,
|
|
// y = row downward, z = beam); its columns are the lab directions of a +1 column step, a +1 row step
|
|
// and the sample->PONI vector.
|
|
RotMatrix PoniRotMatrix(float rot1, float rot2, float rot3);
|
|
|
|
// The inverse. rot2 comes back in [-pi/2, pi/2] and rot1, rot3 in (-pi, pi], which is the canonical
|
|
// branch: on it the round trip is the identity. At rot2 = +-pi/2 only rot1 +- rot3 is determined, and
|
|
// the convention is to put it all into rot1 and leave rot3 at zero.
|
|
void PoniAnglesFromMatrix(const RotMatrix &rot_matrix, float &rot1, float &rot2, float &rot3);
|
|
|
|
class DiffractionGeometry {
|
|
float beam_x_pxl = 0.0;
|
|
float beam_y_pxl = 0.0;
|
|
float det_distance_mm = 100.0;
|
|
float pixel_size_mm = 0.075;
|
|
float wavelength_A = 1.0;
|
|
float poni_rot_1 = 0.0f;
|
|
float poni_rot_2 = 0.0f;
|
|
float poni_rot_3 = 0.0f;
|
|
DetectorOrientation orientation;
|
|
// The full detector orientation: the PONI rotation composed with the discrete image orientation.
|
|
// Its columns are the fast, slow and normal axes. Orthogonal, but improper when the image is
|
|
// mirrored, so transpose() is still its inverse.
|
|
RotMatrix det_matrix;
|
|
|
|
std::optional<GoniometerAxis> axis;
|
|
void UpdateDetectorMatrix();
|
|
public:
|
|
DiffractionGeometry &BeamX_pxl(float input);
|
|
DiffractionGeometry &BeamY_pxl(float input);
|
|
DiffractionGeometry &DetectorDistance_mm(float input);
|
|
DiffractionGeometry &PixelSize_mm(float input);
|
|
DiffractionGeometry &Wavelength_A(float input);
|
|
DiffractionGeometry &PoniRot1_rad(float input);
|
|
DiffractionGeometry &PoniRot2_rad(float input);
|
|
DiffractionGeometry &PoniRot3_rad(float input);
|
|
DiffractionGeometry &Orientation(const DetectorOrientation &input);
|
|
// Sets the detector plane from its two axis vectors (unit, orthogonal). The discrete orientation
|
|
// is left as it is - it says how the image is stored, which two vectors cannot - and the PONI
|
|
// angles are re-derived so that the two views stay in step.
|
|
DiffractionGeometry &DetectorAxes(const Coord &fast, const Coord &slow);
|
|
DiffractionGeometry &Rotation(const std::optional<GoniometerAxis> &input);
|
|
|
|
[[nodiscard]] float GetBeamX_pxl() const;
|
|
[[nodiscard]] float GetBeamY_pxl() const;
|
|
[[nodiscard]] float GetDetectorDistance_mm() const;
|
|
[[nodiscard]] float GetPixelSize_mm() const;
|
|
[[nodiscard]] float GetWavelength_A() const;
|
|
[[nodiscard]] Coord GetScatteringVector() const;
|
|
[[nodiscard]] float GetPoniRot1_rad() const;
|
|
[[nodiscard]] float GetPoniRot2_rad() const;
|
|
[[nodiscard]] float GetPoniRot3_rad() const;
|
|
[[nodiscard]] DetectorOrientation GetOrientation() const;
|
|
[[nodiscard]] Coord GetFastAxis() const; // lab direction of a +1 column step
|
|
[[nodiscard]] Coord GetSlowAxis() const; // lab direction of a +1 row step
|
|
[[nodiscard]] Coord GetNormalAxis() const; // sample -> PONI direction
|
|
[[nodiscard]] std::pair<float, float> GetDirectBeam_pxl() const;
|
|
[[nodiscard]] std::optional<GoniometerAxis> GetRotation() const;
|
|
|
|
[[nodiscard]] Coord LabCoord(float x, float y) const;
|
|
[[nodiscard]] Coord DetectorToRecip(float x, float y) const;
|
|
[[nodiscard]] std::pair<float, float> RecipToDetector(const Coord &recip) const;
|
|
[[nodiscard]] float TwoTheta_rad(float x, float y) const;
|
|
[[nodiscard]] float Phi_rad(float x, float y) const;
|
|
[[nodiscard]] float PxlToRes(float x, float y) const;
|
|
[[nodiscard]] float PxlToQ(float x, float y) const;
|
|
[[nodiscard]] float PxlToRes(float dist_pxl) const;
|
|
[[nodiscard]] float ResToPxl(float d_A) const;
|
|
[[nodiscard]] Coord ResToPxl(float d_A, float phi) const;
|
|
[[nodiscard]] float DistFromEwaldSphere(const Coord& recip) const;
|
|
[[nodiscard]] float CalcAzIntSolidAngleCorr(float x, float y) const;
|
|
[[nodiscard]] float CalcAzIntPolarizationCorr(float x, float y, float coeff) const;
|
|
[[nodiscard]] std::pair<float, float> ResPhiToPxl(float d_A, float phi_rad) const;
|
|
[[nodiscard]] Coord ProjectToEwaldSphere(const Coord &p0) const;
|
|
|
|
// eq. 18 in https://journals.iucr.org/d/issues/2014/08/00/dz5332/index.html
|
|
[[nodiscard]] float AngleFromEwaldSphere_deg(const Coord &p0) const;
|
|
|
|
[[nodiscard]] const RotMatrix& GetDetectorMatrix() const;
|
|
};
|