diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 728648026..e908aa988 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1779,49 +1779,6 @@ void multiSlsDetector::resetFinalDataQueue() } } -// int64_t multiSlsDetector::setTimer(timerIndex index, int64_t t) -// { - -// int64_t ret = -100; - -// if (!threadpool) { -// cout << "Error in creating threadpool. Exiting" << endl; -// return -1; -// } else { -// //return storage values -// int64_t* iret[thisMultiDetector->numberOfDetectors]; -// for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) { -// if (detectors[idet]) { -// iret[idet] = new int64_t(-1); -// Task* task = new Task(new func2_t(&slsDetector::setTimer, -// detectors[idet], index, t, 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)); -// } -// } -// } - -// if (index == SAMPLES_JCTB) -// setDynamicRange(); - -// thisMultiDetector->timerValue[index] = ret; -// return ret; -// } int64_t multiSlsDetector::setTimer(timerIndex index, int64_t t) { int64_t ret = parallelCallDetectorMember(&slsDetector::setTimer, index, t);