mx/Jungfraujoch
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 79 Wiki Activity
Files
508fcfb400aad5b01aee9f0af5e3ef95cbaffbd3
Jungfraujoch/common/DatasetSettings.h
T
leonarski_f 6a21d453ba macOS groundwork: what a static read says will stop an Apple Clang / libc++ build 
None of this has been built on a Mac - there is none yet. It is the list a read-only audit of the
viewer/rugnux subtree produced, plus a serial -fsyntax-only pass of every reachable .cpp with
clang 16 + libc++ on Linux, which found exactly one error (the first item).

- JFJochDatasetInfoChartView: std::vector<fftwf_complex> does not compile with libc++, whose
  construct_at refuses an array element type (float[2]). Use std::vector<std::complex<float>> and
  the reinterpret_cast every other FFTW call site already uses.
- libcurl: GSSAPI off on Linux, and neither TLS nor GSSAPI on macOS. The viewer never sets
  CURLOPT_HTTPAUTH, so Negotiate was dead weight that cost a krb5-devel build dependency; on macOS
  curl's FindGSS refuses the system Heimdal outright, and with Secure Transport gone from curl
  (8.15) TLS would mean a Homebrew OpenSSL - the only host library a Mac build would need.
  Linux keeps OpenSSL. CURL_USE_GSSAPI is forced OFF rather than left unset so an existing build
  tree drops its cached ON.
- libjpeg-turbo ExternalProject: CMAKE_SYSTEM_NAME/PROCESSOR were forwarded unconditionally, which
  puts even a native sub-build into cross-compiling mode, and CMAKE_OSX_ARCHITECTURES / SYSROOT /
  DEPLOYMENT_TARGET were not forwarded at all. Now the same rule the zlib-ng sub-build follows.
- ShadowAccumulatorGPU.cu was added on the JFJOCH_USE_CUDA option (default ON) instead of
  JFJOCH_CUDA_AVAILABLE like every other .cu, so a machine without nvcc got a CUDA source in a
  target with no CUDA language.
- CMAKE_OSX_DEPLOYMENT_TARGET defaults to 12.0 (overridable). Left unset, CMake takes the build
  machine's OS version and the .dmg starts nowhere older.
- Standard headers that were only arriving transitively (<chrono>, <cmath>, <limits>, <cstring>,
  <atomic>, <thread>, <string>); newer libc++ releases keep removing such transitive includes.

Checked: the seven changed sources pass clang 16 + libc++ -fsyntax-only. The CMake changes are
not configured or built.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015eAE2K7i5JGDwgwifiCfuA
(cherry picked from commit 5a7282759a)
2026-09-20 18:45:04 +02:00

187 lines
7.5 KiB
C++
Raw Blame History

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <chrono>
#include <cstdint>
#include <string>
#include <optional>
#include "UnitCell.h"
#include "Coord.h"
#include "../compression/CompressionAlgorithmEnum.h"
#include "JFJochMessages.h"
#include "XrayFluorescenceSpectrum.h"
#include "gemmi/symmetry.hpp"
class DatasetSettings {
int64_t images_per_trigger;
int64_t ntrigger;
float beam_x_pxl;
float beam_y_pxl;
float detector_distance_mm;
float photon_energy_keV;
std::string file_prefix;
std::optional<int64_t> images_per_file;
CompressionAlgorithm compression;
std::string sample_name;
std::optional<UnitCell> unit_cell;
// The whole group, not its number: a number can only name the reference setting, so
// "P 1 1 2" and "R 3:R" are lost the moment a number is all that is kept.
std::optional<gemmi::SpaceGroup> space_group;
std::optional<float> total_flux;
std::optional<float> attenuator_transmission;
// Size of the beam where it meets the sample, x then y (NXmx incident_beam_size)
std::optional<float> beam_size_x_um;
std::optional<float> beam_size_y_um;
std::optional<float> ring_current_mA;
std::optional<GoniometerAxis> goniometer;
std::optional<GridScanSettings> grid_scan;
std::optional<float> sample_temperature_K;
nlohmann::json image_appendix;
nlohmann::json header_appendix;
float data_reduction_factor_serialmx;
std::optional<std::chrono::nanoseconds> image_time;
std::optional<uint64_t> run_number;
std::optional<std::string> run_name;
std::string group;
std::optional<int64_t> compression_poisson_factor;
std::optional<int64_t> pixel_value_low_threshold;
std::optional<int64_t> pixel_value_high_threshold;
std::optional<bool> save_calibration;
bool write_nxmx_hdf5_master;
std::optional<float> polarization_factor;
std::optional<float> bandwidth_fwhm; // relative X-ray bandwidth, FWHM of dlambda/lambda (e.g. 0.01 for 1%)
float poni_rot_1_rad;
float poni_rot_2_rad;
float poni_rot_3_rad;
bool spot_finding_enable;
int64_t max_spot_count;
bool detect_ice_rings; // Enable special handling of ice rings
XrayFluorescenceSpectrum fluorescence_spectrum;
std::optional<SmargonPosition> smargon_position;
public:
DatasetSettings();
DatasetSettings& ImagesPerTrigger(int64_t input);
DatasetSettings& NumTriggers(int64_t triggers);
DatasetSettings& PhotonEnergy_keV(float input);
DatasetSettings& BeamX_pxl(float input);
DatasetSettings& BeamY_pxl(float input);
DatasetSettings& DetectorDistance_mm(float input);
DatasetSettings& FilePrefix(std::string input);
DatasetSettings& FilePrefixTrusted(std::string input); // offline/local: no CheckPath guard (absolute allowed)
DatasetSettings& Compression(CompressionAlgorithm input);
DatasetSettings& SetUnitCell(const std::optional<UnitCell> &cell);
DatasetSettings& SpaceGroupNumber(std::optional<int64_t> input);
DatasetSettings& SetSpaceGroup(const std::optional<gemmi::SpaceGroup> &input);
DatasetSettings& SampleName(std::string input);
DatasetSettings& AttenuatorTransmission(const std::optional<float> &input);
DatasetSettings& TotalFlux(const std::optional<float> &input);
DatasetSettings& BeamSizeX_um(const std::optional<float> &input);
DatasetSettings& BeamSizeY_um(const std::optional<float> &input);
DatasetSettings& Goniometer(const std::optional<GoniometerAxis>& input);
DatasetSettings& GridScan(const std::optional<GridScanSettings>& input);
DatasetSettings& HeaderAppendix(const nlohmann::json& input);
DatasetSettings& ImageAppendix(const nlohmann::json& input);
DatasetSettings& ImagesPerFile(const std::optional<int64_t> &input);
DatasetSettings& RunNumber(const std::optional<uint64_t> &run_number);
DatasetSettings& RunName(const std::optional<std::string> &input);
DatasetSettings& ExperimentGroup(const std::string &group);
DatasetSettings& ImageTime(const std::optional<std::chrono::nanoseconds> &input);
DatasetSettings& LossyCompressionSerialMX(float input);
DatasetSettings& LossyCompressionPoisson(std::optional<int64_t> input);
DatasetSettings& WriteNXmxHDF5Master(bool input);
DatasetSettings& SaveCalibration(std::optional<bool> input);
DatasetSettings& PixelValueLowThreshold(const std::optional<int64_t> &input);
DatasetSettings& PixelValueHighThreshold(const std::optional<int64_t> &input);
DatasetSettings& PolarizationFactor(const std::optional<float> &input);
DatasetSettings& BandwidthFWHM(const std::optional<float> &input);
DatasetSettings& PoniRot1_rad(float input);
DatasetSettings& PoniRot2_rad(float input);
DatasetSettings& PoniRot3_rad(float input);
DatasetSettings& RingCurrent_mA(const std::optional<float> &input);
DatasetSettings& SampleTemperature_K(const std::optional<float> &input);
DatasetSettings& SpotFindingEnable(bool input);
DatasetSettings& MaxSpotCount(int64_t input);
DatasetSettings& DetectIceRings(bool input);
DatasetSettings& FluorescenceSpectrum(const XrayFluorescenceSpectrum& input);
DatasetSettings& Smargon(const std::optional<SmargonPosition>& input);
std::optional<float> GetAttenuatorTransmission() const;
std::optional<float> GetTotalFlux() const;
std::optional<float> GetBeamSizeX_um() const;
std::optional<float> GetBeamSizeY_um() const;
std::optional<GoniometerAxis> &Goniometer();
std::optional<GridScanSettings> &GridScan();
const std::optional<GoniometerAxis> &GetGoniometer() const;
const std::optional<GridScanSettings> &GetGridScan() const;
const nlohmann::json& GetHeaderAppendix() const;
const nlohmann::json& GetImageAppendix() const;
std::optional<UnitCell> GetUnitCell() const;
std::optional<int64_t> GetSpaceGroupNumber() const;
const std::optional<gemmi::SpaceGroup> &GetSpaceGroup() const;
std::string GetSampleName() const;
float GetPhotonEnergy_keV() const;
float GetBeamX_pxl() const;
float GetBeamY_pxl() const;
float GetDetectorDistance_mm() const;
Coord GetScatteringVector() const;
std::string GetFilePrefix() const;
CompressionAlgorithm GetCompressionAlgorithm() const;
int64_t GetNumTriggers() const;
int64_t GetImageNumPerTrigger() const;
std::optional<int64_t> GetImagesPerFile() const;
std::optional<uint64_t> GetRunNumber() const;
std::optional<std::string> GetRunName() const;
std::string GetExperimentGroup() const;
std::optional<std::chrono::nanoseconds> GetImageTime() const;
float GetLossyCompressionSerialMX() const;
std::optional<int64_t> GetLossyCompressionPoisson() const;
std::optional<int64_t> GetPixelValueLowThreshold() const;
std::optional<int64_t> GetPixelValueHighThreshold() const;
bool IsWriteNXmxHDF5Master() const;
std::optional<bool> IsSaveCalibration() const;
std::optional<float> GetPolarizationFactor() const;
std::optional<float> GetBandwidthFWHM() const;
float GetPoniRot1_rad() const;
float GetPoniRot2_rad() const;
float GetPoniRot3_rad() const;
std::optional<float> GetRingCurrent_mA() const;
std::optional<float> GetSampleTemperature_K() const;
bool IsSpotFindingEnabled() const;
int64_t GetMaxSpotCount() const;
bool IsDetectIceRings() const;
const XrayFluorescenceSpectrum &GetFluorescenceSpectrum() const;
std::optional<SmargonPosition> GetSmargonPosition() const;
};
Reference in New Issue View Git Blame Copy Permalink