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

merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file

Browse Source
This commit is contained in:
maliakal_d
2018-02-07 11:02:36 +01:00
parent 3da6a6df65 ecf1e9fac1
commit 897cbac27d
31 changed files with 170 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -295,7 +295,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
/**
returns currently the loaded trimfile/settingsfile name
*/
virtual const char *getSettingsFile()=0;
virtual string getSettingsFile()=0;
/**