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

WIP

Browse Source
This commit is contained in:
maliakal_d 2020-06-30 11:59:35 +02:00
parent 488e0230ba
commit ff729fb43f
8 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

1
slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
View File

@ -120,7 +120,6 @@ int program_fpga(int);
int reset_fpga(int); int reset_fpga(int);
int power_chip(int); int power_chip(int);
int set_activate(int); int set_activate(int);
int prepare_acquisition(int);
int threshold_temp(int); int threshold_temp(int);
int temp_control(int); int temp_control(int);
int temp_event(int); int temp_event(int);

21
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -240,7 +240,6 @@ void function_table() {
flist[F_RESET_FPGA] = &reset_fpga; flist[F_RESET_FPGA] = &reset_fpga;
flist[F_POWER_CHIP] = &power_chip; flist[F_POWER_CHIP] = &power_chip;
flist[F_ACTIVATE] = &set_activate; flist[F_ACTIVATE] = &set_activate;
flist[F_PREPARE_ACQUISITION] = &prepare_acquisition;
flist[F_THRESHOLD_TEMP] = &threshold_temp; flist[F_THRESHOLD_TEMP] = &threshold_temp;
flist[F_TEMP_CONTROL] = &temp_control; flist[F_TEMP_CONTROL] = &temp_control;
flist[F_TEMP_EVENT] = &temp_event; flist[F_TEMP_EVENT] = &temp_event;
@ -3819,26 +3818,6 @@ int set_activate(int file_des) {
return Server_SendResult(file_des, INT32, &retval, sizeof(retval)); return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
} }
int prepare_acquisition(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
LOG(logDEBUG1, ("Preparing Acquisition\n"));
#ifndef EIGERD
functionNotImplemented();
#else
// only set
if (Server_VerifyLock() == OK) {
ret = prepareAcquisition();
if (ret == FAIL) {
strcpy(mess, "Could not prepare acquisition\n");
LOG(logERROR, (mess));
}
}
#endif
return Server_SendResult(file_des, INT32, NULL, 0);
}
// stop server // stop server
int threshold_temp(int file_des) { int threshold_temp(int file_des) {
ret = OK; ret = OK;

3
slsDetectorSoftware/src/Detector.cpp
View File

@ -525,9 +525,6 @@ void Detector::startReceiver() { pimpl->Parallel(&Module::startReceiver, {}); }
void Detector::stopReceiver() { pimpl->Parallel(&Module::stopReceiver, {}); } void Detector::stopReceiver() { pimpl->Parallel(&Module::stopReceiver, {}); }
void Detector::startDetector() { void Detector::startDetector() {
/*if (getDetectorType().squash() == defs::EIGER) {
pimpl->Parallel(&Module::prepareAcquisition, {});
}*/
pimpl->Parallel(&Module::startAcquisition, {}); pimpl->Parallel(&Module::startAcquisition, {});
} }

3
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1046,9 +1046,6 @@ int DetectorImpl::acquire() {
// start and read all // start and read all
try { try {
if (multi_shm()->multiDetectorType == EIGER) {
Parallel(&Module::prepareAcquisition, {});
}
Parallel(&Module::startAndReadAll, {}); Parallel(&Module::startAndReadAll, {});
} catch (...) { } catch (...) {
if (receiver) if (receiver)

2
slsDetectorSoftware/src/Module.cpp
View File

@ -367,8 +367,6 @@ void Module::stopReceiver() {
sendToReceiver(F_STOP_RECEIVER, arg, nullptr); sendToReceiver(F_STOP_RECEIVER, arg, nullptr);
} }
void Module::prepareAcquisition() { sendToDetector(F_PREPARE_ACQUISITION); }
void Module::startAcquisition() { void Module::startAcquisition() {
shm()->stoppedFlag = false; shm()->stoppedFlag = false;
sendToDetector(F_START_ACQUISITION); sendToDetector(F_START_ACQUISITION);

1
slsDetectorSoftware/src/Module.h
View File

@ -155,7 +155,6 @@ class Module : public virtual slsDetectorDefs {
* ************************************************/ * ************************************************/
void startReceiver(); void startReceiver();
void stopReceiver(); void stopReceiver();
void prepareAcquisition();
void startAcquisition(); void startAcquisition();
void stopAcquisition(); void stopAcquisition();
void startAndReadAll(); void startAndReadAll();

2
slsSupportLib/include/sls_detector_funcs.h
View File

@ -101,7 +101,6 @@ enum detFuncs {
F_RESET_FPGA, F_RESET_FPGA,
F_POWER_CHIP, F_POWER_CHIP,
F_ACTIVATE, F_ACTIVATE,
F_PREPARE_ACQUISITION,
F_THRESHOLD_TEMP, F_THRESHOLD_TEMP,
F_TEMP_CONTROL, F_TEMP_CONTROL,
F_TEMP_EVENT, F_TEMP_EVENT,
@ -404,7 +403,6 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
case F_RESET_FPGA: return "F_RESET_FPGA"; case F_RESET_FPGA: return "F_RESET_FPGA";
case F_POWER_CHIP: return "F_POWER_CHIP"; case F_POWER_CHIP: return "F_POWER_CHIP";
case F_ACTIVATE: return "F_ACTIVATE"; case F_ACTIVATE: return "F_ACTIVATE";
case F_PREPARE_ACQUISITION: return "F_PREPARE_ACQUISITION";
case F_THRESHOLD_TEMP: return "F_THRESHOLD_TEMP"; case F_THRESHOLD_TEMP: return "F_THRESHOLD_TEMP";
case F_TEMP_CONTROL: return "F_TEMP_CONTROL"; case F_TEMP_CONTROL: return "F_TEMP_CONTROL";
case F_TEMP_EVENT: return "F_TEMP_EVENT"; case F_TEMP_EVENT: return "F_TEMP_EVENT";