detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-21 00:58:01 +02:00
Code Issues Actions Packages Releases Activity

clang-tidy fix from NULL 0 etc to nullptr

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-09 12:02:49 +01:00
parent b7aac059c3
commit 26f8ca3221
2 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -994,7 +994,7 @@ class multiSlsDetector : public virtual slsDetectorDefs,
* @param detPos -1 for all detectors in list or specific detector position
* @returns OK or FAIL
*/
int setROI(int n = -1, ROI roiLimits[] = NULL, int detPos = -1);
int setROI(int n = -1, ROI roiLimits[] = nullptr, int detPos = -1);
/**
* Get ROI from each detector and convert it to the multi detector scale
@ -1075,7 +1075,7 @@ class multiSlsDetector : public virtual slsDetectorDefs,
* @param detPos -1 for all detectors in list or specific detector position
* @returns number of trim energies
*/
int setTrimEn(int nen, int *en = NULL, int detPos = -1);
int setTrimEn(int nen, int *en = nullptr, int detPos = -1);
/**
* Returns the number of trim energies and their value (Eiger)
@ -1084,7 +1084,7 @@ class multiSlsDetector : public virtual slsDetectorDefs,
* @param detPos -1 for all detectors in list or specific detector position
* @returns number of trim energies
*/
int getTrimEn(int *en = NULL, int detPos = -1);
int getTrimEn(int *en = nullptr, int detPos = -1);
/**
* Pulse Pixel (Eiger)