detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +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 #ifdef VERBOSE
cout << "returning type " << pos << endl; cout << "returning type of detector with ID " << pos << endl;
#endif #endif
if (pos>=0) { if (pos>=0) {
if (detectors[pos]) if (detectors[pos])

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

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

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1265,9 +1265,8 @@ int slsDetector::setDetectorType(string const stype){
return setDetectorType(getDetectorType(stype)); return setDetectorType(getDetectorType(stype));
}; };
string slsDetector::getDetectorsType(int pos){ slsDetectorDefs::detectorType slsDetector::getDetectorsType(int pos){
return getDetectorType(thisDetector->myDetectorType); return thisDetector->myDetectorType;
} }

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -602,9 +602,9 @@ typedef struct sharedSlsDetector {
/** /**
gets detector type gets detector type
normally the detector knows what type of detector it is normally the detector knows what type of detector it is
\param type is the string where the detector type will be written ("Mythen", "Pilatus", "XFS", "Gotthard", Agipd") \returns returns detector type index (1 GENERIC, 2 MYTHEN, 3 PILATUS, 4 XFS, 5 GOTTHARD, 6 AGIPD, -1 command failed)
*/ */
string getDetectorsType(int pos=-1); detectorType getDetectorsType(int pos=-1);
// Detector configuration functions // Detector configuration functions

2
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -115,7 +115,7 @@ class slsDetectorUtils : public slsDetectorActions, public slsDetectorBase {
\param pos position in the multi detector structure (is -1 returns type of detector with id -1) \param pos position in the multi detector structure (is -1 returns type of detector with id -1)
\returns type \returns type
*/ */
virtual string getDetectorsType(int pos=-1)=0; virtual detectorType getDetectorsType(int pos=-1)=0;