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

changed the getdetectorstype function to return type and not string

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@178 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-05-11 07:22:40 +00:00
parent e0333e9f84
commit b484ad7f20
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -401,11 +401,11 @@ string multiSlsDetector::getHostname(int pos) {
}
string multiSlsDetector::getDetectorsType(int pos) {
slsDetectorDefs::detectorType multiSlsDetector::getDetectorsType(int pos) {
string s=string("Unknown");
detectorType s =GENERIC;
#ifdef VERBOSE
cout << "returning type " << pos << endl;
cout << "returning type of detector with ID " << pos << endl;
#endif
if (pos>=0) {
if (detectors[pos])

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -264,7 +264,7 @@ class multiSlsDetector : public slsDetectorUtils {
string getHostname(int pos=-1);
string getDetectorsType(int pos=-1);
detectorType getDetectorsType(int pos=-1);
/** adds a detector by id in position pos