detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-07-05 23:54:47 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
maliakal_d
2019-04-12 14:05:46 +02:00
parent 4cbf8483ba 77c1ffffb1
commit 192ac229e9
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -80,9 +80,12 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
message(FATAL_ERROR "GCC version must be at least 4.8!") message(FATAL_ERROR "GCC version must be at least 4.8!")
endif() endif()
target_compile_options(slsProjectWarnings INTERFACE
) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
target_compile_options(slsProjectWarnings INTERFACE
-Wno-missing-field-initializers)
endif()
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
target_compile_options(slsProjectWarnings INTERFACE target_compile_options(slsProjectWarnings INTERFACE
-Wno-misleading-indentation # mostly in rapidjson remove using clang format -Wno-misleading-indentation # mostly in rapidjson remove using clang format

4
python/src/Detector.h
View File

@ -676,8 +676,6 @@ class Detector {
void Detector::setFileFormat(const std::string &format) { void Detector::setFileFormat(const std::string &format) {
if (format == "binary") { if (format == "binary") {
det.setFileFormat(slsDetectorDefs::fileFormat::BINARY); det.setFileFormat(slsDetectorDefs::fileFormat::BINARY);
} else if (format == "ascii") {
det.setFileFormat(slsDetectorDefs::fileFormat::ASCII);
} else if (format == "hdf5") { } else if (format == "hdf5") {
det.setFileFormat(slsDetectorDefs::fileFormat::HDF5); det.setFileFormat(slsDetectorDefs::fileFormat::HDF5);
} }
@ -689,8 +687,6 @@ std::string Detector::getFileFormat() {
switch (format) { switch (format) {
case slsDetectorDefs::fileFormat::BINARY: case slsDetectorDefs::fileFormat::BINARY:
return "binary"; return "binary";
case slsDetectorDefs::fileFormat::ASCII:
return "ascii";
case slsDetectorDefs::fileFormat::HDF5: case slsDetectorDefs::fileFormat::HDF5:
return "hdf5"; return "hdf5";
default: default: