detectors/slsDetectorPackage
24
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-13 21:29:31 +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

49
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -3552,38 +3552,39 @@ int multiSlsDetector::getTrimEn(int* ene)
returns the location of the calibration files
\sa sharedSlsDetector
*/
char* multiSlsDetector::getCalDir()
string multiSlsDetector::getCalDir()
{
string s0 = "", s1 = "", s;
//char ans[1000];
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
s = detectors[idet]->getCalDir();
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
return callDetectors(&slsDetector::getCalDir);
// string s0 = "", s1 = "", s;
// //char ans[1000];
// for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
// if (detectors[idet]) {
// s = detectors[idet]->getCalDir();
// if (detectors[idet]->getErrorMask())
// setErrorMask(getErrorMask() | (1 << idet));
if (s0 == "")
s0 = s;
else
s0 += string("+") + s;
if (s1 == "")
s1 = s;
else if (s1 != s)
s1 = "bad";
}
}
if (s1 == "bad")
strcpy(ans, s0.c_str());
else
strcpy(ans, s1.c_str());
return ans;
// if (s0 == "")
// s0 = s;
// else
// s0 += string("+") + s;
// if (s1 == "")
// s1 = s;
// else if (s1 != s)
// s1 = "bad";
// }
// }
// if (s1 == "bad")
// strcpy(ans, s0.c_str());
// else
// strcpy(ans, s1.c_str());
// return ans;
}
/**
sets the location of the calibration files
\sa sharedSlsDetector
*/
char* multiSlsDetector::setCalDir(string s)
string multiSlsDetector::setCalDir(string s)
{
if (s.find('+') == string::npos) {

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -1054,12 +1054,12 @@ class multiSlsDetector : public slsDetectorUtils {
returns the location of the calibration files
\sa sharedSlsDetector
*/
char* getCalDir();
std::string getCalDir();
/**
sets the location of the calibration files
\sa sharedSlsDetector
*/
char* setCalDir(std::string s);
std::string setCalDir(std::string s);
std::string getNetworkParameter(networkParameter);