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

compiles, but doesnt run

Browse Source
This commit is contained in:
maliakal_d 2018-10-29 15:23:52 +01:00
parent 33ac63d14a
commit 92fc837eb4
11 changed files with 1034 additions and 1286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -306,7 +306,7 @@ int M_nofunc(int file_des) {
while (n > 0) while (n > 0)
n = receiveData(file_des,mess,MAX_STR_LENGTH,OTHER); n = receiveData(file_des,mess,MAX_STR_LENGTH,OTHER);
strcpy(mess,"Unrecognized Function. Please do not proceed.\n"); sprintf(mess,"Unrecognized Function enum %d. Please do not proceed.\n", fnum);
FILE_LOG(logERROR, (mess)); FILE_LOG(logERROR, (mess));
return Server_SendResult(file_des, OTHER, 0, NULL, 0); return Server_SendResult(file_des, OTHER, 0, NULL, 0);
} }
@ -344,7 +344,7 @@ int exec_command(int file_des) {
FILE_LOG(logINFO, ("Executing command (%s)\n", cmd)); FILE_LOG(logINFO, ("Executing command (%s)\n", cmd));
// set // set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
FILE* sysFile = popen(cmd, "r"); FILE* sysFile = popen(cmd, "r");
const size_t tempsize = 256; const size_t tempsize = 256;
char temp[tempsize]; char temp[tempsize];
@ -398,7 +398,7 @@ int set_external_signal_flag(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set // set
if ((flag != GET_EXTERNAL_SIGNAL_FLAG) && (Server_VerifyLock() != FAIL)) { if ((flag != GET_EXTERNAL_SIGNAL_FLAG) && (Server_VerifyLock() == OK)) {
setExtSignal(signalindex, flag); setExtSignal(signalindex, flag);
} }
// get // get
@ -424,7 +424,7 @@ int set_external_communication_mode(int file_des) {
FILE_LOG(logDEBUG5, ("Setting external communication mode to %d\n", arg)); FILE_LOG(logDEBUG5, ("Setting external communication mode to %d\n", arg));
// set // set
if ((arg != GET_EXTERNAL_COMMUNICATION_MODE) && (Server_VerifyLock() != FAIL)) { if ((arg != GET_EXTERNAL_COMMUNICATION_MODE) && (Server_VerifyLock() == OK)) {
switch (arg) { switch (arg) {
case AUTO_TIMING: case AUTO_TIMING:
case TRIGGER_EXPOSURE: case TRIGGER_EXPOSURE:
@ -501,7 +501,7 @@ int digital_test(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
switch (mode) { switch (mode) {
#ifdef GOTTHARDD #ifdef GOTTHARDD
case DIGITAL_BIT_TEST: case DIGITAL_BIT_TEST:
@ -634,7 +634,7 @@ int set_dac(int file_des) {
(mV ? "mV" : "dac units"))); (mV ? "mV" : "dac units")));
// set & get // set & get
if ((val == -1) || ((val != -1) && (Server_VerifyLock() != FAIL))) { if ((val == -1) || ((val != -1) && (Server_VerifyLock() == OK))) {
switch(ind) { switch(ind) {
// io delay // io delay
@ -793,7 +793,7 @@ int write_register(int file_des) {
FILE_LOG(logDEBUG5, ("Writing to register 0x%x, data 0x%x\n", addr, val)); FILE_LOG(logDEBUG5, ("Writing to register 0x%x, data 0x%x\n", addr, val));
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
retval = writeRegister(addr, val); retval = writeRegister(addr, val);
// validate // validate
if (retval != val) { if (retval != val) {
@ -912,7 +912,7 @@ int set_module(int file_des) {
} }
// only set // only set
else if (Server_VerifyLock() != FAIL) { else if (Server_VerifyLock() == OK) {
// check index // check index
switch (module.reg) { switch (module.reg) {
#ifdef EIGERD #ifdef EIGERD
@ -1043,7 +1043,7 @@ int set_settings(int file_des) {
FILE_LOG(logDEBUG5, ("Setting settings %d\n", isett)); FILE_LOG(logDEBUG5, ("Setting settings %d\n", isett));
//set & get //set & get
if ((isett == GET_SETTINGS) || ((isett != GET_SETTINGS) && (Server_VerifyLock() != FAIL))) { if ((isett == GET_SETTINGS) || ((isett != GET_SETTINGS) && (Server_VerifyLock() == OK))) {
// check index // check index
switch(isett) { switch(isett) {
@ -1123,7 +1123,7 @@ int start_acquisition(int file_des) {
FILE_LOG(logDEBUG5, ("Starting Acquisition\n")); FILE_LOG(logDEBUG5, ("Starting Acquisition\n"));
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = startStateMachine(); ret = startStateMachine();
if (ret == FAIL) { if (ret == FAIL) {
sprintf(mess, "Could not start acquisition\n"); sprintf(mess, "Could not start acquisition\n");
@ -1142,7 +1142,7 @@ int stop_acquisition(int file_des) {
FILE_LOG(logDEBUG5, ("Stopping Acquisition\n")); FILE_LOG(logDEBUG5, ("Stopping Acquisition\n"));
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = stopStateMachine(); ret = stopStateMachine();
if (ret == FAIL) { if (ret == FAIL) {
sprintf(mess, "Could not stop acquisition\n"); sprintf(mess, "Could not stop acquisition\n");
@ -1166,7 +1166,7 @@ int start_readout(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = startReadOut(); ret = startReadOut();
if (ret == FAIL) { if (ret == FAIL) {
sprintf(mess, "Could not start readout\n"); sprintf(mess, "Could not start readout\n");
@ -1207,7 +1207,7 @@ int start_and_read_all(int file_des) {
// start state machine // start state machine
FILE_LOG(logDEBUG5, ("Stopping Acquisition\n")); FILE_LOG(logDEBUG5, ("Stopping Acquisition\n"));
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = startStateMachine(); ret = startStateMachine();
if (ret == FAIL) { if (ret == FAIL) {
sprintf(mess, "Could not start acquisition\n"); sprintf(mess, "Could not start acquisition\n");
@ -1234,7 +1234,7 @@ int read_all(int file_des) {
FILE_LOG(logDEBUG5, ("Reading all frames\n")); FILE_LOG(logDEBUG5, ("Reading all frames\n"));
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
readFrame(&ret, mess); readFrame(&ret, mess);
} }
return Server_SendResult(file_des, INT32, 1 , NULL, 0); return Server_SendResult(file_des, INT32, 1 , NULL, 0);
@ -1261,7 +1261,7 @@ int set_timer(int file_des) {
FILE_LOG(logDEBUG5, ("Setting timer index %d to %lld ns\n", ind, tns)); FILE_LOG(logDEBUG5, ("Setting timer index %d to %lld ns\n", ind, tns));
// set & get // set & get
if ((tns == -1) || ((tns != -1) && (Server_VerifyLock() != FAIL))) { if ((tns == -1) || ((tns != -1) && (Server_VerifyLock() == OK))) {
// check index // check index
switch (ind) { switch (ind) {
@ -1395,7 +1395,7 @@ int set_dynamic_range(int file_des) {
FILE_LOG(logDEBUG5, ("Setting dr to %d\n", dr)); FILE_LOG(logDEBUG5, ("Setting dr to %d\n", dr));
// set & get // set & get
if ((dr == -1) || ((dr != -1) && (Server_VerifyLock() != FAIL))) { if ((dr == -1) || ((dr != -1) && (Server_VerifyLock() == OK))) {
#ifdef EIGERD #ifdef EIGERD
int old_dr = setDynamicRange(-1); int old_dr = setDynamicRange(-1);
@ -1463,7 +1463,7 @@ int set_readout_flags(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == GET_READOUT_FLAGS) || ((arg != GET_READOUT_FLAGS) && (Server_VerifyLock() != FAIL))) { if ((arg == GET_READOUT_FLAGS) || ((arg != GET_READOUT_FLAGS) && (Server_VerifyLock() == OK))) {
switch(arg) { switch(arg) {
case STORE_IN_RAM: case STORE_IN_RAM:
@ -1516,7 +1516,7 @@ int set_roi(int file_des) {
return printSocketReadError(); return printSocketReadError();
} }
} }
FILE_LOG(logDEBUG5, ("Set ROI (nroi:%d)\n", narg)); FILE_LOG(logDEBUG5, ("Set ROI (narg:%d)\n", narg));
{ {
int iloop = 0; int iloop = 0;
for (iloop = 0; iloop < narg; ++iloop) { for (iloop = 0; iloop < narg; ++iloop) {
@ -1529,7 +1529,7 @@ int set_roi(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == GET_READOUT_FLAGS) || ((arg != GET_READOUT_FLAGS) && (Server_VerifyLock() != FAIL))) { if ((arg == GET_READOUT_FLAGS) || ((arg != GET_READOUT_FLAGS) && (Server_VerifyLock() == OK))) {
retval = setROI(narg, arg, &nretval, &ret); retval = setROI(narg, arg, &nretval, &ret);
if (ret == FAIL) { if (ret == FAIL) {
sprintf(mess,"Could not set all roi. " sprintf(mess,"Could not set all roi. "
@ -1574,7 +1574,7 @@ int set_speed(int file_des) {
FILE_LOG(logDEBUG5, ("Setting speed index %d to %d\n", ind, val)); FILE_LOG(logDEBUG5, ("Setting speed index %d to %d\n", ind, val));
// set & get // set & get
if ((val == -1) || ((val != -1) && (Server_VerifyLock() != FAIL))) { if ((val == -1) || ((val != -1) && (Server_VerifyLock() == OK))) {
// check index // check index
switch(ind) { switch(ind) {
#ifdef JUNGFRAUD #ifdef JUNGFRAUD
@ -1605,7 +1605,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)); memset(mess, 0, sizeof(mess));
Server_SendResult(file_des, INT32, 0, NULL, 0); Server_SendResult(file_des, INT32, 0, NULL, 0);
@ -1661,7 +1661,7 @@ int set_port(int file_des) {
// set only // set only
int sd = -1; int sd = -1;
if ((Server_VerifyLock() != FAIL)) { if ((Server_VerifyLock() == OK)) {
// port number too low // port number too low
if (p_number < 1024) { if (p_number < 1024) {
ret = FAIL; ret = FAIL;
@ -1701,68 +1701,67 @@ int update_client(int file_des) {
int send_update(int file_des) { int send_update(int file_des) {
int n = 0; // if (n<0) should fail to stop talking to a closed client socket int n = 0;
int nm = 0; int i32 = -1;
int64_t retval = 0; int64_t i64 = -1;
n = sendData(file_des,lastClientIP,sizeof(lastClientIP),OTHER); n = sendData(file_des,lastClientIP,sizeof(lastClientIP),OTHER);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
i32 = setDynamicRange(GET_FLAG);
nm = setDynamicRange(GET_FLAG); n = sendData(file_des,&i32,sizeof(i32),INT32);
n = sendData(file_des,&nm,sizeof(nm),INT32);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
dataBytes = calculateDataBytes(); dataBytes = calculateDataBytes();
n = sendData(file_des,&dataBytes,sizeof(dataBytes),INT32); n = sendData(file_des,&dataBytes,sizeof(dataBytes),INT32);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
nm = (int)setSettings(GET_SETTINGS); i32 = (int)setSettings(GET_SETTINGS);
n = sendData(file_des,&nm,sizeof(nm),INT32); n = sendData(file_des,&i32,sizeof(i32),INT32);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
#ifdef EIGERD #ifdef EIGERD
nm = getThresholdEnergy(GET_FLAG); i32 = getThresholdEnergy(GET_FLAG);
n = sendData(file_des,&nm,sizeof(nm),INT32); n = sendData(file_des,&i32,sizeof(i32),INT32);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
#endif #endif
retval = setTimer(FRAME_NUMBER,GET_FLAG); i64 = setTimer(FRAME_NUMBER,GET_FLAG);
n = sendData(file_des,&retval,sizeof(int64_t),INT64); n = sendData(file_des,&i64,sizeof(i64),INT64);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
retval = setTimer(ACQUISITION_TIME,GET_FLAG); i64 = setTimer(ACQUISITION_TIME,GET_FLAG);
n = sendData(file_des,&retval,sizeof(int64_t),INT64); n = sendData(file_des,&i64,sizeof(i64),INT64);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
#ifdef EIGERD #ifdef EIGERD
retval = setTimer(SUBFRAME_ACQUISITION_TIME,GET_FLAG); i64 = setTimer(SUBFRAME_ACQUISITION_TIME,GET_FLAG);
n = sendData(file_des,&retval,sizeof(int64_t),INT64); n = sendData(file_des,&i64,sizeof(i64),INT64);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
retval = setTimer(SUBFRAME_DEADTIME,GET_FLAG); i64 = setTimer(SUBFRAME_DEADTIME,GET_FLAG);
n = sendData(file_des,&retval,sizeof(int64_t),INT64); n = sendData(file_des,&i64,sizeof(i64),INT64);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
#endif #endif
retval = setTimer(FRAME_PERIOD,GET_FLAG); i64 = setTimer(FRAME_PERIOD,GET_FLAG);
n = sendData(file_des,&retval,sizeof(int64_t),INT64); n = sendData(file_des,&i64,sizeof(i64),INT64);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
#ifndef EIGERD #ifndef EIGERD
retval = setTimer(DELAY_AFTER_TRIGGER,GET_FLAG); i64 = setTimer(DELAY_AFTER_TRIGGER,GET_FLAG);
n = sendData(file_des,&retval,sizeof(int64_t),INT64); n = sendData(file_des,&i64,sizeof(i64),INT64);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
#endif #endif
#if !defined(EIGERD) && !defined(JUNGFRAUD) #if !defined(EIGERD) && !defined(JUNGFRAUD)
retval = setTimer(GATES_NUMBER,GET_FLAG); i64 = setTimer(GATES_NUMBER,GET_FLAG);
n = sendData(file_des,&retval,sizeof(int64_t),INT64); n = sendData(file_des,&i64,sizeof(i64),INT64);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
#endif #endif
retval = setTimer(CYCLES_NUMBER,GET_FLAG); i64 = setTimer(CYCLES_NUMBER,GET_FLAG);
n = sendData(file_des,&retval,sizeof(int64_t),INT64); n = sendData(file_des,&i64,sizeof(i64),INT64);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
if (lockStatus == 0) { if (lockStatus == 0) {
@ -1851,7 +1850,7 @@ int configure_mac(int file_des) {
#endif #endif
// set only // set only
if ((Server_VerifyLock() != FAIL)) { if ((Server_VerifyLock() == OK)) {
// stop detector if it was running // stop detector if it was running
if (getRunStatus() != IDLE) { if (getRunStatus() != IDLE) {
@ -1947,7 +1946,7 @@ int load_image(int file_des) {
#else #else
// set only // set only
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
switch (index) { switch (index) {
case DARK_IMAGE : case DARK_IMAGE :
case GAIN_IMAGE : case GAIN_IMAGE :
@ -1988,7 +1987,7 @@ int read_counter_block(int file_des) {
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = readCounterBlock(startACQ, retval); ret = readCounterBlock(startACQ, retval);
if (ret == FAIL) { if (ret == FAIL) {
strcpy(mess, "Could not read counter block\n"); strcpy(mess, "Could not read counter block\n");
@ -2017,7 +2016,7 @@ int reset_counter_block(int file_des) {
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = resetCounterBlock(startACQ); ret = resetCounterBlock(startACQ);
if (ret == FAIL) { if (ret == FAIL) {
strcpy(mess, "Could not reset counter block\n"); strcpy(mess, "Could not reset counter block\n");
@ -2046,7 +2045,7 @@ int enable_ten_giga(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() != FAIL))) { if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() == OK))) {
retval = enableTenGigabitEthernet(arg); retval = enableTenGigabitEthernet(arg);
FILE_LOG(logDEBUG5, ("10GbE: %d\n", retval)); FILE_LOG(logDEBUG5, ("10GbE: %d\n", retval));
validate(arg, retval, "enable/disable 10GbE", 0); validate(arg, retval, "enable/disable 10GbE", 0);
@ -2073,7 +2072,7 @@ int set_all_trimbits(int file_des) {
#else #else
// set // set
if (arg >= 0 && Server_VerifyLock() != FAIL) { if (arg >= 0 && Server_VerifyLock() == OK) {
ret = setAllTrimbits(arg); ret = setAllTrimbits(arg);
//changes settings to undefined //changes settings to undefined
setSettings(UNDEFINED); setSettings(UNDEFINED);
@ -2115,7 +2114,7 @@ int write_adc_register(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) if (Server_VerifyLock() == OK)
setAdc(addr, val); setAdc(addr, val);
#endif #endif
return Server_SendResult(file_des, INT32, 1, NULL, 0); return Server_SendResult(file_des, INT32, 1, NULL, 0);
@ -2139,7 +2138,7 @@ int set_counter_bit(int file_des) {
#else #else
// set // set
if (arg >= 0 && Server_VerifyLock() != FAIL) { if (arg >= 0 && Server_VerifyLock() == OK) {
setCounterBit(arg); setCounterBit(arg);
} }
// get // get
@ -2167,7 +2166,7 @@ int pulse_pixel(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = pulsePixel(args[0], args[1], args[2]); ret = pulsePixel(args[0], args[1], args[2]);
if (ret == FAIL) { if (ret == FAIL) {
strcpy(mess, "Could not pulse pixel\n"); strcpy(mess, "Could not pulse pixel\n");
@ -2195,7 +2194,7 @@ int pulse_pixel_and_move(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = pulsePixelNMove(args[0], args[1], args[2]); ret = pulsePixelNMove(args[0], args[1], args[2]);
if (ret == FAIL) { if (ret == FAIL) {
strcpy(mess, "Could not pulse pixel and move\n"); strcpy(mess, "Could not pulse pixel and move\n");
@ -2224,7 +2223,7 @@ int pulse_chip(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = pulseChip(arg); ret = pulseChip(arg);
if (ret == FAIL) { if (ret == FAIL) {
strcpy(mess, "Could not pulse chip\n"); strcpy(mess, "Could not pulse chip\n");
@ -2252,7 +2251,7 @@ int set_rate_correct(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
int dr = setDynamicRange(-1); int dr = setDynamicRange(-1);
@ -2320,7 +2319,7 @@ int set_network_parameter(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((value == -1) || ((value != -1) && (Server_VerifyLock() != FAIL))) { if ((value == -1) || ((value != -1) && (Server_VerifyLock() == OK))) {
// check index // check index
switch (mode) { switch (mode) {
#ifdef EIGERD #ifdef EIGERD
@ -2378,7 +2377,7 @@ int program_fpga(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
// not in programming mode // not in programming mode
if (debugflag != PROGRAMMING_MODE) { if (debugflag != PROGRAMMING_MODE) {
@ -2499,7 +2498,7 @@ int reset_fpga(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
if (isControlServer) { if (isControlServer) {
basictests(debugflag); // mapping of control server at least basictests(debugflag); // mapping of control server at least
if (debugflag != PROGRAMMING_MODE) if (debugflag != PROGRAMMING_MODE)
@ -2528,7 +2527,7 @@ int power_chip(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() != FAIL))) { if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() == OK))) {
retval = powerChip(arg); retval = powerChip(arg);
FILE_LOG(logDEBUG5, ("Power chip: %d\n", retval)); FILE_LOG(logDEBUG5, ("Power chip: %d\n", retval));
validate(arg, retval, "power on/off chip", 0); validate(arg, retval, "power on/off chip", 0);
@ -2561,7 +2560,7 @@ int set_activate(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() != FAIL))) { if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() == OK))) {
retval = activate(arg); retval = activate(arg);
FILE_LOG(logDEBUG5, ("Activate: %d\n", retval)); FILE_LOG(logDEBUG5, ("Activate: %d\n", retval));
validate(arg, retval, "set activate", 0); validate(arg, retval, "set activate", 0);
@ -2582,7 +2581,7 @@ int prepare_acquisition(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = prepareAcquisition(); ret = prepareAcquisition();
if (ret == FAIL) { if (ret == FAIL) {
strcpy(mess, "Could not prepare acquisition\n"); strcpy(mess, "Could not prepare acquisition\n");
@ -2611,7 +2610,7 @@ int threshold_temp(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() != FAIL))) { if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() == OK))) {
if (arg > MAX_THRESHOLD_TEMP_VAL) { if (arg > MAX_THRESHOLD_TEMP_VAL) {
ret = FAIL; ret = FAIL;
sprintf(mess,"Threshold Temp %d should be in range: 0 - %d\n", sprintf(mess,"Threshold Temp %d should be in range: 0 - %d\n",
@ -2645,7 +2644,7 @@ int temp_control(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() != FAIL))) { if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() == OK))) {
retval = setTemperatureControl(arg); retval = setTemperatureControl(arg);
FILE_LOG(logDEBUG5, ("Temperature control: %d\n", retval)); FILE_LOG(logDEBUG5, ("Temperature control: %d\n", retval));
validate(arg, retval, "set temperature control", 0); validate(arg, retval, "set temperature control", 0);
@ -2671,7 +2670,7 @@ int temp_event(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() != FAIL))) { if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() == OK))) {
retval = setTemperatureEvent(arg); retval = setTemperatureEvent(arg);
FILE_LOG(logDEBUG5, ("Temperature event: %d\n", retval)); FILE_LOG(logDEBUG5, ("Temperature event: %d\n", retval));
validate(arg, retval, "set temperature event", 0); validate(arg, retval, "set temperature event", 0);
@ -2698,7 +2697,7 @@ int auto_comp_disable(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() != FAIL))) { if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() == OK))) {
retval = autoCompDisable(arg); retval = autoCompDisable(arg);
FILE_LOG(logDEBUG5, ("Auto comp disable: %d\n", retval)); FILE_LOG(logDEBUG5, ("Auto comp disable: %d\n", retval));
validate(arg, retval, "set auto comp disable", 0); validate(arg, retval, "set auto comp disable", 0);
@ -2725,7 +2724,7 @@ int storage_cell_start(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// set & get // set & get
if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() != FAIL))) { if ((arg == -1) || ((arg != -1) && (Server_VerifyLock() == OK))) {
if (arg > MAX_STORAGE_CELL_VAL) { if (arg > MAX_STORAGE_CELL_VAL) {
ret = FAIL; ret = FAIL;
strcpy(mess,"Max Storage cell number should not exceed 15\n"); strcpy(mess,"Max Storage cell number should not exceed 15\n");
@ -2817,7 +2816,7 @@ int software_trigger(int file_des) {
functionNotImplemented(); functionNotImplemented();
#else #else
// only set // only set
if (Server_VerifyLock() != FAIL) { if (Server_VerifyLock() == OK) {
ret = softwareTrigger(); ret = softwareTrigger();
if (ret == FAIL) { if (ret == FAIL) {
sprintf(mess, "Could not send software trigger\n"); sprintf(mess, "Could not send software trigger\n");

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -7,7 +7,6 @@
#include "multiSlsDetectorCommand.h" #include "multiSlsDetectorCommand.h"
#include "utilities.h" #include "utilities.h"
#include "detectorData.h" #include "detectorData.h"
#include "logger.h"
#include <sys/types.h> #include <sys/types.h>
#include <iostream> #include <iostream>
@ -2497,7 +2496,8 @@ void multiSlsDetector::printReceiverConfiguration(int detPos) {
} }
// multi // multi
parallelCall(&slsDetector::printReceiverConfiguration); for (auto& d : detectors)
d->printReceiverConfiguration();
} }

1
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -9,6 +9,7 @@
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#include "error_defs.h" #include "error_defs.h"
#include "logger.h"
class slsDetector; class slsDetector;
class SharedMemory; class SharedMemory;

1416
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

File diff suppressed because it is too large Load Diff

19
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -11,6 +11,8 @@
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#include "error_defs.h" #include "error_defs.h"
#include "logger.h"
#include "math.h" #include "math.h"
class multiSlsDetector; class multiSlsDetector;
@ -1261,7 +1263,7 @@ public:
* @param retval is the array with the trimbits * @param retval is the array with the trimbits
* @returns total number of channels for the detector * @returns total number of channels for the detector
*/ */
int getChanRegs(double* retval,bool fromDetector); int getChanRegs(double* retval);
/** /**
* Configure Module (Eiger) * Configure Module (Eiger)
@ -1300,7 +1302,7 @@ public:
* Prints receiver configuration * Prints receiver configuration
* #param level print level * #param level print level
*/ */
void printReceiverConfiguration(int level = logINFO); void printReceiverConfiguration(TLogLevel level = logINFO);
/** /**
* Checks if receiver is online and set flag * Checks if receiver is online and set flag
@ -1486,12 +1488,6 @@ public:
*/ */
int getFramesCaughtByReceiver(); int getFramesCaughtByReceiver();
/**
* Gets the number of frames caught by any one receiver (to avoid using threadpool)
* @returns number of frames caught by any one receiver (master receiver if exists)
*/
int getFramesCaughtByAnyReceiver();
/** /**
* Gets the current frame index of receiver * Gets the current frame index of receiver
* @returns current frame index of receiver * @returns current frame index of receiver
@ -1538,13 +1534,6 @@ public:
*/ */
int setReceiverStreamingTimer(int time_in_ms=500); int setReceiverStreamingTimer(int time_in_ms=500);
/**
* Enable data streaming to client
* @param enable 0 to disable, 1 to enable, -1 to get the value
* @returns data streaming to client enable
*/
int enableDataStreamingToClient(int enable=-1);
/** /**
* Enable or disable streaming data from receiver to client * Enable or disable streaming data from receiver to client
* @param enable 0 to disable 1 to enable -1 to only get the value * @param enable 0 to disable 1 to enable -1 to only get the value

5
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2723,7 +2723,7 @@ string slsDetectorCommand::cmdRateCorr(int narg, char *args[], int action, int d
myDet->setOnline(ONLINE_FLAG, detPos); myDet->setOnline(ONLINE_FLAG, detPos);
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
sscanf(args[1],"%lld",&ival); sscanf(args[1], "%ld",&ival);
myDet->setRateCorrection(ival, detPos); myDet->setRateCorrection(ival, detPos);
} }
sprintf(answer,"%lld",myDet->getRateCorrection(detPos)); sprintf(answer,"%lld",myDet->getRateCorrection(detPos));
@ -4908,7 +4908,8 @@ string slsDetectorCommand::cmdConfiguration(int narg, char *args[], int action,
myDet->setReceiverOnline(ONLINE_FLAG, detPos); myDet->setReceiverOnline(ONLINE_FLAG, detPos);
if (action==PUT_ACTION) if (action==PUT_ACTION)
return string("cannot put"); return string("cannot put");
return string(""+myDet->printReceiverConfiguration(detPos)); myDet->printReceiverConfiguration(detPos);
return string("");
}else if (cmd=="parameters") { }else if (cmd=="parameters") {
myDet->setReceiverOnline(ONLINE_FLAG, detPos); myDet->setReceiverOnline(ONLINE_FLAG, detPos);
if (action==PUT_ACTION) { if (action==PUT_ACTION) {

12
slsReceiverSoftware/include/slsReceiverImplementation.h
View File

@ -57,7 +57,7 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* Get detector hostname * Get detector hostname
* @return hostname (max of 1000 characters) * @return hostname (max of 1000 characters)
*/ */
char *getDetectorHostname() const; std::string getDetectorHostname() const;
/* /*
* Get flipped data across 'axis' * Get flipped data across 'axis'
@ -82,13 +82,13 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* Get File Name Prefix (without frame index, file index and extension (_d0_f000000000000_8.raw)) * Get File Name Prefix (without frame index, file index and extension (_d0_f000000000000_8.raw))
* @return file name prefix * @return file name prefix
*/ */
char *getFileName() const; std::string getFileName() const;
/** /**
* Get File Path * Get File Path
* @return file path * @return file path
*/ */
char *getFilePath() const; std::string getFilePath() const;
/** /**
* Get File Index * Get File Index
@ -164,7 +164,7 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* Get Ehernet Interface * Get Ehernet Interface
* @ethernet interface. eg. eth0 or "" if listening to all * @ethernet interface. eg. eth0 or "" if listening to all
*/ */
char *getEthernetInterface() const; std::string getEthernetInterface() const;
//***acquisition parameters*** //***acquisition parameters***
@ -288,13 +288,13 @@ class slsReceiverImplementation: private virtual slsDetectorDefs {
* Get streaming source ip * Get streaming source ip
* @return streaming source ip * @return streaming source ip
*/ */
char *getStreamingSourceIP() const; std::string getStreamingSourceIP() const;
/** /**
* Get additional json header * Get additional json header
* @return additional json header * @return additional json header
*/ */
char *getAdditionalJsonHeader() const; std::string getAdditionalJsonHeader() const;
/** (not saved in client shared memory) /** (not saved in client shared memory)
* Get UDP Socket Buffer Size * Get UDP Socket Buffer Size

7
slsReceiverSoftware/include/slsReceiverTCPIPInterface.h
View File

@ -115,6 +115,13 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
/** function not implemented for specific detector */ /** function not implemented for specific detector */
void functionNotImplemented(); void functionNotImplemented();
/** mode not implemented for specific detector */
void modeNotImplemented(std::string modename, int mode);
/** validate and set error */
template <typename T>
void validate(T arg, T retval, std::string modename, bool hex);
/** Unrecognized Function */ /** Unrecognized Function */
int M_nofunc(); int M_nofunc();

24
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -144,9 +144,9 @@ int slsReceiverImplementation::getDetectorPositionId() const{
return detID; return detID;
} }
char *slsReceiverImplementation::getDetectorHostname() const{ std::string slsReceiverImplementation::getDetectorHostname() const{
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
return detHostname; return std::string(detHostname);
} }
int slsReceiverImplementation::getFlippedData(int axis) const{ int slsReceiverImplementation::getFlippedData(int axis) const{
@ -167,14 +167,14 @@ slsDetectorDefs::fileFormat slsReceiverImplementation::getFileFormat() const{
} }
char *slsReceiverImplementation::getFileName() const{ std::string slsReceiverImplementation::getFileName() const{
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
return fileName; return std::string(fileName);
} }
char *slsReceiverImplementation::getFilePath() const{ std::string slsReceiverImplementation::getFilePath() const{
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
return filePath; return std::string(filePath);
} }
uint64_t slsReceiverImplementation::getFileIndex() const{ uint64_t slsReceiverImplementation::getFileIndex() const{
@ -270,9 +270,9 @@ uint32_t slsReceiverImplementation::getUDPPortNumber2() const{
return udpPortNum[1]; return udpPortNum[1];
} }
char *slsReceiverImplementation::getEthernetInterface() const{ std::string slsReceiverImplementation::getEthernetInterface() const{
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
return eth; return std::string(eth);
} }
@ -367,14 +367,14 @@ uint32_t slsReceiverImplementation::getStreamingPort() const{
return streamingPort; return streamingPort;
} }
char *slsReceiverImplementation::getStreamingSourceIP() const{ std::string slsReceiverImplementation::getStreamingSourceIP() const{
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
return streamingSrcIP; return std::string(streamingSrcIP);
} }
char *slsReceiverImplementation::getAdditionalJsonHeader() const{ std::string slsReceiverImplementation::getAdditionalJsonHeader() const{
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
return additionalJsonHeader; return std::string(additionalJsonHeader);
} }
uint32_t slsReceiverImplementation::getUDPSocketBufferSize() const { uint32_t slsReceiverImplementation::getUDPSocketBufferSize() const {

576
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

File diff suppressed because it is too large Load Diff

1
slsSupportLib/include/ClientInterface.cpp
View File

@ -82,7 +82,6 @@ int ClientInterface::Server_ReceiveArg(int& ret, char* mess, void* arg, int size
if (sizeofArg && mySocket->ReceiveDataOnly(arg, sizeofArg) < 0) if (sizeofArg && mySocket->ReceiveDataOnly(arg, sizeofArg) < 0)
return Server_SocketCrash(); return Server_SocketCrash();
ret = OK;
// check if server object created // check if server object created
if (checkbase && base == NULL) if (checkbase && base == NULL)
Server_NullObjectError(ret, mess); Server_NullObjectError(ret, mess);