detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

still updating slsdetector.cpp

Browse Source
This commit is contained in:
maliakal_d 2018-10-25 16:24:05 +02:00
parent 261849d69c
commit cf87b6ca83
8 changed files with 1803 additions and 2432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1686,9 +1686,7 @@ void readFrame(int *ret, char *mess) {
//FILE_LOG(logERROR ,"Waiting for finished flag\n")); //FILE_LOG(logERROR ,"Waiting for finished flag\n"));
usleep(5000); usleep(5000);
} }
*ret = (int)FINISHED; FILE_LOG(logGREEN, ("acquisition successfully finished\n"));
strcpy(mess,"acquisition successfully finished\n"));
FILE_LOG(logGREEN, "%s", mess));
return; return;
#else #else
@ -1714,9 +1712,7 @@ void readFrame(int *ret, char *mess) {
FILE_LOG(logINFO, ("*****Done Waiting...\n")); FILE_LOG(logINFO, ("*****Done Waiting...\n"));
*ret = (int)FINISHED; FILE_LOG(logGREEN, ("acquisition successfully finished\n"));
strcpy(mess,"acquisition successfully finished\n");
FILE_LOG(logGREEN, (mess));
#endif #endif
} }

7
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1599,8 +1599,6 @@ void readFrame(int *ret, char *mess){
//cprintf(RED,"Waiting for finished flag\n"); //cprintf(RED,"Waiting for finished flag\n");
usleep(5000); usleep(5000);
} }
*ret = (int)FINISHED;
strcpy(mess,"acquisition successfully finished\n");
return; return;
#endif #endif
// wait for status to be done // wait for status to be done
@ -1615,9 +1613,8 @@ void readFrame(int *ret, char *mess){
sprintf(mess,"no data and run stopped: %lld frames left\n",(long long int)retval); sprintf(mess,"no data and run stopped: %lld frames left\n",(long long int)retval);
cprintf(RED,"%s\n",mess); cprintf(RED,"%s\n",mess);
} else { } else {
*ret = (int)FINISHED; *ret = (int)OK;
sprintf(mess,"acquisition successfully finished\n"); cprintf(GREEN, "acquisition successfully finished\n");
cprintf(GREEN, "%s",mess);
} }
} }

8
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -373,6 +373,7 @@ int exec_command(int file_des) {
int get_detector_type(int file_des) { int get_detector_type(int file_des) {
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess));
enum detectorType retval = myDetectorType; enum detectorType retval = myDetectorType;
FILE_LOG(logDEBUG5,("Returning detector type %d\n", retval)); FILE_LOG(logDEBUG5,("Returning detector type %d\n", retval));
return Server_SendResult(file_des, INT32, 1, &retval, sizeof(retval)); return Server_SendResult(file_des, INT32, 1, &retval, sizeof(retval));
@ -784,7 +785,7 @@ int get_adc(int file_des) {
int write_register(int file_des) { int write_register(int file_des) {
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
int args[2] = {-1, -1}; uint32_t args[2] = {-1, -1};
uint32_t retval = -1; uint32_t retval = -1;
if (receiveData(file_des, args, sizeof(args), INT32) < 0) if (receiveData(file_des, args, sizeof(args), INT32) < 0)
@ -1693,6 +1694,7 @@ int set_speed(int file_des) {
int exit_server(int file_des) { int exit_server(int file_des) {
cprintf(BG_RED,"Closing Server\n"); cprintf(BG_RED,"Closing Server\n");
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess));
Server_SendResult(file_des, INT32, 0, NULL, 0); Server_SendResult(file_des, INT32, 0, NULL, 0);
return GOODBYE; return GOODBYE;
} }
@ -1728,6 +1730,7 @@ int lock_server(int file_des) {
int get_last_client_ip(int file_des) { int get_last_client_ip(int file_des) {
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess));
return Server_SendResult(file_des, INT32, 1, lastClientIP, sizeof(lastClientIP)); return Server_SendResult(file_des, INT32, 1, lastClientIP, sizeof(lastClientIP));
} }
@ -1738,6 +1741,7 @@ int set_port(int file_des) {
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
int p_number = -1; int p_number = -1;
char oldLastClientIP[INET_ADDRSTRLEN] = {0};
if (receiveData(file_des, &p_number, sizeof(p_number), INT32) < 0) if (receiveData(file_des, &p_number, sizeof(p_number), INT32) < 0)
return printSocketReadError(); return printSocketReadError();
@ -1754,6 +1758,7 @@ int set_port(int file_des) {
} else { } else {
FILE_LOG(logINFO, ("Setting %s port to %d\n", FILE_LOG(logINFO, ("Setting %s port to %d\n",
(isControlServer ? "control":"stop"), p_number)); (isControlServer ? "control":"stop"), p_number));
strcpy(oldLastClientIP, lastClientIP);
sd = bindSocket(p_number); sd = bindSocket(p_number);
} }
} }
@ -1764,6 +1769,7 @@ int set_port(int file_des) {
closeConnection(file_des); closeConnection(file_des);
exitServer(sockfd); exitServer(sockfd);
sockfd = sd; sockfd = sd;
strcpy(lastClientIP, oldLastClientIP);
} }
return ret; return ret;
} }

2839
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

File diff suppressed because it is too large Load Diff

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1295,7 +1295,7 @@ public:
* @param gainval pointer to extra gain values * @param gainval pointer to extra gain values
* @param offsetval pointer to extra offset values * @param offsetval pointer to extra offset values
* @param tb 1 to include trimbits, 0 to exclude (used for eiger) * @param tb 1 to include trimbits, 0 to exclude (used for eiger)
* @returns current register value * @returns ok or fail
* \sa ::sls_detector_module * \sa ::sls_detector_module
*/ */
int setModule(sls_detector_module module, int iodelay, int tau, int e_eV, int setModule(sls_detector_module module, int iodelay, int tau, int e_eV,

58
slsReceiverSoftware/include/GeneralData.h
View File

@ -398,64 +398,6 @@ private:
class Moench02Data : public GeneralData {
public:
/** Bytes Per Adc */
const static uint32_t bytesPerAdc = (40*2);
/** Constructor */
Moench02Data(){
myDetectorType = slsDetectorDefs::MOENCH;
nPixelsX = 160;
nPixelsY = 160;
headerSizeinPacket = 4;
dataSize = 1280;
packetSize = 1286;
packetsPerFrame = 40;
imageSize = dataSize*packetsPerFrame;
frameIndexMask = 0xFFFFFF00;
frameIndexOffset = 8;
packetIndexMask = 0xFF;
maxFramesPerFile = MOENCH_MAX_FRAMES_PER_FILE;
fifoBufferHeaderSize= FIFO_HEADER_NUMBYTES + sizeof(slsDetectorDefs::sls_receiver_header);
defaultFifoDepth = 2500;
};
/**
* Print all variables
*/
void Print() const {
GeneralData::Print();
FILE_LOG(logINFO) << "Bytes Per Adc: " << bytesPerAdc;
}
};
class Moench03Data : public GeneralData {
public:
/** Constructor */
Moench03Data(){
myDetectorType = slsDetectorDefs::MOENCH;
nPixelsX = 400;
nPixelsY = 400;
headerSizeinPacket = 22;
dataSize = 8192;
packetSize = headerSizeinPacket + dataSize;
packetsPerFrame = 40;
imageSize = dataSize*packetsPerFrame;
frameIndexMask = 0xFFFFFFFF;
frameIndexOffset = (6+8);
packetIndexMask = 0xFFFFFFFF;
maxFramesPerFile = JFRAU_MAX_FRAMES_PER_FILE;
fifoBufferHeaderSize= FIFO_HEADER_NUMBYTES + sizeof(slsDetectorDefs::sls_receiver_header);
defaultFifoDepth = 2500;
};
};
class JCTBData : public GeneralData { class JCTBData : public GeneralData {

26
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -334,7 +334,7 @@ int slsReceiverTCPIPInterface::exec_command() {
int slsReceiverTCPIPInterface::exit_server() { int slsReceiverTCPIPInterface::exit_server() {
cprintf(RED,"Closing server\n"); cprintf(RED,"Closing server\n");
memset(mess, 0, sizeof(mess));
ret = OK; ret = OK;
interface->Server_SendResult(false, ret, NULL, 0); interface->Server_SendResult(false, ret, NULL, 0);
return GOODBYE; return GOODBYE;
@ -350,6 +350,7 @@ int slsReceiverTCPIPInterface::lock_receiver() {
// get args, return if socket crashed // get args, return if socket crashed
if (interface->Server_ReceiveArg(ret, mess, &lock, sizeof(lock)) == FAIL) if (interface->Server_ReceiveArg(ret, mess, &lock, sizeof(lock)) == FAIL)
return FAIL; return FAIL;
FILE_LOG(logDEBUG5) << "Locking Server to " << lock;
// execute action // execute action
if (lock >= 0) { if (lock >= 0) {
@ -362,7 +363,6 @@ int slsReceiverTCPIPInterface::lock_receiver() {
} else } else
interface->Server_LockedError(ret, mess); interface->Server_LockedError(ret, mess);
} }
return interface->Server_SendResult(true, ret, &lockStatus,sizeof(lockStatus), mess); return interface->Server_SendResult(true, ret, &lockStatus,sizeof(lockStatus), mess);
} }
@ -548,8 +548,8 @@ int slsReceiverTCPIPInterface::send_update() {
int slsReceiverTCPIPInterface::get_id(){ int slsReceiverTCPIPInterface::get_id(){
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess));
int64_t retval = getReceiverVersion(); int64_t retval = getReceiverVersion();
return interface->Server_SendResult(true, ret, &retval, sizeof(retval)); return interface->Server_SendResult(true, ret, &retval, sizeof(retval));
} }
@ -609,8 +609,7 @@ int slsReceiverTCPIPInterface::set_detector_type(){
} }
//get //get
retval = myDetectorType; retval = myDetectorType;
return interface->Server_SendResult(false, ret, &retval, sizeof(retval), mess);
return interface->Server_SendResult(true, ret, &retval, sizeof(retval), mess);
} }
@ -700,6 +699,7 @@ int slsReceiverTCPIPInterface::set_roi() {
int slsReceiverTCPIPInterface::setup_udp(){ int slsReceiverTCPIPInterface::setup_udp(){
memset(mess, 0, sizeof(mess));
char args[3][MAX_STR_LENGTH] = {0}; char args[3][MAX_STR_LENGTH] = {0};
char retval[MAX_STR_LENGTH] = {0}; char retval[MAX_STR_LENGTH] = {0};
@ -774,29 +774,38 @@ int slsReceiverTCPIPInterface::set_timer() {
// base object not null // base object not null
if (ret == OK) { if (ret == OK) {
FILE_LOG(logDEBUG5, ("Setting timer index %d to %lld ns\n", index[0], index[1]));
char timername[100] = {0};
// set // set
if (index[1] >= 0) { if (index[1] >= 0) {
// verify if receiver is unlocked // verify if receiver is unlocked
if (interface->Server_VerifyLock(ret, mess, lockStatus) == OK) { if (interface->Server_VerifyLock(ret, mess, lockStatus) == OK) {
switch (index[0]) { switch (index[0]) {
case ACQUISITION_TIME: case ACQUISITION_TIME:
strcpy(timername, "exptime");
ret = receiver->setAcquisitionTime(index[1]); ret = receiver->setAcquisitionTime(index[1]);
break; break;
case FRAME_PERIOD: case FRAME_PERIOD:
strcpy(timername, "period");
ret = receiver->setAcquisitionPeriod(index[1]); ret = receiver->setAcquisitionPeriod(index[1]);
break; break;
case FRAME_NUMBER: case FRAME_NUMBER:
case CYCLES_NUMBER: case CYCLES_NUMBER:
case STORAGE_CELL_NUMBER: case STORAGE_CELL_NUMBER:
strcpy(timername, "frames_cycles_storagecells");
receiver->setNumberOfFrames(index[1]); receiver->setNumberOfFrames(index[1]);
break; break;
case SUBFRAME_ACQUISITION_TIME: case SUBFRAME_ACQUISITION_TIME:
strcpy(timername, "subexptime");
receiver->setSubExpTime(index[1]); receiver->setSubExpTime(index[1]);
break; break;
case SUBFRAME_DEADTIME: case SUBFRAME_DEADTIME:
strcpy(timername, "subdeadtime");
receiver->setSubPeriod(index[1] + receiver->getSubExpTime()); receiver->setSubPeriod(index[1] + receiver->getSubExpTime());
break; break;
case SAMPLES_JCTB: case SAMPLES_JCTB:
strcpy(timername, "samples");
if (myDetectorType != JUNGFRAUCTB) { if (myDetectorType != JUNGFRAUCTB) {
ret = FAIL; ret = FAIL;
sprintf(mess,"This timer mode (%lld) does not exist for this receiver type\n", (long long int)index[0]); sprintf(mess,"This timer mode (%lld) does not exist for this receiver type\n", (long long int)index[0]);
@ -806,6 +815,7 @@ int slsReceiverTCPIPInterface::set_timer() {
receiver->setNumberofSamples(index[1]); receiver->setNumberofSamples(index[1]);
break; break;
default: default:
strcpy(timername, "unknown");
ret = FAIL; ret = FAIL;
sprintf(mess,"This timer mode (%lld) does not exist for receiver\n", (long long int)index[0]); sprintf(mess,"This timer mode (%lld) does not exist for receiver\n", (long long int)index[0]);
FILE_LOG(logERROR) << mess; FILE_LOG(logERROR) << mess;
@ -849,12 +859,11 @@ int slsReceiverTCPIPInterface::set_timer() {
// check // check
if (ret == OK && index[1] >= 0 && retval != index[1]) { if (ret == OK && index[1] >= 0 && retval != index[1]) {
ret = FAIL; ret = FAIL;
strcpy(mess,"Could not set timer\n"); strcpy(mess,"Could not set timer %s\n", timername);
FILE_LOG(logERROR) << mess; FILE_LOG(logERROR) << mess;
} }
FILE_LOG(logDEBUG1) << slsDetectorDefs::getTimerType((timerIndex)(index[0])) << ":" << retval; FILE_LOG(logDEBUG1) << slsDetectorDefs::getTimerType((timerIndex)(index[0])) << ":" << retval;
} }
return interface->Server_SendResult(true, ret, &retval, sizeof(retval), mess); return interface->Server_SendResult(true, ret, &retval, sizeof(retval), mess);
} }
@ -1873,8 +1882,6 @@ int slsReceiverTCPIPInterface::check_version_compatibility() {
// get args, return if socket crashed // get args, return if socket crashed
if (interface->Server_ReceiveArg(ret, mess, &arg, sizeof(arg)) == FAIL) if (interface->Server_ReceiveArg(ret, mess, &arg, sizeof(arg)) == FAIL)
return FAIL; return FAIL;
FILE_LOG(logDEBUG1) << "Checking versioning compatibility with value " << arg; FILE_LOG(logDEBUG1) << "Checking versioning compatibility with value " << arg;
int64_t client_requiredVersion = arg; int64_t client_requiredVersion = arg;
int64_t rx_apiVersion = APIRECEIVER; int64_t rx_apiVersion = APIRECEIVER;
@ -1902,7 +1909,6 @@ int slsReceiverTCPIPInterface::check_version_compatibility() {
FILE_LOG(logERROR) << mess; FILE_LOG(logERROR) << mess;
} }
else FILE_LOG(logINFO) << "Compatibility with Client: Successful"; else FILE_LOG(logINFO) << "Compatibility with Client: Successful";
return interface->Server_SendResult(true, ret, NULL, 0, mess); return interface->Server_SendResult(true, ret, NULL, 0, mess);
} }

1
slsSupportLib/include/sls_detector_defs.h
View File

@ -92,7 +92,6 @@ public:
enum { enum {
OK, /**< function succeeded */ OK, /**< function succeeded */
FAIL, /**< function failed */ FAIL, /**< function failed */
FINISHED, /**< acquisition finished */
FORCE_UPDATE FORCE_UPDATE
}; };