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

replacing pulsechip with a generic algorithm

Browse Source
This commit is contained in:
Erik Frojdh 2018-05-25 15:10:57 +02:00
parent f735baf9d7
commit bbd7e7906a
3 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -24,6 +24,7 @@ ID: $Id$
#include <sys/shm.h>
#include <sys/types.h>
#include <vector>
// char ans[MAX_STR_LENGTH];
int multiSlsDetector::freeSharedMemory()
@ -1047,7 +1048,7 @@ string multiSlsDetector::checkOnline()
int multiSlsDetector::activate(int const enable)
{
return callDetectorMemeber(&slsDetector::activate, enable);
return callDetectorMemeber(&slsDetector::activate, enable);
}
int multiSlsDetector::exists()
@ -3412,7 +3413,6 @@ int multiSlsDetector::callDetectorMemeber(int (slsDetector::*somefunc)(int), int
int ret = -100, ret1;
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet)
if (detectors[idet]) {
// ret1 = detectors[idet]->setReceiverSilentMode(i);
ret1 = (detectors[idet]->*somefunc)(value);
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
@ -3452,6 +3452,42 @@ string multiSlsDetector::callDetectorMemeber(string (slsDetector::*somefunc)())
return firstValue;
}
int multiSlsDetector::parallelCallDetectorMember(int (slsDetector::*somefunc)(int), int value)
{
int ret = -100;
if (!threadpool) {
cout << "Error in creating threadpool. Exiting" << endl;
return -1;
} else {
std::vector<int> return_values(thisMultiDetector->numberOfDetectors, -1);
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
Task* task = new Task(new func1_t<int, int>(somefunc,
detectors[idet], value, &return_values[idet]));
threadpool->add_task(task);
}
}
threadpool->startExecuting();
threadpool->wait_for_tasks_to_complete();
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
cout << return_values[idet] << "\n";
if (detectors[idet]) {
if (ret == -100)
ret = return_values[idet];
else if (ret != return_values[idet])
ret = -1;
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
}
}
}
return ret;
}
/** returns the detector trimbit/settings directory */
string multiSlsDetector::getSettingsDir()
{
@ -3682,7 +3718,7 @@ int multiSlsDetector::setPort(portType t, int p)
int multiSlsDetector::lockServer(int p)
{
return callDetectorMemeber(&slsDetector::lockServer, p);
return callDetectorMemeber(&slsDetector::lockServer, p);
}
string multiSlsDetector::getLastClientIP()
@ -6329,43 +6365,11 @@ int multiSlsDetector::pulsePixelNMove(int n, int x, int y)
return ret;
}
int multiSlsDetector::pulseChip(int n)
{
int ret = -100;
if (!threadpool) {
cout << "Error in creating threadpool. Exiting" << endl;
return -1;
} else {
//return storage values
int* iret[thisMultiDetector->numberOfDetectors];
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
iret[idet] = new int(-1);
Task* task = new Task(new func1_t<int, int>(&slsDetector::pulseChip,
detectors[idet], n, iret[idet]));
threadpool->add_task(task);
}
}
threadpool->startExecuting();
threadpool->wait_for_tasks_to_complete();
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
if (iret[idet] != NULL) {
if (ret == -100)
ret = *iret[idet];
else if (ret != *iret[idet])
ret = -1;
delete iret[idet];
} else
ret = -1;
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
}
}
}
return ret;
return parallelCallDetectorMember(&slsDetector::pulseChip, n);
}
void multiSlsDetector::setAcquiringFlag(bool b)

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1046,6 +1046,8 @@ class multiSlsDetector : public slsDetectorUtils {
std::string callDetectorMemeber(std::string(slsDetector::*somefunc)());
int callDetectorMemeber(int (slsDetector::*somefunc)(int), int value);
int parallelCallDetectorMember(int (slsDetector::*somefunc)(int), int value); //Should probably be templated
/** returns the detector trimbit/settings directory \sa sharedSlsDetector */
std::string getSettingsDir();

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1310,7 +1310,7 @@ int slsDetector::setOnline(int off) {
string slsDetector::checkOnline() {
string retval = string("");
string retval;
if(!controlSocket){
//this already sets the online/offline flag
setTCPSocket();