detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 17:37:45 +01:00
Code Issues Actions Packages Releases Activity

changed type of getCalDir to std::string

Browse Source
This commit is contained in:
Erik Frojdh
2018-05-25 10:30:02 +02:00
parent abdf4b1ada
commit f45e2b4ab9
6 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@@ -493,12 +493,12 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
returns the location of the calibration files
\sa sharedSlsDetector
*/
char* getCalDir() {return thisDetector->calDir;};
std::string getCalDir() {return thisDetector->calDir;};
/**
sets the location of the calibration files
\sa sharedSlsDetector
*/
char* setCalDir(string s) {sprintf(thisDetector->calDir, s.c_str()); return thisDetector->calDir;};
std::string setCalDir(string s) {sprintf(thisDetector->calDir, s.c_str()); return thisDetector->calDir;};