diff --git a/acquisition_device/AcquisitionCounters.h b/acquisition_device/AcquisitionCounters.h index 4222d328..5e978bd4 100644 --- a/acquisition_device/AcquisitionCounters.h +++ b/acquisition_device/AcquisitionCounters.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ACQUISITIONCOUNTERS_H -#define JUNGFRAUJOCH_ACQUISITIONCOUNTERS_H +#pragma once #include #include @@ -67,6 +66,3 @@ public: uint64_t GetModuleNumber() const; }; - - -#endif //JUNGFRAUJOCH_ACQUISITIONCOUNTERS_H diff --git a/acquisition_device/AcquisitionDevice.h b/acquisition_device/AcquisitionDevice.h index be54b1c4..71e60ca3 100644 --- a/acquisition_device/AcquisitionDevice.h +++ b/acquisition_device/AcquisitionDevice.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ACQUISITIONDEVICE_H -#define JUNGFRAUJOCH_ACQUISITIONDEVICE_H +#pragma once #include #include @@ -119,5 +118,3 @@ public: void RunInternalGenerator(const DiffractionExperiment& experiment); }; - -#endif //JUNGFRAUJOCH_ACQUISITIONDEVICE_H diff --git a/acquisition_device/AcquisitionDeviceGroup.h b/acquisition_device/AcquisitionDeviceGroup.h index 6efce6f5..7044936a 100644 --- a/acquisition_device/AcquisitionDeviceGroup.h +++ b/acquisition_device/AcquisitionDeviceGroup.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ACQUISITIONDEVICEGROUP_H -#define JUNGFRAUJOCH_ACQUISITIONDEVICEGROUP_H +#pragma once #include #include "AcquisitionDevice.h" @@ -20,5 +19,3 @@ public: std::vector GetDeviceStatus() const; void EnableLogging(Logger *logger); }; - -#endif //JUNGFRAUJOCH_ACQUISITIONDEVICEGROUP_H diff --git a/acquisition_device/Completion.h b/acquisition_device/Completion.h index 6616d03a..200716ef 100644 --- a/acquisition_device/Completion.h +++ b/acquisition_device/Completion.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_COMPLETION_H -#define JUNGFRAUJOCH_COMPLETION_H +#pragma once #include @@ -21,5 +20,3 @@ struct Completion { }; Completion parse_hw_completion(uint32_t hw_input); - -#endif //JUNGFRAUJOCH_COMPLETION_H diff --git a/acquisition_device/FPGAAcquisitionDevice.h b/acquisition_device/FPGAAcquisitionDevice.h index f81ed235..03a802e3 100644 --- a/acquisition_device/FPGAAcquisitionDevice.h +++ b/acquisition_device/FPGAAcquisitionDevice.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_FPGAACQUISITIONDEVICE_H -#define JUNGFRAUJOCH_FPGAACQUISITIONDEVICE_H +#pragma once #include "AcquisitionDevice.h" #include "../fpga/pcie_driver/jfjoch_fpga.h" @@ -49,5 +48,3 @@ public: void SetInternalGeneratorFrame(const uint16_t *input, size_t module_number) override; uint32_t GetExpectedDescriptorsPerModule() const override; }; - -#endif //JUNGFRAUJOCH_FPGAACQUISITIONDEVICE_H diff --git a/acquisition_device/HLSSimulatedDevice.h b/acquisition_device/HLSSimulatedDevice.h index b2ae5fae..4fee45bc 100644 --- a/acquisition_device/HLSSimulatedDevice.h +++ b/acquisition_device/HLSSimulatedDevice.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_HLSSIMULATEDDEVICE_H -#define JUNGFRAUJOCH_HLSSIMULATEDDEVICE_H +#pragma once #include @@ -41,6 +40,3 @@ public: void Cancel() override; DeviceStatus GetDeviceStatus() const override; }; - - -#endif //JUNGFRAUJOCH_HLSSIMULATEDDEVICE_H diff --git a/acquisition_device/PCIExpressDevice.h b/acquisition_device/PCIExpressDevice.h index 4d5b8516..2362a1fe 100644 --- a/acquisition_device/PCIExpressDevice.h +++ b/acquisition_device/PCIExpressDevice.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_PCIEXPRESSDEVICE_H -#define JUNGFRAUJOCH_PCIEXPRESSDEVICE_H +#pragma once #include "FPGAAcquisitionDevice.h" #include "../fpga/host_library/JungfraujochDevice.h" @@ -36,5 +35,3 @@ public: DeviceStatus GetDeviceStatus() const override; DataCollectionStatus GetDataCollectionStatus() const override; }; - -#endif //JUNGFRAUJOCH_PCIEXPRESSDEVICE_H diff --git a/broker/JFJochBrokerParser.h b/broker/JFJochBrokerParser.h index 9de6ae0f..f5f2f839 100644 --- a/broker/JFJochBrokerParser.h +++ b/broker/JFJochBrokerParser.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHBROKERPARSER_H -#define JUNGFRAUJOCH_JFJOCHBROKERPARSER_H +#pragma once #include "../common/DiffractionExperiment.h" #include "../acquisition_device/AcquisitionDeviceGroup.h" @@ -22,5 +21,3 @@ std::unique_ptr ParseImagePusher(const org::openapitools::server::m void ParseAcquisitionDeviceGroup(const org::openapitools::server::model::Jfjoch_settings &input, AcquisitionDeviceGroup &aq_devices); void ParseReceiverSettings(const org::openapitools::server::model::Jfjoch_settings &input, JFJochReceiverService &service); SpotFindingSettings ParseSpotFindingSettings(const org::openapitools::server::model::Jfjoch_settings &input); - -#endif //JUNGFRAUJOCH_JFJOCHBROKERPARSER_H diff --git a/broker/JFJochServices.h b/broker/JFJochServices.h index 0ffd64a7..88a6a8b8 100644 --- a/broker/JFJochServices.h +++ b/broker/JFJochServices.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHSERVICES_H -#define JUNGFRAUJOCH_JFJOCHSERVICES_H +#pragma once #include #include "../common/DiffractionExperiment.h" @@ -75,5 +74,3 @@ public: ImagePusherStatus GetImagePusherStatus() const; }; - -#endif //JUNGFRAUJOCH_JFJOCHSERVICES_H diff --git a/broker/JFJochStateMachine.h b/broker/JFJochStateMachine.h index 53c0f416..1d5fb56a 100644 --- a/broker/JFJochStateMachine.h +++ b/broker/JFJochStateMachine.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHSTATEMACHINE_H -#define JUNGFRAUJOCH_JFJOCHSTATEMACHINE_H +#pragma once #include #include @@ -247,6 +246,3 @@ public: ImagePusherStatus GetImagePusherStatus() const; }; - - -#endif //JUNGFRAUJOCH_JFJOCHSTATEMACHINE_H diff --git a/broker/OpenAPIConvert.h b/broker/OpenAPIConvert.h index 9c382cfd..6337f84a 100644 --- a/broker/OpenAPIConvert.h +++ b/broker/OpenAPIConvert.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_OPENAPICONVERT_H -#define JFJOCH_OPENAPICONVERT_H +#pragma once #include "Dark_mask_settings.h" #include "Image_pusher_status.h" @@ -96,4 +95,4 @@ org::openapitools::server::model::Dark_mask_settings Convert(const DarkMaskSetti DarkMaskSettings Convert(const org::openapitools::server::model::Dark_mask_settings& input); org::openapitools::server::model::Image_pusher_status Convert(const ImagePusherStatus& input); -#endif //JFJOCH_OPENAPICONVERT_H + diff --git a/common/ADUHistogram.h b/common/ADUHistogram.h index d3940cc2..2e30d90b 100644 --- a/common/ADUHistogram.h +++ b/common/ADUHistogram.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ADUHISTOGRAM_H -#define JUNGFRAUJOCH_ADUHISTOGRAM_H +#pragma once #include #include "MultiLinePlot.h" @@ -19,5 +18,3 @@ public: MultiLinePlot GetPlot() const; void Restart(); }; - -#endif //JUNGFRAUJOCH_ADUHISTOGRAM_H diff --git a/common/AzimuthalIntegrationMapping.h b/common/AzimuthalIntegrationMapping.h index eddab1f7..14337547 100644 --- a/common/AzimuthalIntegrationMapping.h +++ b/common/AzimuthalIntegrationMapping.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_AZIMUTHALINTEGRATIONMAPPING_H -#define JUNGFRAUJOCH_AZIMUTHALINTEGRATIONMAPPING_H +#pragma once #include #include "DiffractionExperiment.h" @@ -57,6 +56,3 @@ public: [[nodiscard]] int32_t GetQBinCount() const; [[nodiscard]] size_t GetNThreads() const; }; - - -#endif //JUNGFRAUJOCH_AZIMUTHALINTEGRATIONMAPPING_H diff --git a/common/AzimuthalIntegrationProfile.h b/common/AzimuthalIntegrationProfile.h index 87d681db..90000efb 100644 --- a/common/AzimuthalIntegrationProfile.h +++ b/common/AzimuthalIntegrationProfile.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_AZIMUTHALINTEGRATIONPROFILE_H -#define JUNGFRAUJOCH_AZIMUTHALINTEGRATIONPROFILE_H +#pragma once #include #include @@ -48,5 +47,3 @@ public: MultiLinePlot GetPlot(bool force_1d = false, PlotAzintUnit plot_unit = PlotAzintUnit::Q_recipA) const; AzimuthalIntegrationProfile& operator+=(const AzimuthalIntegrationProfile& profile); // Not thread safe }; - -#endif //JUNGFRAUJOCH_AZIMUTHALINTEGRATIONPROFILE_H diff --git a/common/AzimuthalIntegrationSettings.h b/common/AzimuthalIntegrationSettings.h index 02ddea55..eafb97f5 100644 --- a/common/AzimuthalIntegrationSettings.h +++ b/common/AzimuthalIntegrationSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_AZIMUTHALINTEGRATIONSETTINGS_H -#define JFJOCH_AZIMUTHALINTEGRATIONSETTINGS_H +#pragma once #include #include @@ -46,5 +45,3 @@ public: [[nodiscard]] uint16_t GetBin(float q, float phi_deg) const; }; - -#endif //JFJOCH_AZIMUTHALINTEGRATIONSETTINGS_H diff --git a/common/BraggIntegrationSettings.h b/common/BraggIntegrationSettings.h index 151f4eab..60ab4059 100644 --- a/common/BraggIntegrationSettings.h +++ b/common/BraggIntegrationSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_BRAGGINTEGRATIONSETTINGS_H -#define JFJOCH_BRAGGINTEGRATIONSETTINGS_H +#pragma once #include @@ -30,6 +29,3 @@ public: [[nodiscard]] float GetMinimumSigmaInRegardsToI() const; }; - - -#endif //JFJOCH_BRAGGINTEGRATIONSETTINGS_H diff --git a/common/CUDAWrapper.h b/common/CUDAWrapper.h index e3325f97..dce83bb0 100644 --- a/common/CUDAWrapper.h +++ b/common/CUDAWrapper.h @@ -1,13 +1,10 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_CUDAWRAPPER_H -#define JUNGFRAUJOCH_CUDAWRAPPER_H +#pragma once #include int32_t get_gpu_count(); void set_gpu(int32_t dev_id); int get_gpu_numa_node(int dev_id); - -#endif //JUNGFRAUJOCH_CUDAWRAPPER_H diff --git a/common/CheckPath.h b/common/CheckPath.h index 9c9d4ffb..331efa79 100644 --- a/common/CheckPath.h +++ b/common/CheckPath.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_CHECKPATH_H -#define JFJOCH_CHECKPATH_H +#pragma once #include #include "JFJochException.h" @@ -22,5 +21,3 @@ inline void CheckPath(const std::string &s) { throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Path cannot contain /../"); } - -#endif //JFJOCH_CHECKPATH_H diff --git a/common/ColorScale.h b/common/ColorScale.h index 81a7d2e7..cb8c33e8 100644 --- a/common/ColorScale.h +++ b/common/ColorScale.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_COLORSCALE_H -#define JFJOCH_COLORSCALE_H +#pragma once #include #include @@ -93,5 +92,3 @@ public: ColorScale &Gap(rgb input); ColorScale &BadPixel(rgb input); }; - -#endif //JFJOCH_COLORSCALE_H diff --git a/common/CompressedImage.h b/common/CompressedImage.h index 28e011f8..79e2265e 100644 --- a/common/CompressedImage.h +++ b/common/CompressedImage.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_COMPRESSEDIMAGE_H -#define JFJOCH_COMPRESSEDIMAGE_H +#pragma once #include #include @@ -57,5 +56,3 @@ public: [[nodiscard]] const uint8_t *GetCompressed() const; [[nodiscard]] size_t GetCompressedSize() const; }; - -#endif //JFJOCH_COMPRESSEDIMAGE_H diff --git a/common/DarkMaskSettings.h b/common/DarkMaskSettings.h index 15a97e73..8ed92023 100644 --- a/common/DarkMaskSettings.h +++ b/common/DarkMaskSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_DARKMASKSETTINGS_H -#define JFJOCH_DARKMASKSETTINGS_H +#pragma once #include #include @@ -27,6 +26,3 @@ public: [[nodiscard]] int64_t GetMaxFramesWithCounts() const; [[nodiscard]] int64_t GetMaxCounts() const; }; - - -#endif //JFJOCH_DARKMASKSETTINGS_H \ No newline at end of file diff --git a/common/DatasetSettings.h b/common/DatasetSettings.h index c06afe27..9ec5672e 100644 --- a/common/DatasetSettings.h +++ b/common/DatasetSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_DATASETSETTINGS_H -#define JUNGFRAUJOCH_DATASETSETTINGS_H +#pragma once #include #include @@ -164,5 +163,3 @@ public: bool IsDetectIceRings() const; const XrayFluorescenceSpectrum &GetFluorescenceSpectrum() const; }; - -#endif //JUNGFRAUJOCH_DATASETSETTINGS_H diff --git a/common/DetectorGeometry.h b/common/DetectorGeometry.h index d62245bf..bfd59dd3 100644 --- a/common/DetectorGeometry.h +++ b/common/DetectorGeometry.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_DETECTORGEOMETRY_H -#define JUNGFRAUJOCH_DETECTORGEOMETRY_H +#pragma once #include #include @@ -22,5 +21,3 @@ public: [[nodiscard]] virtual Coord GetFastDirection(int64_t module_number) const = 0; [[nodiscard]] virtual Coord GetSlowDirection(int64_t module_number) const = 0; }; - -#endif //JUNGFRAUJOCH_DETECTORGEOMETRY_H diff --git a/common/DetectorGeometryFixed.h b/common/DetectorGeometryFixed.h index b932fa91..b7c703bd 100644 --- a/common/DetectorGeometryFixed.h +++ b/common/DetectorGeometryFixed.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_DETECTORGEOMETRYFIXED_H -#define JFJOCH_DETECTORGEOMETRYFIXED_H +#pragma once #include "DetectorGeometry.h" @@ -23,6 +22,3 @@ public: Coord GetSlowDirection(int64_t module_number) const override; void VerticalFlip(); }; - - -#endif //JFJOCH_DETECTORGEOMETRYFIXED_H diff --git a/common/DetectorGeometryModular.h b/common/DetectorGeometryModular.h index b3762f43..c9a503a1 100644 --- a/common/DetectorGeometryModular.h +++ b/common/DetectorGeometryModular.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_DETECTORGEOMETRYMODULAR_H -#define JFJOCH_DETECTORGEOMETRYMODULAR_H +#pragma once #include "DetectorGeometry.h" @@ -32,5 +31,3 @@ public: void VerticalFlip(); }; - -#endif //JFJOCH_DETECTORGEOMETRYMODULAR_H diff --git a/common/DetectorModuleGeometry.h b/common/DetectorModuleGeometry.h index 99618591..dcd9c91a 100644 --- a/common/DetectorModuleGeometry.h +++ b/common/DetectorModuleGeometry.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_DETECTORMODULEGEOMETRY_H -#define JUNGFRAUJOCH_DETECTORMODULEGEOMETRY_H +#pragma once #include #include @@ -36,5 +35,3 @@ public: void VerticalFlip(size_t detector_height); }; - -#endif //JUNGFRAUJOCH_DETECTORMODULEGEOMETRY_H diff --git a/common/DetectorSettings.h b/common/DetectorSettings.h index ef3de5d0..dbd56f18 100644 --- a/common/DetectorSettings.h +++ b/common/DetectorSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_DETECTORSETTINGS_H -#define JFJOCH_DETECTORSETTINGS_H +#pragma once #include #include @@ -79,4 +78,4 @@ public: }; -#endif //JFJOCH_DETECTORSETTINGS_H + diff --git a/common/DetectorSetup.h b/common/DetectorSetup.h index a0cd9a60..0b082fdc 100644 --- a/common/DetectorSetup.h +++ b/common/DetectorSetup.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_DETECTORSETUP_H -#define JUNGFRAUJOCH_DETECTORSETUP_H +#pragma once #include #include @@ -149,5 +148,3 @@ DetectorSetup DetEIGER(const DetectorGeometryModular &geom, DetectorSetup DetDECTRIS(int64_t width, int64_t height, const std::string &description, const std::string &addr); - -#endif //JUNGFRAUJOCH_DETECTORSETUP_H diff --git a/common/DiffractionExperiment.h b/common/DiffractionExperiment.h index 11e82816..131c3bff 100644 --- a/common/DiffractionExperiment.h +++ b/common/DiffractionExperiment.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef DIFFRACTIONEXPERIMENT_H -#define DIFFRACTIONEXPERIMENT_H +#pragma once #include #include @@ -417,5 +416,3 @@ public: std::optional GetRotationWedgeForScaling() const; bool GetRefineRotationWedgeInScaling() const; }; - -#endif //DIFFRACTIONEXPERIMENT_H diff --git a/common/DiffractionGeometry.h b/common/DiffractionGeometry.h index c56eaf3b..171977b2 100644 --- a/common/DiffractionGeometry.h +++ b/common/DiffractionGeometry.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_DIFFRACTIONGEOMETRY_H -#define JUNGFRAUJOCH_DIFFRACTIONGEOMETRY_H +#pragma once #include "JFJochException.h" #include "Coord.h" @@ -65,8 +64,4 @@ public: [[nodiscard]] float AngleFromEwaldSphere_deg(const Coord &p0) const; [[nodiscard]] const RotMatrix& GetPoniRotMatrix() const; - - }; - -#endif //JUNGFRAUJOCH_DIFFRACTIONGEOMETRY_H diff --git a/common/DiffractionSpot.h b/common/DiffractionSpot.h index 7600a280..2614b4c9 100644 --- a/common/DiffractionSpot.h +++ b/common/DiffractionSpot.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_DIFFRACTIONSPOT_H -#define JUNGFRAUJOCH_DIFFRACTIONSPOT_H +#pragma once #include "Coord.h" #include "DiffractionExperiment.h" @@ -29,5 +28,3 @@ public: std::optional Export(const DiffractionGeometry &geometry, int64_t image_num = 0) const; void AddPixel(uint32_t col, uint32_t line, int64_t photons); }; - -#endif //JUNGFRAUJOCH_DIFFRACTIONSPOT_H diff --git a/common/FileWriterSettings.h b/common/FileWriterSettings.h index e9011e68..45f7841e 100644 --- a/common/FileWriterSettings.h +++ b/common/FileWriterSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_FILEWRITERSETTINGS_H -#define JFJOCH_FILEWRITERSETTINGS_H +#pragma once #include "JFJochMessages.h" @@ -16,6 +15,3 @@ public: FileWriterFormat GetFileFormat() const; bool IsOverwriteExistingFiles() const; }; - - -#endif //JFJOCH_FILEWRITERSETTINGS_H diff --git a/common/GitInfo.h b/common/GitInfo.h index a597831a..b61e79ec 100644 --- a/common/GitInfo.h +++ b/common/GitInfo.h @@ -1,13 +1,10 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_GITINFO_H -#define JUNGFRAUJOCH_GITINFO_H +#pragma once #include std::string jfjoch_git_sha1(); std::string jfjoch_git_date(); std::string jfjoch_version(); - -#endif //JUNGFRAUJOCH_GITINFO_H diff --git a/common/GoniometerAxis.h b/common/GoniometerAxis.h index ecda91df..6c3fd097 100644 --- a/common/GoniometerAxis.h +++ b/common/GoniometerAxis.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_GONIOMETERAXIS_H -#define JFJOCH_GONIOMETERAXIS_H +#pragma once #include #include @@ -47,6 +46,3 @@ public: [[nodiscard]] RotMatrix GetTransformationAngle(float angle_deg) const; }; - - -#endif //JFJOCH_GONIOMETERAXIS_H diff --git a/common/GridScanSettings.h b/common/GridScanSettings.h index aa5c5046..4ef8a5bf 100644 --- a/common/GridScanSettings.h +++ b/common/GridScanSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_GRIDSCANSETTINGS_H -#define JFJOCH_GRIDSCANSETTINGS_H +#pragma once #include #include @@ -61,6 +60,3 @@ public: [[nodiscard]] std::vector Rearrange(const std::vector &input, float fill_value = -1) const; [[nodiscard]] std::vector Rearrange(const std::vector &input, uint64_t fill_value) const; }; - - -#endif //JFJOCH_GRIDSCANSETTINGS_H diff --git a/common/Histogram.h b/common/Histogram.h index c4643569..1e3b44d9 100644 --- a/common/Histogram.h +++ b/common/Histogram.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_HISTOGRAM_H -#define JUNGFRAUJOCH_HISTOGRAM_H +#pragma once #include #include @@ -112,5 +111,3 @@ public: return count.size() - 1; } }; - -#endif //JUNGFRAUJOCH_HISTOGRAM_H diff --git a/common/ImageBuffer.h b/common/ImageBuffer.h index 316d0ff0..9c0be379 100644 --- a/common/ImageBuffer.h +++ b/common/ImageBuffer.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_IMAGEBUFFER_H -#define JUNGFRAUJOCH_IMAGEBUFFER_H +#pragma once #include "ThreadSafeFIFO.h" #include "DiffractionExperiment.h" @@ -93,5 +92,3 @@ public: ImageBufferStatus GetStatus() const; }; - -#endif //JUNGFRAUJOCH_IMAGEBUFFER_H diff --git a/common/ImageFormatSettings.h b/common/ImageFormatSettings.h index 6fbb1523..13aca090 100644 --- a/common/ImageFormatSettings.h +++ b/common/ImageFormatSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_IMAGEFORMATSETTINGS_H -#define JFJOCH_IMAGEFORMATSETTINGS_H +#pragma once #include #include @@ -50,5 +49,3 @@ public: void Conv(); }; - -#endif //JFJOCH_IMAGEFORMATSETTINGS_H diff --git a/common/IndexingSettings.h b/common/IndexingSettings.h index 7f603f93..577e2ed3 100644 --- a/common/IndexingSettings.h +++ b/common/IndexingSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_INDEXINGSETTINGS_H -#define JFJOCH_INDEXINGSETTINGS_H +#pragma once #include @@ -72,6 +71,3 @@ public: [[nodiscard]] float GetRotationIndexingAngularStride_deg() const; [[nodiscard]] bool GetBlockingBehavior() const; }; - - -#endif //JFJOCH_INDEXINGSETTINGS_H diff --git a/common/InstrumentMetadata.h b/common/InstrumentMetadata.h index f23d331d..fada5606 100644 --- a/common/InstrumentMetadata.h +++ b/common/InstrumentMetadata.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_INSTRUMENTMETADATA_H -#define JFJOCH_INSTRUMENTMETADATA_H +#pragma once #include #include @@ -29,5 +28,3 @@ public: [[nodiscard]] bool IsPulsedSource() const; [[nodiscard]] bool IsElectronSource() const; }; - -#endif //JFJOCH_INSTRUMENTMETADATA_H diff --git a/common/JFJochException.h b/common/JFJochException.h index 07afe5a9..d2ecdb0f 100644 --- a/common/JFJochException.h +++ b/common/JFJochException.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef SLSEXCEPTION_H -#define SLSEXCEPTION_H +#pragma once #include #include @@ -163,4 +162,3 @@ public: msg += " (" + std::string(strerror(errno)) + ")"; } }; -#endif //SLSEXCEPTION_H diff --git a/common/JFJochMessages.h b/common/JFJochMessages.h index 585e85dc..0fcd2868 100644 --- a/common/JFJochMessages.h +++ b/common/JFJochMessages.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHMESSAGES_H -#define JUNGFRAUJOCH_JFJOCHMESSAGES_H +#pragma once #include #include @@ -359,5 +358,3 @@ struct MetadataMessage { uint64_t run_number; std::vector images; }; - -#endif //JUNGFRAUJOCH_JFJOCHMESSAGES_H diff --git a/common/Logger.h b/common/Logger.h index 548505d9..61aeae50 100644 --- a/common/Logger.h +++ b/common/Logger.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_LOGGER_H -#define JUNGFRAUJOCH_LOGGER_H +#pragma once #include #include @@ -53,5 +52,3 @@ public: Logger& Verbose(bool input); }; - -#endif //JUNGFRAUJOCH_LOGGER_H diff --git a/common/ModuleSummation.h b/common/ModuleSummation.h index 7947d212..31d63b17 100644 --- a/common/ModuleSummation.h +++ b/common/ModuleSummation.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef IMAGESUMMATION_H -#define IMAGESUMMATION_H +#pragma once #include #include @@ -29,5 +28,3 @@ public: [[nodiscard]] DeviceOutput& GetOutput(); [[nodiscard]] bool empty() const; }; - -#endif //IMAGESUMMATION_H diff --git a/common/MovingAverage.h b/common/MovingAverage.h index 89691601..3a925e7d 100644 --- a/common/MovingAverage.h +++ b/common/MovingAverage.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_MOVINGAVERAGE_H -#define JFJOCH_MOVINGAVERAGE_H +#pragma once #include #include @@ -20,4 +19,4 @@ public: }; -#endif //JFJOCH_MOVINGAVERAGE_H + diff --git a/common/MultiLinePlot.h b/common/MultiLinePlot.h index d0ad9413..3fbefff9 100644 --- a/common/MultiLinePlot.h +++ b/common/MultiLinePlot.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_MULTILINEPLOT_H -#define JFJOCH_MULTILINEPLOT_H +#pragma once #include #include @@ -38,4 +37,4 @@ public: }; -#endif //JFJOCH_MULTILINEPLOT_H + diff --git a/common/NUMAHWPolicy.h b/common/NUMAHWPolicy.h index 4c8e503a..6c1375dd 100644 --- a/common/NUMAHWPolicy.h +++ b/common/NUMAHWPolicy.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_NUMAHWPOLICY_H -#define JUNGFRAUJOCH_NUMAHWPOLICY_H +#pragma once #include #include @@ -32,5 +31,3 @@ public: static void SelectGPU(int32_t gpu); static void SelectGPUAndItsNUMA(int32_t gpu); }; - -#endif //JUNGFRAUJOCH_NUMAHWPOLICY_H diff --git a/common/NetworkAddressConvert.h b/common/NetworkAddressConvert.h index a252b9bb..7dda1921 100644 --- a/common/NetworkAddressConvert.h +++ b/common/NetworkAddressConvert.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_NETWORKADDRESSCONVERT_H -#define JUNGFRAUJOCH_NETWORKADDRESSCONVERT_H +#pragma once #include #include @@ -11,5 +10,3 @@ std::string IPv4AddressToStr(uint32_t addr); std::string MacAddressToStr(uint64_t addr); uint32_t IPv4AddressFromStr(const std::string& addr); uint64_t MacAddressFromStr(const std::string& addr); - -#endif //JUNGFRAUJOCH_NETWORKADDRESSCONVERT_H diff --git a/common/PixelMask.h b/common/PixelMask.h index f4210861..5f9ae7c7 100644 --- a/common/PixelMask.h +++ b/common/PixelMask.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_PIXELMASK_H -#define JUNGFRAUJOCH_PIXELMASK_H +#pragma once #include "DetectorSetup.h" #include "DiffractionExperiment.h" @@ -54,6 +53,3 @@ public: [[nodiscard]] std::vector GetUserMask() const; [[nodiscard]] PixelMaskStatistics GetStatistics() const; }; - - -#endif //JUNGFRAUJOCH_PIXELMASK_H diff --git a/common/Plot.h b/common/Plot.h index 840e7fc1..7b12c8de 100644 --- a/common/Plot.h +++ b/common/Plot.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_PLOT_H -#define JUNGFRAUJOCH_PLOT_H +#pragma once #include #include @@ -30,5 +29,3 @@ struct PlotRequest { PlotAzintUnit azint_unit = PlotAzintUnit::Q_recipA; std::optional fill_value; }; - -#endif //JUNGFRAUJOCH_PLOT_H diff --git a/common/ROIAzimuthal.h b/common/ROIAzimuthal.h index 5e648c40..3934df9a 100644 --- a/common/ROIAzimuthal.h +++ b/common/ROIAzimuthal.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_ROIAZIMUTHAL_H -#define JFJOCH_ROIAZIMUTHAL_H +#pragma once #include "ROIElement.h" @@ -21,4 +20,4 @@ public: }; -#endif //JFJOCH_ROIAZIMUTHAL_H + diff --git a/common/ROIBox.h b/common/ROIBox.h index 91aa2f53..35bc2952 100644 --- a/common/ROIBox.h +++ b/common/ROIBox.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ROIBOX_H -#define JUNGFRAUJOCH_ROIBOX_H +#pragma once #include "ROIElement.h" @@ -25,5 +24,3 @@ public: bool CheckROI(int64_t x, int64_t y, float resolution) const override; ROIConfig ExportMetadata() const override; }; - -#endif //JUNGFRAUJOCH_ROIBOX_H diff --git a/common/ROICircle.h b/common/ROICircle.h index 316b6550..63b192ee 100644 --- a/common/ROICircle.h +++ b/common/ROICircle.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ROICIRCLE_H -#define JUNGFRAUJOCH_ROICIRCLE_H +#pragma once #include "ROIElement.h" @@ -21,5 +20,3 @@ public: bool CheckROI(int64_t x, int64_t y, float resolution) const override; ROIConfig ExportMetadata() const override; }; - -#endif //JUNGFRAUJOCH_ROICIRCLE_H diff --git a/common/ROIDefinition.h b/common/ROIDefinition.h index 0c425aa3..0c197de0 100644 --- a/common/ROIDefinition.h +++ b/common/ROIDefinition.h @@ -1,7 +1,6 @@ // Copyright (2019-2024) Paul Scherrer Institute -#ifndef ROIDEFINITION_H -#define ROIDEFINITION_H +#pragma once #include #include "ROIBox.h" @@ -13,5 +12,3 @@ struct ROIDefinition { std::vector circles; std::vector azimuthal; }; - -#endif //ROIDEFINITION_H diff --git a/common/ROIElement.h b/common/ROIElement.h index 13336f9f..432f72a6 100644 --- a/common/ROIElement.h +++ b/common/ROIElement.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ROIELEMENT_H -#define JUNGFRAUJOCH_ROIELEMENT_H +#pragma once #include #include @@ -22,6 +21,3 @@ public: void MarkROI(std::vector &v, uint16_t value_to_mark, int64_t xpixel, int64_t ypixel, const std::vector &resolution_map) const; }; - - -#endif //JUNGFRAUJOCH_ROIELEMENT_H diff --git a/common/ROIMap.h b/common/ROIMap.h index c7dc9231..40be957d 100644 --- a/common/ROIMap.h +++ b/common/ROIMap.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ROIMAP_H -#define JUNGFRAUJOCH_ROIMAP_H +#pragma once #include #include @@ -26,5 +25,3 @@ public: [[nodiscard]] size_t size() const; [[nodiscard]] std::vector ExportMetadata() const; }; - -#endif //JUNGFRAUJOCH_ROIMAP_H diff --git a/common/RawToConvertedGeometry.h b/common/RawToConvertedGeometry.h index 2ae2de14..a3a179f1 100644 --- a/common/RawToConvertedGeometry.h +++ b/common/RawToConvertedGeometry.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_RAWTOCONVERTEDGEOMETRY_H -#define JUNGFRAUJOCH_RAWTOCONVERTEDGEOMETRY_H +#pragma once #include #include "RawToConvertedGeometryCore.h" @@ -149,5 +148,3 @@ inline void RawToEigerInput32(uint32_t *dest, const uint32_t *source) { } } } - -#endif \ No newline at end of file diff --git a/common/RawToConvertedGeometryCore.h b/common/RawToConvertedGeometryCore.h index 309119d2..c7692f71 100644 --- a/common/RawToConvertedGeometryCore.h +++ b/common/RawToConvertedGeometryCore.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_RAWTOCONVERTEDGEOMETRYCORE_H -#define JUNGFRAUJOCH_RAWTOCONVERTEDGEOMETRYCORE_H +#pragma once #include #include @@ -162,6 +161,3 @@ void Bin2x2_or(T *destination, const T *source, size_t width, size_t height) { } } } - - -#endif //JUNGFRAUJOCH_RAWTOCONVERTEDGEOMETRYCORE_H diff --git a/common/Reflection.h b/common/Reflection.h index b4573c34..08959c62 100644 --- a/common/Reflection.h +++ b/common/Reflection.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_REFLECTION_H -#define JFJOCH_REFLECTION_H +#pragma once #include #include @@ -44,4 +43,4 @@ struct MergedReflection { bool rfree_flag = false; }; -#endif //JFJOCH_REFLECTION_H + diff --git a/common/ResolutionShells.h b/common/ResolutionShells.h index 26969935..19358fa5 100644 --- a/common/ResolutionShells.h +++ b/common/ResolutionShells.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_RESOLUTIONSHELLS_H -#define JFJOCH_RESOLUTIONSHELLS_H +#pragma once #include #include @@ -20,4 +19,3 @@ public: }; -#endif //JFJOCH_RESOLUTIONSHELLS_H \ No newline at end of file diff --git a/common/ScanResult.h b/common/ScanResult.h index 3cef3f60..0d9e8de6 100644 --- a/common/ScanResult.h +++ b/common/ScanResult.h @@ -2,8 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_SCANRESULT_H -#define JFJOCH_SCANRESULT_H +#pragma once #include #include @@ -51,4 +50,4 @@ struct ScanResult { std::optional rotation_lattice; }; -#endif //JFJOCH_SCANRESULT_H + diff --git a/common/ScanResultGenerator.h b/common/ScanResultGenerator.h index c7e59c99..2f96a526 100644 --- a/common/ScanResultGenerator.h +++ b/common/ScanResultGenerator.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_SCANRESULTGENERATOR_H -#define JFJOCH_SCANRESULTGENERATOR_H +#pragma once #include #include @@ -30,4 +29,4 @@ public: }; -#endif //JFJOCH_SCANRESULTGENERATOR_H + diff --git a/common/SpotToSave.h b/common/SpotToSave.h index 9efb978d..114a9995 100644 --- a/common/SpotToSave.h +++ b/common/SpotToSave.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_SPOTTOSAVE_H -#define JUNGFRAUJOCH_SPOTTOSAVE_H +#pragma once #include "DiffractionGeometry.h" @@ -22,5 +21,3 @@ struct SpotToSave { Coord ReciprocalCoord(const DiffractionGeometry &experiment) const; }; - -#endif //JUNGFRAUJOCH_SPOTTOSAVE_H diff --git a/common/StatusVector.h b/common/StatusVector.h index c8c7e4b7..8b2dd6e3 100644 --- a/common/StatusVector.h +++ b/common/StatusVector.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_STATUSVECTOR_H -#define JUNGFRAUJOCH_STATUSVECTOR_H +#pragma once #include #include @@ -40,5 +39,3 @@ public: MultiLinePlot GetMaxPlot(int64_t bin_size, float x_start, float x_incr, const std::optional &fill_value = {}) const; }; - -#endif //JUNGFRAUJOCH_STATUSVECTOR_H diff --git a/common/TopPixels.h b/common/TopPixels.h index c65fabb0..8db0ee66 100644 --- a/common/TopPixels.h +++ b/common/TopPixels.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_TOPPIXELS_H -#define JFJOCH_TOPPIXELS_H +#pragma once #include #include @@ -83,4 +82,3 @@ private: } }; -#endif //JFJOCH_TOPPIXELS_H \ No newline at end of file diff --git a/common/XrayFluorescenceSpectrum.h b/common/XrayFluorescenceSpectrum.h index b73e1a8f..06073cf1 100644 --- a/common/XrayFluorescenceSpectrum.h +++ b/common/XrayFluorescenceSpectrum.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_XRAYFLUORESCENCESPECTRUM_H -#define JFJOCH_XRAYFLUORESCENCESPECTRUM_H +#pragma once #include @@ -18,4 +17,3 @@ public: }; -#endif //JFJOCH_XRAYFLUORESCENCESPECTRUM_H \ No newline at end of file diff --git a/common/ZMQWrappers.h b/common/ZMQWrappers.h index 97730ad8..0aaaf6f0 100644 --- a/common/ZMQWrappers.h +++ b/common/ZMQWrappers.h @@ -2,8 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ZMQWRAPPERS_H -#define JUNGFRAUJOCH_ZMQWRAPPERS_H +#pragma once #include #include @@ -80,5 +79,3 @@ public: std::string GetEndpointName(); }; - -#endif //JUNGFRAUJOCH_ZMQWRAPPERS_H diff --git a/common/ZeroCopyReturnValue.h b/common/ZeroCopyReturnValue.h index fe1c32b9..2d46fb95 100644 --- a/common/ZeroCopyReturnValue.h +++ b/common/ZeroCopyReturnValue.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ZEROCOPYRETURNVALUE_H -#define JUNGFRAUJOCH_ZEROCOPYRETURNVALUE_H +#pragma once #include "ImageBuffer.h" #include "ThreadSafeFIFO.h" @@ -32,5 +31,3 @@ public: void ReadyToSend(); void release(); }; - -#endif //JUNGFRAUJOCH_ZEROCOPYRETURNVALUE_H diff --git a/common/print_license.h b/common/print_license.h index aad15597..e5ca40cf 100644 --- a/common/print_license.h +++ b/common/print_license.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_PRINT_LICENSE_H -#define JFJOCH_PRINT_LICENSE_H +#pragma once #include @@ -16,4 +15,4 @@ inline void print_license(const std::string &component_name) { std::cout << "" << std::endl; } -#endif //JFJOCH_PRINT_LICENSE_H + diff --git a/compression/CompressionAlgorithmEnum.h b/compression/CompressionAlgorithmEnum.h index 769e3dc4..783ddb14 100644 --- a/compression/CompressionAlgorithmEnum.h +++ b/compression/CompressionAlgorithmEnum.h @@ -1,9 +1,6 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_COMPRESSIONALGORITHMENUM_H -#define JUNGFRAUJOCH_COMPRESSIONALGORITHMENUM_H +#pragma once enum class CompressionAlgorithm {BSHUF_LZ4, BSHUF_ZSTD, BSHUF_ZSTD_RLE, NO_COMPRESSION}; - -#endif //JUNGFRAUJOCH_COMPRESSIONALGORITHMENUM_H diff --git a/compression/JFJochCompressor.h b/compression/JFJochCompressor.h index 826b804b..0da07ce6 100644 --- a/compression/JFJochCompressor.h +++ b/compression/JFJochCompressor.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHCOMPRESSOR_H -#define JUNGFRAUJOCH_JFJOCHCOMPRESSOR_H +#pragma once #include @@ -45,7 +44,3 @@ template std::vector bitshuffle(const std::vector &input, size_t bshuf_bitshuffle(input.data(), ret.data(), input.size(), sizeof(T), block_size); return ret; } - - - -#endif //JUNGFRAUJOCH_JFJOCHCOMPRESSOR_H diff --git a/compression/JFJochDecompress.h b/compression/JFJochDecompress.h index 859e1cdd..a2479d04 100644 --- a/compression/JFJochDecompress.h +++ b/compression/JFJochDecompress.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHDECOMPRESS_H -#define JUNGFRAUJOCH_JFJOCHDECOMPRESS_H +#pragma once #include #include @@ -168,5 +167,3 @@ void JFJochDecompress(std::vector &output, CompressionAlgorithm algorithm, c size_t nelements, bool use_hperf = true) { JFJochDecompress(output, algorithm, source_v.data(), source_v.size() * sizeof(Ts), nelements, use_hperf); } - -#endif //JUNGFRAUJOCH_JFJOCHDECOMPRESS_H diff --git a/compression/JFJochZstdCompressor.h b/compression/JFJochZstdCompressor.h index 2cfd615c..568d7cdc 100644 --- a/compression/JFJochZstdCompressor.h +++ b/compression/JFJochZstdCompressor.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHZSTDCOMPRESSOR_H -#define JUNGFRAUJOCH_JFJOCHZSTDCOMPRESSOR_H +#pragma once #include #include @@ -17,6 +16,3 @@ public: static size_t RLEBlock(uint8_t *dst, uint8_t src, uint32_t src_size, bool last); size_t Compress(uint8_t *dst, const uint64_t *src, size_t src_size, size_t frame_sizes); }; - - -#endif //JUNGFRAUJOCH_JFJOCHZSTDCOMPRESSOR_H diff --git a/compression/MaxCompressedSize.h b/compression/MaxCompressedSize.h index 680ca951..29a6a1e5 100644 --- a/compression/MaxCompressedSize.h +++ b/compression/MaxCompressedSize.h @@ -1,12 +1,9 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_MAXCOMPRESSEDSIZE_H -#define JUNGFRAUJOCH_MAXCOMPRESSEDSIZE_H +#pragma once #include #include "CompressionAlgorithmEnum.h" int64_t MaxCompressedSize(CompressionAlgorithm algorithm, int64_t pixels_number, uint16_t pixel_depth); - -#endif //JUNGFRAUJOCH_MAXCOMPRESSEDSIZE_H diff --git a/detector_control/DectrisDetectorWrapper.h b/detector_control/DectrisDetectorWrapper.h index ef883e08..6217429b 100644 --- a/detector_control/DectrisDetectorWrapper.h +++ b/detector_control/DectrisDetectorWrapper.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_DECTRISDETECTORWRAPPER_H -#define JFJOCH_DECTRISDETECTORWRAPPER_H +#pragma once #include "DetectorWrapper.h" #include "DectrisSimplonClient.h" @@ -28,4 +27,4 @@ public: }; -#endif //JFJOCH_DECTRISDETECTORWRAPPER_H + diff --git a/detector_control/DectrisSimplonClient.h b/detector_control/DectrisSimplonClient.h index 4cd35887..68340e90 100644 --- a/detector_control/DectrisSimplonClient.h +++ b/detector_control/DectrisSimplonClient.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_DECTRISSIMPLONCLIENT_H -#define JFJOCH_DECTRISSIMPLONCLIENT_H +#pragma once #include #include @@ -62,4 +61,4 @@ public: }; -#endif //JFJOCH_DECTRISSIMPLONCLIENT_H + diff --git a/detector_control/DetectorWrapper.h b/detector_control/DetectorWrapper.h index dd763fde..d8fb1816 100644 --- a/detector_control/DetectorWrapper.h +++ b/detector_control/DetectorWrapper.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_DETECTORWRAPPER_H -#define JFJOCH_DETECTORWRAPPER_H +#pragma once #include #include @@ -38,4 +37,4 @@ public: [[nodiscard]] virtual DetectorStatus GetStatus() const = 0; }; -#endif //JFJOCH_DETECTORWRAPPER_H + diff --git a/detector_control/SLSDetectorWrapper.h b/detector_control/SLSDetectorWrapper.h index 8615340e..03c44912 100644 --- a/detector_control/SLSDetectorWrapper.h +++ b/detector_control/SLSDetectorWrapper.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_DETECTORWRAPPER_H -#define JUNGFRAUJOCH_DETECTORWRAPPER_H +#pragma once #include #include "../common/DiffractionExperiment.h" @@ -35,6 +34,3 @@ public: void LoadPixelMask(PixelMask &mask) override; DetectorStatus GetStatus() const override; }; - - -#endif //JUNGFRAUJOCH_DETECTORWRAPPER_H diff --git a/fpga/hls_simulation/HLSDevice.h b/fpga/hls_simulation/HLSDevice.h index b5ecc906..1e73b28b 100644 --- a/fpga/hls_simulation/HLSDevice.h +++ b/fpga/hls_simulation/HLSDevice.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_HLSDEVICE_H -#define JFJOCH_HLSDEVICE_H +#pragma once #include #include @@ -72,4 +71,4 @@ public: }; -#endif //JFJOCH_HLSDEVICE_H + diff --git a/fpga/hls_simulation/datamover_model.h b/fpga/hls_simulation/datamover_model.h index ca1ae88a..b6389b5e 100644 --- a/fpga/hls_simulation/datamover_model.h +++ b/fpga/hls_simulation/datamover_model.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_DATAMOVER_MODEL_H -#define JUNGFRAUJOCH_DATAMOVER_MODEL_H +#pragma once #include #include "../hls/hls_jfjoch.h" @@ -94,5 +93,3 @@ public: hls::stream >& GetDataStream() { return data; } ~Datamover() { Stop(); } }; - -#endif //JUNGFRAUJOCH_DATAMOVER_MODEL_H diff --git a/fpga/hls_simulation/hls_cores.h b/fpga/hls_simulation/hls_cores.h index bab2b3a9..a0451790 100644 --- a/fpga/hls_simulation/hls_cores.h +++ b/fpga/hls_simulation/hls_cores.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_HLS_CORES_H -#define JFJOCH_HLS_CORES_H +#pragma once #include "../hls/hls_jfjoch.h" @@ -254,5 +253,3 @@ void pixel_mask(STREAM_768 &data_in, void pixel_calc(STREAM_768 &data_in, STREAM_768 &data_out, hls::stream> &calc_out); - -#endif //JFJOCH_HLS_CORES_H diff --git a/fpga/host_library/JungfraujochDevice.h b/fpga/host_library/JungfraujochDevice.h index 1f2fff33..c7f1bb5c 100644 --- a/fpga/host_library/JungfraujochDevice.h +++ b/fpga/host_library/JungfraujochDevice.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JUNGFRAUJOCHDEVICE_H -#define JUNGFRAUJOCH_JUNGFRAUJOCHDEVICE_H +#pragma once #include #include "../pcie_driver/jfjoch_fpga.h" @@ -105,5 +104,3 @@ public: uint8_t ReadClockConfig(uint8_t addr); void WriteClockConfig(uint8_t addr, uint8_t val); }; - -#endif //JUNGFRAUJOCH_JUNGFRAUJOCHDEVICE_H diff --git a/frame_serialize/CBORStream2Deserializer.h b/frame_serialize/CBORStream2Deserializer.h index 14671f3f..8cd5536b 100644 --- a/frame_serialize/CBORStream2Deserializer.h +++ b/frame_serialize/CBORStream2Deserializer.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_CBORSTREAM2DESERIALIZER_H -#define JUNGFRAUJOCH_CBORSTREAM2DESERIALIZER_H +#pragma once #include #include @@ -43,5 +42,3 @@ struct CBORStream2DeserializerOutput { std::shared_ptr CBORStream2Deserialize(const uint8_t *msg, size_t msg_size); std::shared_ptr CBORStream2Deserialize(const std::vector& msg); std::shared_ptr CBORStream2Deserialize(const std::string& msg); - -#endif //JUNGFRAUJOCH_CBORSTREAM2DESERIALIZER_H diff --git a/frame_serialize/CBORStream2Serializer.h b/frame_serialize/CBORStream2Serializer.h index 350c56b9..dca67fe5 100644 --- a/frame_serialize/CBORStream2Serializer.h +++ b/frame_serialize/CBORStream2Serializer.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_CBORSTREAM2SERIALIZER_H -#define JUNGFRAUJOCH_CBORSTREAM2SERIALIZER_H +#pragma once #include #include @@ -29,6 +28,3 @@ public: [[nodiscard]] size_t GetImageAppendOffset() const; void AppendImage(size_t image_size); }; - - -#endif //JUNGFRAUJOCH_CBORSTREAM2SERIALIZER_H diff --git a/frame_serialize/CborErr.h b/frame_serialize/CborErr.h index 6a92e4f3..176cf410 100644 --- a/frame_serialize/CborErr.h +++ b/frame_serialize/CborErr.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_CBORERR_H -#define JUNGFRAUJOCH_CBORERR_H +#pragma once #include "tinycbor/cbor.h" #include "../common/JFJochException.h" @@ -11,5 +10,3 @@ inline void cborErr(CborError err) { if (err != CborNoError) throw JFJochException(JFJochExceptionCategory::CBORError, cbor_error_string(err)); } - -#endif //JUNGFRAUJOCH_CBORERR_H diff --git a/frame_serialize/CborUtil.h b/frame_serialize/CborUtil.h index 2f2f3ea6..c9a63afb 100644 --- a/frame_serialize/CborUtil.h +++ b/frame_serialize/CborUtil.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_CBORUTIL_H -#define JUNGFRAUJOCH_CBORUTIL_H +#pragma once #include "tinycbor/cbor.h" @@ -25,5 +24,3 @@ constexpr const CborTag TagSignedInt32BitLE = 0b01001110; constexpr const CborTag TagUnsignedInt64BitLE = 0b01000111; constexpr const CborTag TagSignedInt64BitLE = 0b01001111; - -#endif //JUNGFRAUJOCH_CBORUTIL_H diff --git a/image_analysis/MXAnalysisAfterFPGA.h b/image_analysis/MXAnalysisAfterFPGA.h index 4ac36ea6..ccddf87a 100644 --- a/image_analysis/MXAnalysisAfterFPGA.h +++ b/image_analysis/MXAnalysisAfterFPGA.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_MXANALYZER_H -#define JUNGFRAUJOCH_MXANALYZER_H +#pragma once #include "../common/DiffractionExperiment.h" #include "bragg_prediction/BraggPrediction.h" @@ -43,6 +42,3 @@ public: void Process(DataMessage &message, const SpotFindingSettings& settings); }; - - -#endif //JUNGFRAUJOCH_MXANALYZER_H diff --git a/image_analysis/MXAnalysisWithoutFPGA.h b/image_analysis/MXAnalysisWithoutFPGA.h index 778e0953..e5864d41 100644 --- a/image_analysis/MXAnalysisWithoutFPGA.h +++ b/image_analysis/MXAnalysisWithoutFPGA.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_IMAGEANALYSISCPU_H -#define JFJOCH_IMAGEANALYSISCPU_H +#pragma once #include @@ -49,4 +48,4 @@ public: }; -#endif //JFJOCH_IMAGEANALYSISCPU_H + diff --git a/image_analysis/RotationParameters.h b/image_analysis/RotationParameters.h index 1eab2ead..7488a7e5 100644 --- a/image_analysis/RotationParameters.h +++ b/image_analysis/RotationParameters.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_ROTATIONPARAMETERS_H -#define JFJOCH_ROTATIONPARAMETERS_H +#pragma once #include "../common/MovingAverage.h" @@ -17,4 +16,3 @@ public: }; -#endif //JFJOCH_ROTATIONPARAMETERS_H \ No newline at end of file diff --git a/image_analysis/bragg_integration/CalcISigma.h b/image_analysis/bragg_integration/CalcISigma.h index dda2914e..21102ff8 100644 --- a/image_analysis/bragg_integration/CalcISigma.h +++ b/image_analysis/bragg_integration/CalcISigma.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_CALCISIGMA_H -#define JFJOCH_CALCISIGMA_H +#pragma once #include "../../common/JFJochMessages.h" #include "../../common/Reflection.h" @@ -13,4 +12,3 @@ void CalcWilsonBFactor(DataMessage &msg, bool replace_b = true); void CalcISigma(DataMessage &msg, const std::vector &reflections); void CalcWilsonBFactor(DataMessage &msg, const std::vector &reflections, bool replace_b = true); -#endif //JFJOCH_CALCISIGMA_H \ No newline at end of file diff --git a/image_analysis/bragg_integration/Regression.h b/image_analysis/bragg_integration/Regression.h index 67a0af21..892a078a 100644 --- a/image_analysis/bragg_integration/Regression.h +++ b/image_analysis/bragg_integration/Regression.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_REGRESSION_H -#define JUNGFRAUJOCH_REGRESSION_H +#pragma once #include #include @@ -76,5 +75,3 @@ RegressionResult regression(std::vector &x, std::vector &y, const .r_square = static_cast(r_square) }; }; - -#endif //JUNGFRAUJOCH_REGRESSION_H diff --git a/image_analysis/bragg_prediction/BraggPrediction.h b/image_analysis/bragg_prediction/BraggPrediction.h index 218fc00e..6aaf4fc5 100644 --- a/image_analysis/bragg_prediction/BraggPrediction.h +++ b/image_analysis/bragg_prediction/BraggPrediction.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_BRAGGPREDICTION_H -#define JFJOCH_BRAGGPREDICTION_H +#pragma once #include @@ -35,4 +34,4 @@ public: }; -#endif //JFJOCH_BRAGGPREDICTION_H + diff --git a/image_analysis/bragg_prediction/BraggPredictionFactory.h b/image_analysis/bragg_prediction/BraggPredictionFactory.h index 8c5954cc..22c2fb2d 100644 --- a/image_analysis/bragg_prediction/BraggPredictionFactory.h +++ b/image_analysis/bragg_prediction/BraggPredictionFactory.h @@ -1,12 +1,10 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_BRAGGPREDICTIONFACTORY_H -#define JFJOCH_BRAGGPREDICTIONFACTORY_H +#pragma once #include "BraggPrediction.h" std::unique_ptr CreateBraggPrediction(bool rotation_indexing = false, int max_reflections = 10000); -#endif //JFJOCH_BRAGGPREDICTIONFACTORY_H \ No newline at end of file diff --git a/image_analysis/bragg_prediction/BraggPredictionGPU.h b/image_analysis/bragg_prediction/BraggPredictionGPU.h index 0a88cfe3..2bf7a27b 100644 --- a/image_analysis/bragg_prediction/BraggPredictionGPU.h +++ b/image_analysis/bragg_prediction/BraggPredictionGPU.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_BRAGGPREDICTIONGPU_H -#define JFJOCH_BRAGGPREDICTIONGPU_H +#pragma once #include @@ -47,4 +46,3 @@ public: }; -#endif //JFJOCH_BRAGGPREDICTIONGPU_H \ No newline at end of file diff --git a/image_analysis/dark_mask_analysis/DarkMaskAnalysis.h b/image_analysis/dark_mask_analysis/DarkMaskAnalysis.h index 997d69b4..c9e8bb4e 100644 --- a/image_analysis/dark_mask_analysis/DarkMaskAnalysis.h +++ b/image_analysis/dark_mask_analysis/DarkMaskAnalysis.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_DARKMASKANALYSIS_H -#define JFJOCH_DARKMASKANALYSIS_H +#pragma once #include #include @@ -27,4 +26,3 @@ public: }; -#endif //JFJOCH_MASKDARKANALYSIS_H \ No newline at end of file diff --git a/image_analysis/geom_refinement/AssignSpotsToRings.h b/image_analysis/geom_refinement/AssignSpotsToRings.h index 835f9e59..f4abff2e 100644 --- a/image_analysis/geom_refinement/AssignSpotsToRings.h +++ b/image_analysis/geom_refinement/AssignSpotsToRings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_ASSIGNSPOTSTORINGS_H -#define JFJOCH_ASSIGNSPOTSTORINGS_H +#pragma once #include #include "../../common/UnitCell.h" @@ -37,4 +36,4 @@ std::vector GuessInitialGeometry(DiffractionGeometry &geom, const void GuessGeometry(DiffractionGeometry &geom, const std::vector &v, const UnitCell &calibrant); void OptimizeGeometry(DiffractionGeometry &geom, const std::vector &v, const UnitCell &calibrant); -#endif //JFJOCH_ASSIGNSPOTSTORINGS_H + diff --git a/image_analysis/geom_refinement/RingOptimizer.h b/image_analysis/geom_refinement/RingOptimizer.h index d870e2e5..59e646b1 100644 --- a/image_analysis/geom_refinement/RingOptimizer.h +++ b/image_analysis/geom_refinement/RingOptimizer.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_RINGOPTIMIZER_H -#define JFJOCH_RINGOPTIMIZER_H +#pragma once #include #include "../../common/DiffractionGeometry.h" @@ -21,4 +20,4 @@ public: }; -#endif //JFJOCH_RINGOPTIMIZER_H + diff --git a/image_analysis/geom_refinement/XtalOptimizer.h b/image_analysis/geom_refinement/XtalOptimizer.h index 1c0c67dd..c472e8ab 100644 --- a/image_analysis/geom_refinement/XtalOptimizer.h +++ b/image_analysis/geom_refinement/XtalOptimizer.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_XTALOPTIMIZER_H -#define JFJOCH_XTALOPTIMIZER_H +#pragma once #include @@ -60,4 +59,4 @@ CrystalLattice AngleAxisAndCellToLattice(const double rod[3], bool XtalOptimizer(XtalOptimizerData &data, const std::vector> &spots); bool XtalOptimizerRotationOnly(XtalOptimizerData &data, const std::vector &spots, float tolerance); -#endif //JFJOCH_XTALOPTIMIZER_H + diff --git a/image_analysis/indexing/AnalyzeIndexing.h b/image_analysis/indexing/AnalyzeIndexing.h index 0644bb6b..ae0213cc 100644 --- a/image_analysis/indexing/AnalyzeIndexing.h +++ b/image_analysis/indexing/AnalyzeIndexing.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_ANALYZEINDEXING_H -#define JFJOCH_ANALYZEINDEXING_H +#pragma once #include "../../common/CrystalLattice.h" #include "../../common/DiffractionExperiment.h" @@ -15,4 +14,3 @@ bool AnalyzeIndexing(DataMessage &message, const CrystalLattice &latt); -#endif //JFJOCH_ANALYZEINDEXING_H \ No newline at end of file diff --git a/image_analysis/indexing/CUDAMemHelpers.h b/image_analysis/indexing/CUDAMemHelpers.h index ae8c3369..8eb25348 100644 --- a/image_analysis/indexing/CUDAMemHelpers.h +++ b/image_analysis/indexing/CUDAMemHelpers.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_CUDAMEMHELPERS_H -#define JFJOCH_CUDAMEMHELPERS_H +#pragma once #include #include @@ -235,4 +234,4 @@ public: bool isRegistered() const { return registered_; } }; -#endif //JFJOCH_CUDAMEMHELPERS_H + diff --git a/image_analysis/indexing/FFBIDXIndexer.h b/image_analysis/indexing/FFBIDXIndexer.h index cd0308a4..93609ec5 100644 --- a/image_analysis/indexing/FFBIDXIndexer.h +++ b/image_analysis/indexing/FFBIDXIndexer.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_INDEXERWRAPPER_H -#define JUNGFRAUJOCH_INDEXERWRAPPER_H +#pragma once // This include should be only included in sections of the code, where it is certain that CUDA is present // so with JFJOCH_USE_CUDA preprocessor definition, given this file is included in the source only in this case @@ -40,5 +39,3 @@ public: std::vector RunInternal(const std::vector &coord, size_t nspots) override; }; - -#endif //JUNGFRAUJOCH_INDEXERWRAPPER_H diff --git a/image_analysis/indexing/FFTIndexer.h b/image_analysis/indexing/FFTIndexer.h index ad907080..47a0d8c1 100644 --- a/image_analysis/indexing/FFTIndexer.h +++ b/image_analysis/indexing/FFTIndexer.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_FFTINDEXER_H -#define JFJOCH_FFTINDEXER_H +#pragma once #include "Indexer.h" #include "../../common/UnitCell.h" @@ -46,4 +45,3 @@ public: std::vector RunInternal(const std::vector &coord, size_t nspots) override; }; -#endif //JFJOCH_FFTINDEXER_H \ No newline at end of file diff --git a/image_analysis/indexing/FFTIndexerCPU.h b/image_analysis/indexing/FFTIndexerCPU.h index 4f756748..a784155c 100644 --- a/image_analysis/indexing/FFTIndexerCPU.h +++ b/image_analysis/indexing/FFTIndexerCPU.h @@ -2,8 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_FFTINDEXERCPU_H -#define JFJOCH_FFTINDEXERCPU_H +#pragma once #include #include @@ -31,4 +30,4 @@ public: ~FFTIndexerCPU() override; }; -#endif //JFJOCH_FFTINDEXERCPU_H + diff --git a/image_analysis/indexing/FFTIndexerGPU.h b/image_analysis/indexing/FFTIndexerGPU.h index f6b8b18e..0a1bdbba 100644 --- a/image_analysis/indexing/FFTIndexerGPU.h +++ b/image_analysis/indexing/FFTIndexerGPU.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_FFTINDEXERGPU_H -#define JFJOCH_FFTINDEXERGPU_H +#pragma once // This include should be only included in sections of the code, where it is certain that CUDA is present // so with JFJOCH_USE_CUDA preprocessor definition, given this file is included in the source only in this case @@ -49,4 +48,4 @@ public: }; -#endif //JFJOCH_FFTINDEXERGPU_H + diff --git a/image_analysis/indexing/FFTResult.h b/image_analysis/indexing/FFTResult.h index 4cc2238f..323c9dbd 100644 --- a/image_analysis/indexing/FFTResult.h +++ b/image_analysis/indexing/FFTResult.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_FFTRESULT_H -#define JFJOCH_FFTRESULT_H +#pragma once #include @@ -12,4 +11,4 @@ struct FFTResult { float length; }; -#endif //JFJOCH_FFTRESULT_H + diff --git a/image_analysis/indexing/FitProfileRadius.h b/image_analysis/indexing/FitProfileRadius.h index 4794fa96..7348ab49 100644 --- a/image_analysis/indexing/FitProfileRadius.h +++ b/image_analysis/indexing/FitProfileRadius.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_FITPROFILERADIUS_H -#define JFJOCH_FITPROFILERADIUS_H +#pragma once #include #include @@ -12,4 +11,3 @@ std::optional FitProfileRadius_MAD(const std::vector& spots); std::optional FitProfileRadius(const std::vector& spots); -#endif //JFJOCH_FITPROFILERADIUS_H \ No newline at end of file diff --git a/image_analysis/indexing/Indexer.h b/image_analysis/indexing/Indexer.h index 1718136a..dc2dc783 100644 --- a/image_analysis/indexing/Indexer.h +++ b/image_analysis/indexing/Indexer.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_INDEXER_H -#define JFJOCH_INDEXER_H +#pragma once #include @@ -36,4 +35,4 @@ public: IndexerResult Run(const std::vector &coord); }; -#endif //JFJOCH_INDEXER_H + diff --git a/image_analysis/indexing/IndexerFactory.h b/image_analysis/indexing/IndexerFactory.h index ec6f44b2..206d1b05 100644 --- a/image_analysis/indexing/IndexerFactory.h +++ b/image_analysis/indexing/IndexerFactory.h @@ -1,12 +1,11 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_INDEXERFACTORY_H -#define JFJOCH_INDEXERFACTORY_H +#pragma once #include #include "Indexer.h" std::unique_ptr CreateIndexer(const DiffractionExperiment& experiment); -#endif //JFJOCH_INDEXERFACTORY_H + diff --git a/image_analysis/indexing/IndexerThreadPool.h b/image_analysis/indexing/IndexerThreadPool.h index bcd6fdc5..224e2943 100644 --- a/image_analysis/indexing/IndexerThreadPool.h +++ b/image_analysis/indexing/IndexerThreadPool.h @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_INDEXERTHREADPOOL_H -#define JFJOCH_INDEXERTHREADPOOL_H +#pragma once #include @@ -60,4 +59,4 @@ public: }; -#endif //JFJOCH_INDEXERTHREADPOOL_H + diff --git a/image_analysis/lattice_search/LatticeSearch.h b/image_analysis/lattice_search/LatticeSearch.h index b6866d48..422d1c50 100644 --- a/image_analysis/lattice_search/LatticeSearch.h +++ b/image_analysis/lattice_search/LatticeSearch.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_LATTICESEARCH_H -#define JFJOCH_LATTICESEARCH_H +#pragma once #include "../../common/CrystalLattice.h" #include "../../common/UnitCell.h" @@ -24,4 +23,3 @@ struct LatticeSearchResult { LatticeSearchResult LatticeSearch(const CrystalLattice& L, double dist_tolerance = 0.03, double angle_tolerance_deg = 3); -#endif //JFJOCH_LATTICESEARCH_H \ No newline at end of file diff --git a/image_analysis/spot_finding/DetModuleSpotFinder_cpu.h b/image_analysis/spot_finding/DetModuleSpotFinder_cpu.h index b3f40026..5506387c 100644 --- a/image_analysis/spot_finding/DetModuleSpotFinder_cpu.h +++ b/image_analysis/spot_finding/DetModuleSpotFinder_cpu.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_CPUSPOTFINDER_H -#define JUNGFRAUJOCH_CPUSPOTFINDER_H +#pragma once #include "../../common/DiffractionExperiment.h" #include "SpotFindingSettings.h" @@ -143,5 +142,3 @@ void FindSpots(DeviceOutput &output, FindSpots(output, j, i, N, LINES_TO_GO, settings, d_array, arr_mean, arr_stddev, arr_valid_count, arr_strong_pixel); } } - -#endif //JUNGFRAUJOCH_CPUSPOTFINDER_H diff --git a/image_analysis/spot_finding/ImageSpotFinder.h b/image_analysis/spot_finding/ImageSpotFinder.h index bf44245b..11691aee 100644 --- a/image_analysis/spot_finding/ImageSpotFinder.h +++ b/image_analysis/spot_finding/ImageSpotFinder.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_IMAGESPOTFINDER_H -#define JFJOCH_IMAGESPOTFINDER_H +#pragma once #include #include @@ -29,4 +28,4 @@ public: }; -#endif //JFJOCH_IMAGESPOTFINDER_H + diff --git a/image_analysis/spot_finding/ImageSpotFinderCPU.h b/image_analysis/spot_finding/ImageSpotFinderCPU.h index 497d09e4..29ae00f4 100644 --- a/image_analysis/spot_finding/ImageSpotFinderCPU.h +++ b/image_analysis/spot_finding/ImageSpotFinderCPU.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_IMAGESPOTFINDERCPU_H -#define JFJOCH_IMAGESPOTFINDERCPU_H +#pragma once #include @@ -24,4 +23,4 @@ public: std::vector Run(const ImagePreprocessorBuffer &image, const SpotFindingSettings &settings, const std::vector &res_mask); }; -#endif //JFJOCH_IMAGESPOTFINDER_H + diff --git a/image_analysis/spot_finding/ImageSpotFinderGPU.h b/image_analysis/spot_finding/ImageSpotFinderGPU.h index 92213a9d..c18afbe2 100644 --- a/image_analysis/spot_finding/ImageSpotFinderGPU.h +++ b/image_analysis/spot_finding/ImageSpotFinderGPU.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_IMAGEANALYSISGPU_H -#define JFJOCH_IMAGEANALYSISGPU_H +#pragma once #include @@ -27,4 +26,4 @@ public: std::vector Run(const ImagePreprocessorBuffer &image, const SpotFindingSettings &settings, const std::vector &res_mask) override; }; -#endif //JFJOCH_IMAGEANALYSISGPU_H + diff --git a/image_analysis/spot_finding/SpotFindingSettings.h b/image_analysis/spot_finding/SpotFindingSettings.h index a3d55f84..94de14a1 100644 --- a/image_analysis/spot_finding/SpotFindingSettings.h +++ b/image_analysis/spot_finding/SpotFindingSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_SPOTFINDINGSETTINGS_H -#define JUNGFRAUJOCH_SPOTFINDINGSETTINGS_H +#pragma once #include #include @@ -23,5 +22,3 @@ struct SpotFindingSettings { bool indexing = true; bool quick_integration = true; }; - -#endif //JUNGFRAUJOCH_SPOTFINDINGSETTINGS_H diff --git a/image_analysis/spot_finding/SpotUtils.h b/image_analysis/spot_finding/SpotUtils.h index 0404e2cf..05d183c8 100644 --- a/image_analysis/spot_finding/SpotUtils.h +++ b/image_analysis/spot_finding/SpotUtils.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_SPOTANALYSIS_H -#define JFJOCH_SPOTANALYSIS_H +#pragma once #include "../../common/DiffractionSpot.h" @@ -33,4 +32,4 @@ void SpotAnalyze(const DiffractionExperiment &experiment, const std::vector &spots, DataMessage &message); -#endif //JFJOCH_SPOTANALYSIS_H + diff --git a/image_analysis/spot_finding/StrongPixelSet.h b/image_analysis/spot_finding/StrongPixelSet.h index 06e05018..cbc322da 100644 --- a/image_analysis/spot_finding/StrongPixelSet.h +++ b/image_analysis/spot_finding/StrongPixelSet.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_STRONGPIXELSET_H -#define JUNGFRAUJOCH_STRONGPIXELSET_H +#pragma once #include "../../common/DiffractionExperiment.h" #include "../../common/DiffractionSpot.h" @@ -39,6 +38,3 @@ public: void FindSpotsImage(const SpotFindingSettings &settings, std::vector &spots); uint32_t GetStrongPixelCount() const; }; - - -#endif //JUNGFRAUJOCH_STRONGPIXELSET_H diff --git a/image_puller/ImagePuller.h b/image_puller/ImagePuller.h index 462f0736..41c8533d 100644 --- a/image_puller/ImagePuller.h +++ b/image_puller/ImagePuller.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_IMAGEPULLER_H -#define JFJOCH_IMAGEPULLER_H +#pragma once #include #include @@ -60,4 +59,4 @@ public: virtual void Disconnect() = 0; }; -#endif //JFJOCH_IMAGEPULLER_H + diff --git a/image_puller/TestImagePuller.h b/image_puller/TestImagePuller.h index 59556275..04b47fdc 100644 --- a/image_puller/TestImagePuller.h +++ b/image_puller/TestImagePuller.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_TESTIMAGEPULLER_H -#define JFJOCH_TESTIMAGEPULLER_H +#pragma once #include "ImagePuller.h" @@ -13,4 +12,4 @@ public: void Disconnect() override; }; -#endif //JFJOCH_TESTIMAGEPULLER_H + diff --git a/image_puller/ZMQImagePuller.h b/image_puller/ZMQImagePuller.h index 5c43feb3..071b5fc1 100644 --- a/image_puller/ZMQImagePuller.h +++ b/image_puller/ZMQImagePuller.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ZMQIMAGEPULLER_H -#define JUNGFRAUJOCH_ZMQIMAGEPULLER_H +#pragma once #include @@ -56,5 +55,3 @@ public: void Suspend(); void ResumeAndClear(); }; - -#endif //JUNGFRAUJOCH_ZMQIMAGEPULLER_H diff --git a/image_pusher/CBORFilePusher.h b/image_pusher/CBORFilePusher.h index e3eecf55..91b3b59d 100644 --- a/image_pusher/CBORFilePusher.h +++ b/image_pusher/CBORFilePusher.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_DUMPCBORTOFILEPUSHER_H -#define JUNGFRAUJOCH_DUMPCBORTOFILEPUSHER_H +#pragma once #include "ImagePusher.h" #include @@ -22,6 +21,3 @@ public: size_t GetConnectedWriters() const override; ImagePusherType GetType() const override { return ImagePusherType::CBOR; } }; - - -#endif //JUNGFRAUJOCH_DUMPCBORTOFILEPUSHER_H diff --git a/image_pusher/HDF5FilePusher.h b/image_pusher/HDF5FilePusher.h index 3d65c0a7..4039135e 100644 --- a/image_pusher/HDF5FilePusher.h +++ b/image_pusher/HDF5FilePusher.h @@ -1,9 +1,7 @@ - // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_HDF5FILEPUSHER_H -#define JFJOCH_HDF5FILEPUSHER_H +#pragma once #include @@ -45,5 +43,3 @@ public: size_t GetConnectedWriters() const override; ImagePusherType GetType() const override { return ImagePusherType::HDF5; } }; - -#endif //JFJOCH_HDF5FILEPUSHER_H diff --git a/image_pusher/ImagePusher.h b/image_pusher/ImagePusher.h index ac41375b..17d543ed 100644 --- a/image_pusher/ImagePusher.h +++ b/image_pusher/ImagePusher.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_IMAGEPUSHER_H -#define JUNGFRAUJOCH_IMAGEPUSHER_H +#pragma once #include @@ -67,6 +66,3 @@ public: }; } }; - - -#endif //JUNGFRAUJOCH_IMAGEPUSHER_H diff --git a/image_pusher/NonePusher.h b/image_pusher/NonePusher.h index 49ede5d0..cd6ae70e 100644 --- a/image_pusher/NonePusher.h +++ b/image_pusher/NonePusher.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_NONEPUSHER_H -#define JFJOCH_NONEPUSHER_H +#pragma once #include "ImagePusher.h" @@ -18,4 +17,4 @@ public: }; -#endif //JFJOCH_NONEPUSHER_H + diff --git a/image_pusher/TestImagePusher.h b/image_pusher/TestImagePusher.h index a1a65059..914d5b8b 100644 --- a/image_pusher/TestImagePusher.h +++ b/image_pusher/TestImagePusher.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_TESTIMAGEPUSHER_H -#define JUNGFRAUJOCH_TESTIMAGEPUSHER_H +#pragma once #include @@ -38,6 +37,3 @@ public: ImagePusherType GetType() const override { return ImagePusherType::Test; } }; - - -#endif //JUNGFRAUJOCH_TESTIMAGEPUSHER_H diff --git a/image_pusher/ZMQStream2Pusher.h b/image_pusher/ZMQStream2Pusher.h index aa5dbd36..9d58f7a3 100644 --- a/image_pusher/ZMQStream2Pusher.h +++ b/image_pusher/ZMQStream2Pusher.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_ZMQSTREAM2PUSHER_H -#define JUNGFRAUJOCH_ZMQSTREAM2PUSHER_H +#pragma once #include "ImagePusher.h" #include "../common/ZMQWrappers.h" @@ -50,5 +49,3 @@ public: ImagePusherType GetType() const override { return ImagePusherType::ZMQ; } }; - -#endif //JUNGFRAUJOCH_ZMQSTREAM2PUSHER_H diff --git a/image_pusher/ZMQStream2PusherSocket.h b/image_pusher/ZMQStream2PusherSocket.h index 76b6c2cb..d31165cc 100644 --- a/image_pusher/ZMQStream2PusherSocket.h +++ b/image_pusher/ZMQStream2PusherSocket.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_ZMQSTREAM2PUSHERSOCKET_H -#define JFJOCH_ZMQSTREAM2PUSHERSOCKET_H +#pragma once #include #include @@ -38,5 +37,3 @@ public: // Thread-safe void SendImage(ZeroCopyReturnValue &z); }; - -#endif //JFJOCH_ZMQSTREAM2PUSHERSOCKET_H \ No newline at end of file diff --git a/image_pusher/ZMQWriterNotificationPuller.h b/image_pusher/ZMQWriterNotificationPuller.h index cf90c932..e9ca6224 100644 --- a/image_pusher/ZMQWriterNotificationPuller.h +++ b/image_pusher/ZMQWriterNotificationPuller.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_ZMQWRITERNOTIFICATIONPULLER_H -#define JFJOCH_ZMQWRITERNOTIFICATIONPULLER_H +#pragma once #include @@ -25,4 +24,4 @@ public: }; -#endif //JFJOCH_ZMQWRITERNOTIFICATIONPULLER_H + diff --git a/jungfrau/JFCalibration.h b/jungfrau/JFCalibration.h index 3479d662..5aec8120 100644 --- a/jungfrau/JFCalibration.h +++ b/jungfrau/JFCalibration.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFCALIBRATION_H -#define JUNGFRAUJOCH_JFCALIBRATION_H +#pragma once #include "JFModulePedestal.h" #include "JFModuleGainCalibration.h" @@ -53,5 +52,3 @@ public: [[nodiscard]] std::vector GetPedestalRMS(size_t gain_level, size_t storage_cell = 0) const; }; - -#endif //JUNGFRAUJOCH_JFCALIBRATION_H diff --git a/jungfrau/JFConversionFloatingPoint.h b/jungfrau/JFConversionFloatingPoint.h index 2b6b4a73..cebbe049 100644 --- a/jungfrau/JFConversionFloatingPoint.h +++ b/jungfrau/JFConversionFloatingPoint.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFCONVERSIONFLOATINGPOINT_H -#define JUNGFRAUJOCH_JFCONVERSIONFLOATINGPOINT_H +#pragma once #include "JFCalibration.h" @@ -32,6 +31,3 @@ public: double energy, bool using_gain_hg0); void ConvertFP(double *dest, const uint16_t *source); }; - - -#endif //JUNGFRAUJOCH_JFCONVERSIONFLOATINGPOINT_H diff --git a/jungfrau/JFModuleGainCalibration.h b/jungfrau/JFModuleGainCalibration.h index adad5624..1521a4f9 100644 --- a/jungfrau/JFModuleGainCalibration.h +++ b/jungfrau/JFModuleGainCalibration.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFMODULEGAINCALIBRATION_H -#define JUNGFRAUJOCH_JFMODULEGAINCALIBRATION_H +#pragma once #include #include @@ -53,5 +52,3 @@ public: void LoadGain(const std::vector& filenames); const std::vector& GetCalibration() const; }; - -#endif //JUNGFRAUJOCH_JFMODULEGAINCALIBRATION_H diff --git a/jungfrau/JFModulePedestal.h b/jungfrau/JFModulePedestal.h index 0d69c473..5c5a40c2 100644 --- a/jungfrau/JFModulePedestal.h +++ b/jungfrau/JFModulePedestal.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFMODULEPEDESTAL_H -#define JUNGFRAUJOCH_JFMODULEPEDESTAL_H +#pragma once #include #include @@ -41,6 +40,3 @@ public: void SetFrameCount(int64_t input); [[nodiscard]] int64_t GetFrameCount() const; }; - - -#endif //JUNGFRAUJOCH_JFMODULEPEDESTAL_H diff --git a/jungfrau/JFPedestalCalc.h b/jungfrau/JFPedestalCalc.h index 071916cb..63398499 100644 --- a/jungfrau/JFPedestalCalc.h +++ b/jungfrau/JFPedestalCalc.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFPEDESTALCALC_H -#define JUNGFRAUJOCH_JFPEDESTALCALC_H +#pragma once #include #include @@ -25,5 +24,3 @@ public: void Export(JFModulePedestal& calibration, size_t allowed_wrong_gains = 0) const; JFPedestalCalc &operator+=(const JFPedestalCalc &other); }; - -#endif //JUNGFRAUJOCH_JFPEDESTALCALC_H diff --git a/preview/PreviewCounter.h b/preview/PreviewCounter.h index eddcc53f..88990aa4 100644 --- a/preview/PreviewCounter.h +++ b/preview/PreviewCounter.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_PREVIEWCOUNTER_H -#define JUNGFRAUJOCH_PREVIEWCOUNTER_H +#pragma once #include #include @@ -19,5 +18,3 @@ public: bool GeneratePreview(); std::optional GetPeriod() const; }; - -#endif //JUNGFRAUJOCH_PREVIEWCOUNTER_H diff --git a/preview/PreviewImage.h b/preview/PreviewImage.h index e625a766..2598ee06 100644 --- a/preview/PreviewImage.h +++ b/preview/PreviewImage.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_PREVIEWIMAGE_H -#define JUNGFRAUJOCH_PREVIEWIMAGE_H +#pragma once #include #include @@ -74,5 +73,3 @@ public: [[nodiscard]] std::string GenerateImage(const PreviewImageSettings& settings, const std::vector& cbor_format); [[nodiscard]] static std::string GenerateTIFF(const std::vector& cbor_format) ; }; - -#endif //JUNGFRAUJOCH_PREVIEWIMAGE_H diff --git a/preview/ZMQPreviewSettings.h b/preview/ZMQPreviewSettings.h index ec27c5c6..d05c49b4 100644 --- a/preview/ZMQPreviewSettings.h +++ b/preview/ZMQPreviewSettings.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_ZMQPREVIEWSETTINGS_H -#define JFJOCH_ZMQPREVIEWSETTINGS_H +#pragma once #include #include @@ -13,4 +12,4 @@ struct ZMQPreviewSettings { }; -#endif //JFJOCH_ZMQPREVIEWSETTINGS_H + diff --git a/preview/ZMQPreviewSocket.h b/preview/ZMQPreviewSocket.h index 1b03db79..1b637819 100644 --- a/preview/ZMQPreviewSocket.h +++ b/preview/ZMQPreviewSocket.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_ZMQPREVIEWSOCKET_H -#define JFJOCH_ZMQPREVIEWSOCKET_H +#pragma once #include "PreviewCounter.h" #include "../common/ZMQWrappers.h" @@ -24,4 +23,4 @@ public: ZMQPreviewSettings GetSettings(); }; -#endif //JFJOCH_ZMQPREVIEWSOCKET_H + diff --git a/reader/JFJochHttpReader.h b/reader/JFJochHttpReader.h index dcbc955a..13dc6911 100644 --- a/reader/JFJochHttpReader.h +++ b/reader/JFJochHttpReader.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHHTTPREADER_H -#define JFJOCH_JFJOCHHTTPREADER_H +#pragma once #include "JFJochReader.h" #include "../common/BrokerStatus.h" @@ -40,4 +39,4 @@ public: }; -#endif //JFJOCH_JFJOCHHTTPREADER_H + diff --git a/reader/JFJochReaderDataset.h b/reader/JFJochReaderDataset.h index 0540c07c..d070bf32 100644 --- a/reader/JFJochReaderDataset.h +++ b/reader/JFJochReaderDataset.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHREADERDATASET_H -#define JFJOCH_JFJOCHREADERDATASET_H +#pragma once #include #include @@ -62,4 +61,4 @@ struct JFJochReaderDataset { }; -#endif //JFJOCH_JFJOCHREADERDATASET_H + diff --git a/reader/JFJochReaderImage.h b/reader/JFJochReaderImage.h index c0968fe8..bb7ebbe6 100644 --- a/reader/JFJochReaderImage.h +++ b/reader/JFJochReaderImage.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHREADERIMAGE_H -#define JFJOCH_JFJOCHREADERIMAGE_H +#pragma once #include #include @@ -79,4 +78,4 @@ public: std::vector GetHistogram() const; }; -#endif //JFJOCH_JFJOCHREADERIMAGE_H + diff --git a/receiver/FrameTransformation.h b/receiver/FrameTransformation.h index e75d1acc..e155f013 100644 --- a/receiver/FrameTransformation.h +++ b/receiver/FrameTransformation.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_FRAMETRANSFORMATION_H -#define JUNGFRAUJOCH_FRAMETRANSFORMATION_H +#pragma once #include "../common/DiffractionExperiment.h" #include "JFJochCompressor.h" @@ -28,5 +27,3 @@ public: size_t CompressImage(void *output); const void *GetImage() const; }; - -#endif //JUNGFRAUJOCH_FRAMETRANSFORMATION_H diff --git a/receiver/ImageMetadata.h b/receiver/ImageMetadata.h index 18856d5a..8107fbe7 100644 --- a/receiver/ImageMetadata.h +++ b/receiver/ImageMetadata.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_IMAGEMETADATA_H -#define JUNGFRAUJOCH_IMAGEMETADATA_H +#pragma once #include #include @@ -46,6 +45,3 @@ public: void Export(DataMessage &message, uint64_t packets_expected_per_image) const; bool IsBunchIDConsistent() const; }; - - -#endif //JUNGFRAUJOCH_IMAGEMETADATA_H diff --git a/receiver/JFJochReceiver.h b/receiver/JFJochReceiver.h index 05addc41..83918987 100644 --- a/receiver/JFJochReceiver.h +++ b/receiver/JFJochReceiver.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHRECEIVER_H -#define JFJOCH_JFJOCHRECEIVER_H +#pragma once #include #include @@ -124,4 +123,4 @@ public: }; -#endif //JFJOCH_JFJOCHRECEIVER_H + diff --git a/receiver/JFJochReceiverCurrentStatus.h b/receiver/JFJochReceiverCurrentStatus.h index 051825e4..030bbf11 100644 --- a/receiver/JFJochReceiverCurrentStatus.h +++ b/receiver/JFJochReceiverCurrentStatus.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHRECEIVERCURRENTSTATUS_H -#define JFJOCH_JFJOCHRECEIVERCURRENTSTATUS_H +#pragma once #include #include @@ -42,4 +41,4 @@ public: }; -#endif //JFJOCH_JFJOCHRECEIVERCURRENTSTATUS_H + diff --git a/receiver/JFJochReceiverFPGA.h b/receiver/JFJochReceiverFPGA.h index 79d0541b..c6146c91 100644 --- a/receiver/JFJochReceiverFPGA.h +++ b/receiver/JFJochReceiverFPGA.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHRECEIVER_H -#define JUNGFRAUJOCH_JFJOCHRECEIVER_H +#pragma once #include #include @@ -120,6 +119,3 @@ public: JFJochReceiverOutput GetFinalStatistics() const override; }; - -#endif //JUNGFRAUJOCH_JFJOCHRECEIVER_H - diff --git a/receiver/JFJochReceiverLite.h b/receiver/JFJochReceiverLite.h index 9e441336..b8c1b546 100644 --- a/receiver/JFJochReceiverLite.h +++ b/receiver/JFJochReceiverLite.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHRECEIVERLITE_H -#define JFJOCH_JFJOCHRECEIVERLITE_H +#pragma once #include #include @@ -73,4 +72,4 @@ public: JFJochReceiverOutput GetFinalStatistics() const override; }; -#endif //JFJOCH_JFJOCHRECEIVERLITE_H + diff --git a/receiver/JFJochReceiverOutput.h b/receiver/JFJochReceiverOutput.h index ccef9e57..ec755538 100644 --- a/receiver/JFJochReceiverOutput.h +++ b/receiver/JFJochReceiverOutput.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHRECEIVEROUTPUT_H -#define JFJOCH_JFJOCHRECEIVEROUTPUT_H +#pragma once #include #include @@ -29,4 +28,4 @@ struct JFJochReceiverOutput { MeanProcessingTime processing_time; }; -#endif //JFJOCH_JFJOCHRECEIVEROUTPUT_H + diff --git a/receiver/JFJochReceiverPlots.h b/receiver/JFJochReceiverPlots.h index 49bb4a40..ba5e2fe6 100644 --- a/receiver/JFJochReceiverPlots.h +++ b/receiver/JFJochReceiverPlots.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHRECEIVERPLOTS_H -#define JUNGFRAUJOCH_JFJOCHRECEIVERPLOTS_H +#pragma once #include #include @@ -128,5 +127,3 @@ public: void GetPlotRaw(std::vector &v, PlotType type, const std::string &roi); }; - -#endif //JUNGFRAUJOCH_JFJOCHRECEIVERPLOTS_H diff --git a/receiver/JFJochReceiverService.h b/receiver/JFJochReceiverService.h index 386d0e53..1edec952 100644 --- a/receiver/JFJochReceiverService.h +++ b/receiver/JFJochReceiverService.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_JFJOCHRECEIVERSERVICE_H -#define JUNGFRAUJOCH_JFJOCHRECEIVERSERVICE_H +#pragma once #include #include @@ -91,6 +90,3 @@ public: ImagePusherStatus GetImagePusherStatus() const; }; - - -#endif //JUNGFRAUJOCH_JFJOCHRECEIVERSERVICE_H diff --git a/receiver/JFJochReceiverTest.h b/receiver/JFJochReceiverTest.h index 237d0cf1..89281494 100644 --- a/receiver/JFJochReceiverTest.h +++ b/receiver/JFJochReceiverTest.h @@ -3,8 +3,7 @@ #include "JFJochReceiverFPGA.h" -#ifndef JUNGFRAUJOCH_JFJOCHRECEIVERTEST_H -#define JUNGFRAUJOCH_JFJOCHRECEIVERTEST_H +#pragma once bool JFJochReceiverTest(JFJochReceiverOutput &output, Logger &logger, AcquisitionDeviceGroup &aq_devices, @@ -24,5 +23,3 @@ bool JFJochReceiverTest(JFJochReceiverOutput &output, Logger &logger, const std::string &numa_policy = "", size_t send_buf_size_MiB = 1024, bool quick_integrate = false); - -#endif //JUNGFRAUJOCH_JFJOCHRECEIVERTEST_H diff --git a/receiver/LossyFilter.h b/receiver/LossyFilter.h index 9ddef221..bcfc278f 100644 --- a/receiver/LossyFilter.h +++ b/receiver/LossyFilter.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_LOSSYFILTER_H -#define JUNGFRAUJOCH_LOSSYFILTER_H +#pragma once #include #include @@ -28,6 +27,3 @@ public: explicit LossyFilter(const DiffractionExperiment& x); bool ApplyFilter(DataMessage& message); }; - - -#endif //JUNGFRAUJOCH_LOSSYFILTER_H diff --git a/tools/UDPSimulator.h b/tools/UDPSimulator.h index 9dc80a6d..162bb446 100644 --- a/tools/UDPSimulator.h +++ b/tools/UDPSimulator.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_UDPSIMULATOR_H -#define JUNGFRAUJOCH_UDPSIMULATOR_H +#pragma once #include #include diff --git a/tools/XdsIntegrateParser.h b/tools/XdsIntegrateParser.h index ea5c19f0..af2dc692 100644 --- a/tools/XdsIntegrateParser.h +++ b/tools/XdsIntegrateParser.h @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only - #pragma once #include diff --git a/viewer/JFJochImageReadingWorker.h b/viewer/JFJochImageReadingWorker.h index 17e6d2cb..4d419f9d 100644 --- a/viewer/JFJochImageReadingWorker.h +++ b/viewer/JFJochImageReadingWorker.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCHIMAGEREADINGWORKER_H -#define JFJOCHIMAGEREADINGWORKER_H +#pragma once #include #include @@ -155,6 +154,3 @@ public slots: void setAutoLoadMode(AutoloadMode mode); void setAutoLoadJump(int64_t val); }; - - -#endif //JFJOCHIMAGEREADINGWORKER_H diff --git a/viewer/JFJochViewerDatasetInfo.h b/viewer/JFJochViewerDatasetInfo.h index 381f2af7..f6eb8be5 100644 --- a/viewer/JFJochViewerDatasetInfo.h +++ b/viewer/JFJochViewerDatasetInfo.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERDATASETINFO_H -#define JFJOCH_JFJOCHVIEWERDATASETINFO_H +#pragma once #include #include @@ -45,4 +44,4 @@ public slots: }; -#endif //JFJOCH_JFJOCHVIEWERDATASETINFO_H + diff --git a/viewer/JFJochViewerMenu.h b/viewer/JFJochViewerMenu.h index ae3ec510..1bed4966 100644 --- a/viewer/JFJochViewerMenu.h +++ b/viewer/JFJochViewerMenu.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCHVIEWERMENU_H -#define JFJOCHVIEWERMENU_H +#pragma once #include @@ -43,7 +42,3 @@ private slots: void saveUserMaskAsTiffSelected(); void uploadUserMaskAction(); }; - - - -#endif //JFJOCHVIEWERMENU_H diff --git a/viewer/JFJochViewerSidePanel.h b/viewer/JFJochViewerSidePanel.h index 0e0c80c0..6eabf1bd 100644 --- a/viewer/JFJochViewerSidePanel.h +++ b/viewer/JFJochViewerSidePanel.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERSIDEPANEL_H -#define JFJOCH_JFJOCHVIEWERSIDEPANEL_H +#pragma once #include #include @@ -60,4 +59,4 @@ private slots: }; -#endif //JFJOCH_JFJOCHVIEWERSIDEPANEL_H + diff --git a/viewer/JFJochViewerStatusBar.h b/viewer/JFJochViewerStatusBar.h index 4663a2da..59d2de0a 100644 --- a/viewer/JFJochViewerStatusBar.h +++ b/viewer/JFJochViewerStatusBar.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERSTATUSBAR_H -#define JFJOCH_JFJOCHVIEWERSTATUSBAR_H +#pragma once #include @@ -15,4 +14,4 @@ public: }; -#endif //JFJOCH_JFJOCHVIEWERSTATUSBAR_H + diff --git a/viewer/JFJochViewerWindow.h b/viewer/JFJochViewerWindow.h index 61aff081..56011e19 100644 --- a/viewer/JFJochViewerWindow.h +++ b/viewer/JFJochViewerWindow.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCHVIEWERWINDOW_H -#define JFJOCHVIEWERWINDOW_H +#pragma once #include #include @@ -50,6 +49,3 @@ signals: void setAutoForeground(bool val); }; - - -#endif //JFJOCHVIEWERWINDOW_H diff --git a/viewer/charts/JFJochDatasetInfoChartView.h b/viewer/charts/JFJochDatasetInfoChartView.h index 4537b80f..f26e5bea 100644 --- a/viewer/charts/JFJochDatasetInfoChartView.h +++ b/viewer/charts/JFJochDatasetInfoChartView.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHCHARTVIEW_H -#define JFJOCH_JFJOCHCHARTVIEW_H +#pragma once #include #include @@ -110,4 +109,4 @@ public: }; -#endif //JFJOCH_JFJOCHCHARTVIEW_H + diff --git a/viewer/charts/JFJochSimpleChartView.h b/viewer/charts/JFJochSimpleChartView.h index e6cdf64f..fcc10a83 100644 --- a/viewer/charts/JFJochSimpleChartView.h +++ b/viewer/charts/JFJochSimpleChartView.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHSIMPLECHARTVIEW_H -#define JFJOCH_JFJOCHSIMPLECHARTVIEW_H +#pragma once #include #include @@ -31,4 +30,4 @@ public: }; -#endif //JFJOCH_JFJOCHSIMPLECHARTVIEW_H + diff --git a/viewer/dbus/JFJochViewerAdaptor.h b/viewer/dbus/JFJochViewerAdaptor.h index 88a03002..ae5f0f84 100644 --- a/viewer/dbus/JFJochViewerAdaptor.h +++ b/viewer/dbus/JFJochViewerAdaptor.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCHVIEWERADAPTOR_H -#define JFJOCHVIEWERADAPTOR_H +#pragma once #include #include @@ -20,6 +19,3 @@ public slots: void LoadFile(const QString &filename, int image_number = 0, int summation = 1); void LoadImage(int image_number, int summation = 1); }; - - -#endif diff --git a/viewer/image_viewer/JFJochAzIntImage.h b/viewer/image_viewer/JFJochAzIntImage.h index e1e66362..08dff6d8 100644 --- a/viewer/image_viewer/JFJochAzIntImage.h +++ b/viewer/image_viewer/JFJochAzIntImage.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHAZINTIMAGEVIEW_H -#define JFJOCH_JFJOCHAZINTIMAGEVIEW_H +#pragma once #include @@ -37,4 +36,3 @@ public: }; -#endif //JFJOCH_JFJOCHAZINTIMAGEVIEW_H \ No newline at end of file diff --git a/viewer/image_viewer/JFJochGridScanImage.h b/viewer/image_viewer/JFJochGridScanImage.h index fd71c4d0..3853a01e 100644 --- a/viewer/image_viewer/JFJochGridScanImage.h +++ b/viewer/image_viewer/JFJochGridScanImage.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHGRIDSCANIMAGE_H -#define JFJOCH_JFJOCHGRIDSCANIMAGE_H +#pragma once #include "JFJochImage.h" #include "../../reader/JFJochReaderDataset.h" @@ -34,4 +33,3 @@ public slots: }; -#endif //JFJOCH_JFJOCHGRIDSCANIMAGE_H \ No newline at end of file diff --git a/viewer/toolbar/JFJochViewerToolbarDisplay.h b/viewer/toolbar/JFJochViewerToolbarDisplay.h index e39f7623..4db1efef 100644 --- a/viewer/toolbar/JFJochViewerToolbarDisplay.h +++ b/viewer/toolbar/JFJochViewerToolbarDisplay.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERTOOLBARDISPLAY_H -#define JFJOCH_JFJOCHVIEWERTOOLBARDISPLAY_H +#pragma once #include #include "../widgets/SliderPlusBox.h" @@ -40,4 +39,4 @@ private slots: }; -#endif //JFJOCH_JFJOCHVIEWERTOOLBARDISPLAY_H + diff --git a/viewer/toolbar/JFJochViewerToolbarImage.h b/viewer/toolbar/JFJochViewerToolbarImage.h index 19e4f699..c7679865 100644 --- a/viewer/toolbar/JFJochViewerToolbarImage.h +++ b/viewer/toolbar/JFJochViewerToolbarImage.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERTOOLBARIMAGE_H -#define JFJOCH_JFJOCHVIEWERTOOLBARIMAGE_H +#pragma once #include #include @@ -73,4 +72,3 @@ private slots: void reanalyzeButtonPressed(); }; -#endif //JFJOCH_JFJOCHVIEWERTOOLBARIMAGE_H \ No newline at end of file diff --git a/viewer/widgets/JFJochViewerImageROIStatistics.h b/viewer/widgets/JFJochViewerImageROIStatistics.h index 57c375e3..2d2a0118 100644 --- a/viewer/widgets/JFJochViewerImageROIStatistics.h +++ b/viewer/widgets/JFJochViewerImageROIStatistics.h @@ -2,8 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERIMAGEROISTATISTICS_H -#define JFJOCH_JFJOCHVIEWERIMAGEROISTATISTICS_H +#pragma once #include #include @@ -45,4 +44,3 @@ signals: }; -#endif //JFJOCH_JFJOCHVIEWERIMAGEROISTATISTICS_H \ No newline at end of file diff --git a/viewer/widgets/JFJochViewerImageROIStatistics_Box.h b/viewer/widgets/JFJochViewerImageROIStatistics_Box.h index 7ec88ebe..80cc72cd 100644 --- a/viewer/widgets/JFJochViewerImageROIStatistics_Box.h +++ b/viewer/widgets/JFJochViewerImageROIStatistics_Box.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERIMAGEROISTATISTICS_BOX_H -#define JFJOCH_JFJOCHVIEWERIMAGEROISTATISTICS_BOX_H +#pragma once #include @@ -29,4 +28,3 @@ public slots: }; -#endif //JFJOCH_JFJOCHVIEWERIMAGEROISTATISTICS_BOX_H \ No newline at end of file diff --git a/viewer/widgets/JFJochViewerImageROIStatistics_Circle.h b/viewer/widgets/JFJochViewerImageROIStatistics_Circle.h index c88f0faf..dc7808b2 100644 --- a/viewer/widgets/JFJochViewerImageROIStatistics_Circle.h +++ b/viewer/widgets/JFJochViewerImageROIStatistics_Circle.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERIMAGEROISTATISTICS_CIRCLE_H -#define JFJOCH_JFJOCHVIEWERIMAGEROISTATISTICS_CIRCLE_H +#pragma once #include @@ -30,4 +29,3 @@ signals: }; -#endif //JFJOCH_JFJOCHVIEWERIMAGEROISTATISTICS_CIRCLE_H \ No newline at end of file diff --git a/viewer/widgets/JFJochViewerImageStatistics.h b/viewer/widgets/JFJochViewerImageStatistics.h index 52e9af93..95459043 100644 --- a/viewer/widgets/JFJochViewerImageStatistics.h +++ b/viewer/widgets/JFJochViewerImageStatistics.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERIMAGESTATISTICS_H -#define JFJOCH_JFJOCHVIEWERIMAGESTATISTICS_H +#pragma once #include #include @@ -36,4 +35,4 @@ public slots: }; -#endif //JFJOCH_JFJOCHVIEWERIMAGESTATISTICS_H + diff --git a/viewer/widgets/JFJochViewerROIResult.h b/viewer/widgets/JFJochViewerROIResult.h index 154b386c..9e11aad5 100644 --- a/viewer/widgets/JFJochViewerROIResult.h +++ b/viewer/widgets/JFJochViewerROIResult.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERROIRESULT_H -#define JFJOCH_JFJOCHVIEWERROIRESULT_H +#pragma once #include #include @@ -29,4 +28,3 @@ public: }; -#endif //JFJOCH_JFJOCHVIEWERROIRESULT_H \ No newline at end of file diff --git a/viewer/widgets/JFJochViewerSidePanelChart.h b/viewer/widgets/JFJochViewerSidePanelChart.h index b7e63dbc..42e2ad4a 100644 --- a/viewer/widgets/JFJochViewerSidePanelChart.h +++ b/viewer/widgets/JFJochViewerSidePanelChart.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERSIDEPANELCHART_H -#define JFJOCH_JFJOCHVIEWERSIDEPANELCHART_H +#pragma once #include #include @@ -36,4 +35,4 @@ public slots: }; -#endif //JFJOCH_JFJOCHVIEWERSIDEPANELCHART_H + diff --git a/viewer/widgets/NumberLineEdit.h b/viewer/widgets/NumberLineEdit.h index 5111f7b2..6def0bd6 100644 --- a/viewer/widgets/NumberLineEdit.h +++ b/viewer/widgets/NumberLineEdit.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef NUMBERTEXTEDIT_H -#define NUMBERTEXTEDIT_H +#pragma once #include #include @@ -31,5 +30,3 @@ private slots: void onEditingFinished(); }; - -#endif // NUMBERLINEEDIT_H diff --git a/viewer/widgets/NumericComboBox.h b/viewer/widgets/NumericComboBox.h index 73b940fc..ab9b9f7f 100644 --- a/viewer/widgets/NumericComboBox.h +++ b/viewer/widgets/NumericComboBox.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_NUMERICCOMBOBOX_H -#define JFJOCH_NUMERICCOMBOBOX_H +#pragma once #include @@ -26,4 +25,4 @@ private slots: }; -#endif //JFJOCH_NUMERICCOMBOBOX_H + diff --git a/viewer/widgets/ResolutionRingWidget.h b/viewer/widgets/ResolutionRingWidget.h index 00779383..c790b33d 100644 --- a/viewer/widgets/ResolutionRingWidget.h +++ b/viewer/widgets/ResolutionRingWidget.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_RESOLUTIONRINGWIDGET_H -#define JFJOCH_RESOLUTIONRINGWIDGET_H +#pragma once #include #include @@ -44,4 +43,3 @@ private slots: }; -#endif //JFJOCH_RESOLUTIONRINGWIDGET_H \ No newline at end of file diff --git a/viewer/widgets/SliderPlusBox.h b/viewer/widgets/SliderPlusBox.h index adfdac72..a240bb39 100644 --- a/viewer/widgets/SliderPlusBox.h +++ b/viewer/widgets/SliderPlusBox.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_SLIDERPLUSBOX_H -#define JFJOCH_SLIDERPLUSBOX_H +#pragma once #include #include @@ -50,4 +49,4 @@ signals: }; -#endif //JFJOCH_SLIDERPLUSBOX_H + diff --git a/viewer/widgets/TitleLabel.h b/viewer/widgets/TitleLabel.h index 64583c4e..8de692fa 100644 --- a/viewer/widgets/TitleLabel.h +++ b/viewer/widgets/TitleLabel.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_TITLELABEL_H -#define JFJOCH_TITLELABEL_H +#pragma once #include @@ -12,4 +11,4 @@ public: }; -#endif //JFJOCH_TITLELABEL_H + diff --git a/viewer/windows/JFJoch2DAzintImageWindow.h b/viewer/windows/JFJoch2DAzintImageWindow.h index 5a291a7a..b8f29e2b 100644 --- a/viewer/windows/JFJoch2DAzintImageWindow.h +++ b/viewer/windows/JFJoch2DAzintImageWindow.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCH2DAZINTIMAGEWINDOW_H -#define JFJOCH_JFJOCH2DAZINTIMAGEWINDOW_H +#pragma once #include @@ -31,6 +30,3 @@ public slots: void imageLoaded(std::shared_ptr in_dataset) override; void setColorMap(int color_map); }; - - -#endif //JFJOCH_JFJOCH2DAZINTIMAGEWINDOW_H \ No newline at end of file diff --git a/viewer/windows/JFJochAzIntWindow.h b/viewer/windows/JFJochAzIntWindow.h index 22ad6995..3e7d796b 100644 --- a/viewer/windows/JFJochAzIntWindow.h +++ b/viewer/windows/JFJochAzIntWindow.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHAZINTWINDOW_H -#define JFJOCH_JFJOCHAZINTWINDOW_H +#pragma once #include "JFJochHelperWindow.h" #include "../widgets/SliderPlusBox.h" @@ -44,4 +43,3 @@ signals: void settingsChanged(const AzimuthalIntegrationSettings &settings); }; -#endif //JFJOCH_JFJOCHAZINTWINDOW_H \ No newline at end of file diff --git a/viewer/windows/JFJochHelperWindow.h b/viewer/windows/JFJochHelperWindow.h index 86329a8d..5bd4951c 100644 --- a/viewer/windows/JFJochHelperWindow.h +++ b/viewer/windows/JFJochHelperWindow.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHHELPERWINDOW_H -#define JFJOCH_JFJOCHHELPERWINDOW_H +#pragma once #include #include "../../reader/JFJochReaderDataset.h" @@ -26,4 +25,3 @@ public: }; -#endif //JFJOCH_JFJOCHHELPERWINDOW_H \ No newline at end of file diff --git a/viewer/windows/JFJochViewerImageListWindow.h b/viewer/windows/JFJochViewerImageListWindow.h index 5670ad9c..a70bc448 100644 --- a/viewer/windows/JFJochViewerImageListWindow.h +++ b/viewer/windows/JFJochViewerImageListWindow.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERIMAGELISTWINDOW_H -#define JFJOCH_JFJOCHVIEWERIMAGELISTWINDOW_H +#pragma once #include #include @@ -44,4 +43,4 @@ private slots: -#endif //JFJOCH_JFJOCHVIEWERIMAGELISTWINDOW_H + diff --git a/viewer/windows/JFJochViewerMetadataWindow.h b/viewer/windows/JFJochViewerMetadataWindow.h index 18220d82..56b8cf79 100644 --- a/viewer/windows/JFJochViewerMetadataWindow.h +++ b/viewer/windows/JFJochViewerMetadataWindow.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERMETADATAWINDOW_H -#define JFJOCH_JFJOCHVIEWERMETADATAWINDOW_H +#pragma once #include @@ -54,4 +53,4 @@ public slots: }; -#endif //JFJOCH_JFJOCHVIEWERMETADATAWINDOW_H + diff --git a/viewer/windows/JFJochViewerProcessingWindow.h b/viewer/windows/JFJochViewerProcessingWindow.h index eafd0e4f..df6488de 100644 --- a/viewer/windows/JFJochViewerProcessingWindow.h +++ b/viewer/windows/JFJochViewerProcessingWindow.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERPROCESSINGWIDGET_H -#define JFJOCH_JFJOCHVIEWERPROCESSINGWIDGET_H +#pragma once #include #include @@ -54,4 +53,4 @@ signals: }; -#endif //JFJOCH_JFJOCHVIEWERPROCESSINGWIDGET_H + diff --git a/viewer/windows/JFJochViewerReciprocalSpaceWindow.h b/viewer/windows/JFJochViewerReciprocalSpaceWindow.h index d4008969..67d5a6c1 100644 --- a/viewer/windows/JFJochViewerReciprocalSpaceWindow.h +++ b/viewer/windows/JFJochViewerReciprocalSpaceWindow.h @@ -1,5 +1,6 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only + #pragma once #include diff --git a/viewer/windows/JFJochViewerReflectionListWindow.h b/viewer/windows/JFJochViewerReflectionListWindow.h index cfd800bc..7faa7ff6 100644 --- a/viewer/windows/JFJochViewerReflectionListWindow.h +++ b/viewer/windows/JFJochViewerReflectionListWindow.h @@ -2,8 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERREFLECTIONLISTWINDOW_H -#define JFJOCH_JFJOCHVIEWERREFLECTIONLISTWINDOW_H +#pragma once #include "JFJochHelperWindow.h" #include @@ -38,4 +37,3 @@ public slots: }; -#endif //JFJOCH_JFJOCHVIEWERREFLECTIONLISTWINDOW_H \ No newline at end of file diff --git a/viewer/windows/JFJochViewerSpotListWindow.h b/viewer/windows/JFJochViewerSpotListWindow.h index d9061b91..0111b8dd 100644 --- a/viewer/windows/JFJochViewerSpotListWindow.h +++ b/viewer/windows/JFJochViewerSpotListWindow.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_JFJOCHVIEWERSPOTLISTWINDOW_H -#define JFJOCH_JFJOCHVIEWERSPOTLISTWINDOW_H +#pragma once #include "JFJochHelperWindow.h" #include @@ -39,4 +38,3 @@ public slots: -#endif //JFJOCH_JFJOCHVIEWERSPOTLISTWINDOW_H \ No newline at end of file diff --git a/writer/CBFWriter.h b/writer/CBFWriter.h index 5deb6d43..4158f49c 100644 --- a/writer/CBFWriter.h +++ b/writer/CBFWriter.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_CBFWRITER_H -#define JFJOCH_CBFWRITER_H +#pragma once #include "../common/JFJochMessages.h" @@ -20,4 +19,4 @@ public: }; -#endif //JFJOCH_CBFWRITER_H + diff --git a/writer/FileWriter.h b/writer/FileWriter.h index 30857a22..d73c72f1 100644 --- a/writer/FileWriter.h +++ b/writer/FileWriter.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_HDF5WRITER_H -#define JUNGFRAUJOCH_HDF5WRITER_H +#pragma once #include @@ -42,5 +41,3 @@ public: void SetupFinalizedFileSocket(const std::string &addr); std::optional GetZMQAddr(); }; - -#endif //JUNGFRAUJOCH_HDF5WRITER_H diff --git a/writer/HDF5DataFile.h b/writer/HDF5DataFile.h index aac77fb0..0979f99f 100644 --- a/writer/HDF5DataFile.h +++ b/writer/HDF5DataFile.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef HDF5DATAFILE_H -#define HDF5DATAFILE_H +#pragma once #include #include @@ -59,5 +58,3 @@ public: void CreateFile(const DataMessage& msg, std::shared_ptr data_file); }; - -#endif //HDF5DATAFILE_H diff --git a/writer/HDF5DataFilePlugin.h b/writer/HDF5DataFilePlugin.h index 08b3fb2c..7f7d5ddc 100644 --- a/writer/HDF5DataFilePlugin.h +++ b/writer/HDF5DataFilePlugin.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_HDF5DATAFILEPLUGIN_H -#define JUNGFRAUJOCH_HDF5DATAFILEPLUGIN_H +#pragma once #include "../common/JFJochMessages.h" #include "HDF5Objects.h" @@ -16,5 +15,3 @@ public: virtual void WriteFinal(HDF5File &data_file) = 0; virtual ~HDF5DataFilePlugin() = default; }; - -#endif //JUNGFRAUJOCH_HDF5DATAFILEPLUGIN_H diff --git a/writer/HDF5DataFilePluginAzInt.h b/writer/HDF5DataFilePluginAzInt.h index 07b82942..41ace5dc 100644 --- a/writer/HDF5DataFilePluginAzInt.h +++ b/writer/HDF5DataFilePluginAzInt.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_HDF5DATAFILEPLUGINAZINT_H -#define JUNGFRAUJOCH_HDF5DATAFILEPLUGINAZINT_H +#pragma once #include "HDF5DataFilePlugin.h" @@ -27,5 +26,3 @@ public: void Write(const DataMessage& msg, uint64_t image_number) override; void WriteFinal(HDF5File &data_file) override; }; - -#endif //JUNGFRAUJOCH_HDF5DATAFILEPLUGINAZINT_H diff --git a/writer/HDF5DataFilePluginDetector.h b/writer/HDF5DataFilePluginDetector.h index 99a8f6b6..9f1d3572 100644 --- a/writer/HDF5DataFilePluginDetector.h +++ b/writer/HDF5DataFilePluginDetector.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_HDF5DATAFILEPLUGINJUNGFRAU_H -#define JUNGFRAUJOCH_HDF5DATAFILEPLUGINJUNGFRAU_H +#pragma once #include "HDF5DataFilePlugin.h" #include "../common/AutoIncrVector.h" @@ -22,5 +21,3 @@ public: void Write(const DataMessage& msg, uint64_t image_number) override; void WriteFinal(HDF5File &data_file) override; }; - -#endif //JUNGFRAUJOCH_HDF5DATAFILEPLUGINJUNGFRAU_H diff --git a/writer/HDF5DataFilePluginImageStats.h b/writer/HDF5DataFilePluginImageStats.h index b23e0ae5..5b6f1aaa 100644 --- a/writer/HDF5DataFilePluginImageStats.h +++ b/writer/HDF5DataFilePluginImageStats.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_HDF5DATAFILEPLUGINIMAGESTATS_H -#define JFJOCH_HDF5DATAFILEPLUGINIMAGESTATS_H +#pragma once #include "HDF5DataFilePlugin.h" @@ -21,5 +20,3 @@ public: ~HDF5DataFilePluginImageStats() override = default; }; - -#endif //JFJOCH_HDF5DATAFILEPLUGINIMAGESTATS_H diff --git a/writer/HDF5DataFilePluginMX.h b/writer/HDF5DataFilePluginMX.h index faae9da0..2c441561 100644 --- a/writer/HDF5DataFilePluginMX.h +++ b/writer/HDF5DataFilePluginMX.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_HDF5DATAFILEPLUGINMX_H -#define JUNGFRAUJOCH_HDF5DATAFILEPLUGINMX_H +#pragma once #include "HDF5DataFilePlugin.h" #include "../common/AutoIncrVector.h" @@ -65,5 +64,3 @@ public: void Write(const DataMessage& msg, uint64_t image_number) override; void WriteFinal(HDF5File &data_file) override; }; - -#endif //JUNGFRAUJOCH_HDF5DATAFILEPLUGINMX_H diff --git a/writer/HDF5DataFilePluginROI.h b/writer/HDF5DataFilePluginROI.h index 00bbe492..3a8ae677 100644 --- a/writer/HDF5DataFilePluginROI.h +++ b/writer/HDF5DataFilePluginROI.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_HDF5DATAFILEPLUGINROI_H -#define JFJOCH_HDF5DATAFILEPLUGINROI_H +#pragma once #include #include "../common/AutoIncrVector.h" @@ -25,5 +24,3 @@ public: void Write(const DataMessage &msg, uint64_t image_number) override; void WriteFinal(HDF5File &data_file) override; }; - -#endif //JFJOCH_HDF5DATAFILEPLUGINROI_H diff --git a/writer/HDF5DataFilePluginReflection.h b/writer/HDF5DataFilePluginReflection.h index c43aa570..1e947aea 100644 --- a/writer/HDF5DataFilePluginReflection.h +++ b/writer/HDF5DataFilePluginReflection.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JFJOCH_HDF5DATAFILEPLUGINREFLECTION_H -#define JFJOCH_HDF5DATAFILEPLUGINREFLECTION_H +#pragma once #include "HDF5DataFilePlugin.h" @@ -14,6 +13,3 @@ public: void WriteFinal(HDF5File &data_file) override; ~HDF5DataFilePluginReflection() override = default; }; - - -#endif //JFJOCH_HDF5DATAFILEPLUGINREFLECTION_H \ No newline at end of file diff --git a/writer/HDF5DataFilePluginXFEL.h b/writer/HDF5DataFilePluginXFEL.h index c26a544d..f2529dd8 100644 --- a/writer/HDF5DataFilePluginXFEL.h +++ b/writer/HDF5DataFilePluginXFEL.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_HDF5DATAFILEPLUGINXFEL_H -#define JUNGFRAUJOCH_HDF5DATAFILEPLUGINXFEL_H +#pragma once #include "HDF5DataFilePlugin.h" #include "../common/AutoIncrVector.h" @@ -15,6 +14,3 @@ public: void Write(const DataMessage& msg, uint64_t image_number) override; void WriteFinal(HDF5File &data_file) override; }; - - -#endif //JUNGFRAUJOCH_HDF5DATAFILEPLUGINXFEL_H diff --git a/writer/HDF5Objects.h b/writer/HDF5Objects.h index c2fe512b..d4945359 100644 --- a/writer/HDF5Objects.h +++ b/writer/HDF5Objects.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_HDF5OBJECTS_H -#define JUNGFRAUJOCH_HDF5OBJECTS_H +#pragma once #include #include @@ -542,5 +541,3 @@ inline std::string hdf5_version() { void RegisterHDF5Filter(); std::string ExtractFilename(const std::string& str); - -#endif //JUNGFRAUJOCH_HDF5OBJECTS_H diff --git a/writer/MakeDirectory.h b/writer/MakeDirectory.h index 44f81ad7..6d2052fe 100644 --- a/writer/MakeDirectory.h +++ b/writer/MakeDirectory.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_MAKEDIRECTORY_H -#define JUNGFRAUJOCH_MAKEDIRECTORY_H +#pragma once #include #include "../common/JFJochException.h" @@ -17,7 +16,3 @@ inline void MakeDirectory(const std::string &input) { "Cannot create subdirectory for file " + input + ": " + std::string(err.what())); } } - - - -#endif //JUNGFRAUJOCH_MAKEDIRECTORY_H diff --git a/writer/StreamWriter.h b/writer/StreamWriter.h index 301a4e6f..95c18bed 100644 --- a/writer/StreamWriter.h +++ b/writer/StreamWriter.h @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute // SPDX-License-Identifier: GPL-3.0-only -#ifndef JUNGFRAUJOCH_STREAMWRITER_H -#define JUNGFRAUJOCH_STREAMWRITER_H +#pragma once #include @@ -78,6 +77,3 @@ public: StreamWriterStatistics GetStatistics() const; void DebugSkipWriteNotification(bool input); }; - - -#endif //JUNGFRAUJOCH_STREAMWRITER_H