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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-16 17:38:41 +02:00
parent d3e60eba80
commit a0bdfcdae3
24 changed files with 62 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

6
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -1444,9 +1444,9 @@ int setHighVoltage(int val){
/* parameters - timing, extsig */
void setTiming( enum externalCommunicationMode arg){
void setTiming( enum timingMode arg){
if(arg != GET_EXTERNAL_COMMUNICATION_MODE){
if(arg != GET_TIMING_MODE){
switch((int)arg){
case AUTO_TIMING:
FILE_LOG(logINFO, ("Set Timing: Auto\n"));
@ -1464,7 +1464,7 @@ void setTiming( enum externalCommunicationMode arg){
}
enum externalCommunicationMode getTiming() {
enum timingMode getTiming() {
if (bus_r(EXT_SIGNAL_REG) == EXT_SIGNAL_MSK)
return TRIGGER_EXPOSURE;
return AUTO_TIMING;

10
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1193,9 +1193,9 @@ int setHighVoltage(int val) {
/* parameters - timing, extsig */
void setTiming( enum externalCommunicationMode arg) {
enum externalCommunicationMode ret=GET_EXTERNAL_COMMUNICATION_MODE;
if (arg != GET_EXTERNAL_COMMUNICATION_MODE) {
void setTiming( enum timingMode arg) {
enum timingMode ret=GET_TIMING_MODE;
if (arg != GET_TIMING_MODE) {
switch((int)arg) {
case AUTO_TIMING: ret = 0; break;
case TRIGGER_EXPOSURE: ret = 2; break;
@ -1211,8 +1211,8 @@ void setTiming( enum externalCommunicationMode arg) {
}
enum externalCommunicationMode getTiming() {
enum externalCommunicationMode ret = GET_EXTERNAL_COMMUNICATION_MODE;
enum timingMode getTiming() {
enum timingMode ret = GET_TIMING_MODE;
ret = eiger_triggermode;
switch((int)ret) {
case 0: ret = AUTO_TIMING; break;

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -1226,10 +1226,10 @@ int setHighVoltage(int val){
/* parameters - timing, extsig */
void setTiming( enum externalCommunicationMode arg){
void setTiming( enum timingMode arg){
u_int32_t addr = EXT_SIGNAL_REG;
if (arg != GET_EXTERNAL_COMMUNICATION_MODE){
if (arg != GET_TIMING_MODE){
switch((int)arg){
case AUTO_TIMING:
FILE_LOG(logINFO, ("Set Timing: Auto\n"));
@ -1251,7 +1251,7 @@ void setTiming( enum externalCommunicationMode arg){
}
}
enum externalCommunicationMode getTiming() {
enum timingMode getTiming() {
u_int32_t regval = bus_r(EXT_SIGNAL_REG);
switch (regval) {
case EXT_SIGNAL_TRGGR_IN_RSNG_VAL:
@ -1456,7 +1456,7 @@ int configureMAC(uint32_t destip, uint64_t destmac, uint64_t sourcemac, uint32_t
*/
FILE_LOG(logINFOBLUE, ("Sending an image to counter the packet numbers\n"));
// remember old parameters
enum externalCommunicationMode oldtiming = getTiming();
enum timingMode oldtiming = getTiming();
uint64_t oldframes = setTimer(FRAME_NUMBER, -1);
uint64_t oldcycles = setTimer(CYCLES_NUMBER, -1);
uint64_t oldPeriod = setTimer(FRAME_PERIOD, -1);

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

6
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -976,9 +976,9 @@ int setHighVoltage(int val){
/* parameters - timing, extsig */
void setTiming( enum externalCommunicationMode arg){
void setTiming( enum timingMode arg){
if(arg != GET_EXTERNAL_COMMUNICATION_MODE){
if(arg != GET_TIMING_MODE){
switch((int)arg){
case AUTO_TIMING:
FILE_LOG(logINFO, ("Set Timing: Auto\n"));
@ -996,7 +996,7 @@ void setTiming( enum externalCommunicationMode arg){
}
enum externalCommunicationMode getTiming() {
enum timingMode getTiming() {
if (bus_r(EXT_SIGNAL_REG) == EXT_SIGNAL_MSK)
return TRIGGER_EXPOSURE;
return AUTO_TIMING;

6
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -1061,9 +1061,9 @@ int setHighVoltage(int val){
/* parameters - timing, extsig */
void setTiming( enum externalCommunicationMode arg){
void setTiming( enum timingMode arg){
if(arg != GET_EXTERNAL_COMMUNICATION_MODE){
if(arg != GET_TIMING_MODE){
switch((int)arg){
case AUTO_TIMING:
FILE_LOG(logINFO, ("Set Timing: Auto\n"));
@ -1081,7 +1081,7 @@ void setTiming( enum externalCommunicationMode arg){
}
enum externalCommunicationMode getTiming() {
enum timingMode getTiming() {
if (bus_r(EXT_SIGNAL_REG) == EXT_SIGNAL_MSK)
return TRIGGER_EXPOSURE;
return AUTO_TIMING;

4
slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -212,8 +212,8 @@ int setHighVoltage(int val);
// parameters - timing, extsig
void setTiming( enum externalCommunicationMode arg);
enum externalCommunicationMode getTiming();
void setTiming( enum timingMode arg);
enum timingMode getTiming();
#ifdef GOTTHARDD
void setExtSignal(enum externalSignalFlag mode);
int getExtSignal();

12
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -167,7 +167,7 @@ const char* getFunctionName(enum detFuncs func) {
case F_EXEC_COMMAND: return "F_EXEC_COMMAND";
case F_GET_DETECTOR_TYPE: return "F_GET_DETECTOR_TYPE";
case F_SET_EXTERNAL_SIGNAL_FLAG: return "F_SET_EXTERNAL_SIGNAL_FLAG";
case F_SET_EXTERNAL_COMMUNICATION_MODE: return "F_SET_EXTERNAL_COMMUNICATION_MODE";
case F_SET_TIMING_MODE: return "F_SET_TIMING_MODE";
case F_GET_ID: return "F_GET_ID";
case F_DIGITAL_TEST: return "F_DIGITAL_TEST";
case F_SET_DAC: return "F_SET_DAC";
@ -258,7 +258,7 @@ void function_table() {
flist[F_EXEC_COMMAND] = &exec_command;
flist[F_GET_DETECTOR_TYPE] = &get_detector_type;
flist[F_SET_EXTERNAL_SIGNAL_FLAG] = &set_external_signal_flag;
flist[F_SET_EXTERNAL_COMMUNICATION_MODE] = &set_external_communication_mode;
flist[F_SET_TIMING_MODE] = &set_timing_mode;
flist[F_GET_ID] = &get_id;
flist[F_DIGITAL_TEST] = &digital_test;
flist[F_SET_DAC] = &set_dac;
@ -525,18 +525,18 @@ int set_external_signal_flag(int file_des) {
int set_external_communication_mode(int file_des) {
int set_timing_mode(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
enum externalCommunicationMode arg = GET_EXTERNAL_COMMUNICATION_MODE;
enum externalCommunicationMode retval = GET_EXTERNAL_COMMUNICATION_MODE;
enum timingMode arg = GET_TIMING_MODE;
enum timingMode retval = GET_TIMING_MODE;
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError();
FILE_LOG(logDEBUG1, ("Setting external communication mode to %d\n", arg));
// set
if ((arg != GET_EXTERNAL_COMMUNICATION_MODE) && (Server_VerifyLock() == OK)) {
if ((arg != GET_TIMING_MODE) && (Server_VerifyLock() == OK)) {
switch (arg) {
case AUTO_TIMING:
case TRIGGER_EXPOSURE:

2
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
View File

@ -27,7 +27,7 @@ int M_nofuncMode(int);
int exec_command(int);
int get_detector_type(int);
int set_external_signal_flag(int);
int set_external_communication_mode(int);
int set_timing_mode(int);
int get_id(int);
int digital_test(int);
int set_dac(int);