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

clang and redoing copy detector server to have a soft link and put that in respawning for blackfin servers

Browse Source
This commit is contained in:
maliakal_d
2021-10-18 17:17:56 +02:00
parent 43bbf66e85
commit 203d6465a1
11 changed files with 414 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE.txt
View File

@ -242,6 +242,8 @@ This document describes the differences between v6.0.0 and v5.1.0.
7. [Eiger] fast quad fix for loading trimbits
8. [Eiger] Can also use copydetectorserver command.
Receiver
--------

2
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -7,6 +7,8 @@
#define MIN_REQRD_VRSN_T_RD_API 0x181130
#define REQRD_FRMWR_VRSN 0x201005
#define LINKED_SERVER_NAME "ctbDetectorServer"
#define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000)
/* Struct Definitions */

2
slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -3,6 +3,8 @@
#pragma once
#include "sls/sls_detector_defs.h"
#define LINKED_SERVER_NAME "eigerDetectorServer"
#define REQUIRED_FIRMWARE_VERSION (29)
// virtual ones renamed for consistency
// real ones keep previous name for compatibility (already in production)

2
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -7,6 +7,8 @@
#define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020"
#define ID_FILE "detid_gotthard2.txt"
#define LINKED_SERVER_NAME "gotthard2DetectorServer"
#define CTRL_SRVR_INIT_TIME_US (300 * 1000)
/* Hardware Definitions */

2
slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h
View File

@ -4,6 +4,8 @@
#include "sls/sls_detector_defs.h"
#include <stdlib.h>
#define LINKED_SERVER_NAME "gotthardDetectorServer"
/* Enums */
enum ADCINDEX { TEMP_FPGA, TEMP_ADC };
enum DACINDEX {

8
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -8,6 +8,8 @@
#define REQRD_FRMWRE_VRSN_BOARD2 0x210831 // 1.0 pcb (version = 010)
#define REQRD_FRMWRE_VRSN 0x211008 // 2.0 pcb (version = 011)
#define LINKED_SERVER_NAME "jungfrauDetectorServer"
#define CTRL_SRVR_INIT_TIME_US (300 * 1000)
/* Struct Definitions */
@ -137,8 +139,6 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
#define ADC_PORT_INVERT_VAL (0x5A5A5A5A)
#define ADC_PORT_INVERT_BOARD2_VAL (0x453b2a9c)
// 2.0 pcb (chipv1.1)
#define SAMPLE_ADC_FULL_SPEED_CHIP11 \
(SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_0_VAL + \
@ -162,8 +162,6 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
#define ADC_OFST_HALF_SPEED_VAL_CHIP11 (0x08)
#define ADC_OFST_QUARTER_SPEED_VAL_CHIP11 (0x04)
// 2.0 pcb (chipv1.0)
#define SAMPLE_ADC_FULL_SPEED_CHIP10 \
(SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_0_VAL + \
@ -187,8 +185,6 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
#define ADC_OFST_HALF_SPEED_VAL_CHIP10 (0x08)
#define ADC_OFST_QUARTER_SPEED_VAL_CHIP10 (0x04)
// 1.0 pcb (2 resistor network)
#define SAMPLE_ADC_HALF_SPEED_BOARD2 \
(SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_0_VAL + \

2
slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
View File

@ -7,6 +7,8 @@
#define MIN_REQRD_VRSN_T_RD_API 0x180314
#define REQRD_FRMWR_VRSN 0x201005
#define LINKED_SERVER_NAME "moenchDetectorServer"
#define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000)
/* Struct Definitions */

2
slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
View File

@ -7,6 +7,8 @@
#define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020"
#define ID_FILE "detid_mythen3.txt"
#define LINKED_SERVER_NAME "mythen3DetectorServer"
#define CTRL_SRVR_INIT_TIME_US (300 * 1000)
/* Hardware Definitions */

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

@ -15,8 +15,8 @@
#include <arpa/inet.h>
#include <pthread.h>
#include <string.h>
#include <unistd.h>
#include <sys/sysinfo.h>
#include <unistd.h>
// defined in the detector specific Makefile
#ifdef GOTTHARDD
@ -1140,12 +1140,12 @@ defined(GOTTHARD2D) || defined(MYTHEN3D)
LOG(logERROR, (mess));
} else if (!isPowerValid(serverDacIndex, val)) {
ret = FAIL;
sprintf(mess,
sprintf(
mess,
"Could not set power. Power regulator %d "
"should be between %d and %d mV\n",
ind,
(serverDacIndex == D_PWR_IO ? VIO_MIN_MV
: POWER_RGLTR_MIN),
(serverDacIndex == D_PWR_IO ? VIO_MIN_MV : POWER_RGLTR_MIN),
(VCHIP_MAX_MV - VCHIP_POWER_INCRMNT));
LOG(logERROR, (mess));
} else {
@ -1221,8 +1221,7 @@ defined(GOTTHARD2D) || defined(MYTHEN3D)
LOG(logERROR, (mess));
} else {
#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
if ((val != GET_FLAG && mV &&
checkVLimitCompliant(val) == FAIL) ||
if ((val != GET_FLAG && mV && checkVLimitCompliant(val) == FAIL) ||
(val != GET_FLAG && !mV &&
checkVLimitDacCompliant(val) == FAIL)) {
ret = FAIL;
@ -2078,7 +2077,8 @@ int set_num_additional_storage_cells(int file_des) {
if (Server_VerifyLock() == OK) {
if (getChipVersion() == 11) {
ret = FAIL;
sprintf(mess, "Cannot set addl. number of storage cells for chip v1.1\n");
sprintf(mess,
"Cannot set addl. number of storage cells for chip v1.1\n");
LOG(logERROR, (mess));
} else if (arg > getMaxStoragecellStart()) {
ret = FAIL;
@ -2557,7 +2557,8 @@ int set_storage_cell_delay(int file_des) {
if (Server_VerifyLock() == OK) {
if (getChipVersion() == 11) {
ret = FAIL;
strcpy(mess, "Storage cell delay is not applicable for chipv 1.1\n");
strcpy(mess,
"Storage cell delay is not applicable for chipv 1.1\n");
LOG(logERROR, (mess));
} else if (arg > MAX_STORAGE_CELL_DLY_NS_VAL) {
ret = FAIL;
@ -3702,7 +3703,10 @@ int program_fpga(int file_des) {
fclose(fd);
struct sysinfo info;
sysinfo(&info);
sprintf(mess, "Could not allocate memory to get fpga program. Free space: %d MB\n", (int)(info.freeram/ (1024 * 1024)));
sprintf(mess,
"Could not allocate memory to get fpga program. Free "
"space: %d MB\n",
(int)(info.freeram / (1024 * 1024)));
LOG(logERROR, (mess));
ret = FAIL;
}
@ -3759,8 +3763,7 @@ int program_fpga(int file_des) {
// checksum of copied program
if (ret == OK) {
ret =
verifyChecksumFromFile(mess, checksum, TEMP_PROG_FILE_NAME);
ret = verifyChecksumFromFile(mess, checksum, TEMP_PROG_FILE_NAME);
}
Server_SendResult(file_des, INT32, NULL, 0);
if (ret == FAIL) {
@ -4027,7 +4030,8 @@ int storage_cell_start(int file_des) {
if ((arg == GET_FLAG) || (Server_VerifyLock() == OK)) {
if (arg > getMaxStoragecellStart()) {
ret = FAIL;
sprintf(mess, "Max Storage cell number should not exceed %d\n", getMaxStoragecellStart());
sprintf(mess, "Max Storage cell number should not exceed %d\n",
getMaxStoragecellStart());
LOG(logERROR, (mess));
} else {
retval = selectStoragecellStart(arg);
@ -4210,7 +4214,7 @@ int copy_detector_server(int file_des) {
if (receiveData(file_des, args, sizeof(args), OTHER) < 0)
return printSocketReadError();
#if defined(EIGERD) || defined(VIRTUAL)
#ifdef VIRTUAL
functionNotImplemented();
#else
@ -4219,59 +4223,102 @@ int copy_detector_server(int file_des) {
char *sname = args[0];
char *hostname = args[1];
LOG(logINFOBLUE, ("Copying server %s from host %s\n", sname, hostname));
char cmd[MAX_STR_LENGTH] = {0};
char cmd[MAX_STR_LENGTH];
memset(cmd, 0, MAX_STR_LENGTH);
// copy server
strcpy(cmd, "tftp ");
strcat(cmd, hostname);
strcat(cmd, " -r ");
strcat(cmd, sname);
strcat(cmd, " -g");
int success = executeCommand(cmd, retvals, logDEBUG1);
if (success == FAIL) {
// tftp server
char *format = "tftp %s -r %s -g";
if (snprintf(cmd, MAX_STR_LENGTH, format, hostname, sname) >=
MAX_STR_LENGTH) {
ret = FAIL;
strcpy(mess, retvals);
sptrcpy(mess, "Could not copy detector server. Command to copy "
"server too long\n");
LOG(logERROR, (mess));
} else if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
ret = FAIL;
snprintf(mess, MAX_STR_LENGTH,
"Could not copy detector server (tftp). %s\n", retvals);
// LOG(logERROR, (mess)); already printed in executecommand
} else {
LOG(logINFO, ("\tServer copied\n"));
}
// success
else {
LOG(logINFO, ("Server copied successfully\n"));
// give permissions
strcpy(cmd, "chmod 777 ");
strcat(cmd, sname);
executeCommand(cmd, retvals, logDEBUG1);
#if !defined(GOTTHARD2D) && !defined(MYTHEN3D)
// edit /etc/inittab
// find line numbers in /etc/inittab where DetectorServer
strcpy(cmd, "sed -n '/DetectorServer/=' /etc/inittab");
executeCommand(cmd, retvals, logDEBUG1);
while (strlen(retvals)) {
// get first linen number
int lineNumber = atoi(retvals);
// delete that line
sprintf(cmd, "sed -i \'%dd\' /etc/inittab", lineNumber);
executeCommand(cmd, retvals, logDEBUG1);
// find line numbers again
strcpy(cmd, "sed -n '/DetectorServer/=' /etc/inittab");
executeCommand(cmd, retvals, logDEBUG1);
if (ret == OK) {
if (snprintf(cmd, MAX_STR_LENGTH, "chmod 777 %s", sname) >=
MAX_STR_LENGTH) {
ret = FAIL;
sptrcpy(mess, "Could not copy detector server. Command to give "
"permissions to server is too long\n");
LOG(logERROR, (mess));
} else if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
ret = FAIL;
snprintf(mess, MAX_STR_LENGTH,
"Could not copy detector server (permissions). %s\n",
retvals);
// LOG(logERROR, (mess)); already printed in executecommand
} else {
LOG(logINFO, ("\tPermissions modified\n"));
}
}
LOG(logINFO, ("Deleted all lines containing DetectorServer in "
"/etc/inittab\n"));
// append line
strcpy(cmd, "echo \"ttyS0::respawn:/./");
strcat(cmd, sname);
strcat(cmd, "\" >> /etc/inittab");
executeCommand(cmd, retvals, logDEBUG1);
// symbolic link
if (ret == OK) {
if (snprintf(cmd, MAX_STR_LENGTH, "ln -sf %s %s", sname,
LINKED_SERVER_NAME) >= MAX_STR_LENGTH) {
ret = FAIL;
strcpy(mess, "Could not copy detector server. Command to "
"create symbolic link too long\n");
LOG(logERROR, (mess));
} else if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
ret = FAIL;
snprintf(mess, MAX_STR_LENGTH,
"Could not copy detector server (symbolic link). %s\n",
retvals);
// LOG(logERROR, (mess)); already printed in executecommand
} else {
LOG(logINFO, ("\tSymbolic link created\n"));
}
}
LOG(logINFO, ("/etc/inittab modified to have %s\n", sname));
// blackfin boards (respawn) (only kept for backwards compatibility)
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) || \
defined(GOTTHARDD)
// delete every line with DetectorServer in /etc/inittab
if (ret == OK) {
strcpy(cmd, "sed -i '/DetectorServer/d' /etc/inittab");
if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
ret = FAIL;
snprintf(
mess, MAX_STR_LENGTH,
"Could not copy detector server (del respawning). %s\n",
retvals);
// LOG(logERROR, (mess)); already printed in executecommand
} else {
LOG(logINFO, ("\t/etc/inittab DetectoServer line deleted\n"));
}
}
// add new link name to /etc/inittab
if (ret == OK) {
format = "echo 'ttyS0::respawn:/./%s' >> /etc/inittab";
if (snprintf(cmd, MAX_STR_LENGTH, format, sname) >=
MAX_STR_LENGTH) {
ret = FAIL;
sptrcpy(mess, "Could not copy detector server. Command "
"to add new server for spawning is too long\n");
LOG(logERROR, (mess));
} else if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
ret = FAIL;
snprintf(mess, MAX_STR_LENGTH,
"Could not copy detector server (respawning). %s\n",
retvals);
// LOG(logERROR, (mess)); already printed in executecommand
} else {
LOG(logINFO, ("\tLinked server added for respawning\n"));
}
}
#endif
}
}
#endif
return Server_SendResult(file_des, OTHER, retvals, sizeof(retvals));
}
@ -4756,7 +4803,8 @@ int set_read_n_rows(int file_des) {
LOG(logERROR, (mess));
} else
#elif JUNGFRAUD
if ((check_detector_idle("set number of rows") == OK) && (arg % READ_N_ROWS_MULTIPLE != 0)) {
if ((check_detector_idle("set number of rows") == OK) &&
(arg % READ_N_ROWS_MULTIPLE != 0)) {
ret = FAIL;
sprintf(mess,
"Could not set number of rows. %d must be a multiple "
@ -4923,44 +4971,52 @@ int check_detector_idle(const char *s) {
int is_udp_configured() {
for (int i = 0; i != numUdpDestinations; ++i) {
if (udpDetails[i].dstip == 0) {
sprintf(configureMessage, "udp destination ip not configured [entry:%d]\n", i);
sprintf(configureMessage,
"udp destination ip not configured [entry:%d]\n", i);
LOG(logWARNING, ("%s", configureMessage));
return FAIL;
}
if (udpDetails[i].srcip == 0) {
sprintf(configureMessage, "udp source ip not configured [entry:%d]\n", i);
sprintf(configureMessage,
"udp source ip not configured [entry:%d]\n", i);
LOG(logWARNING, ("%s", configureMessage));
return FAIL;
}
if (udpDetails[i].srcmac == 0) {
sprintf(configureMessage, "udp source mac not configured [entry:%d]\n", i);
sprintf(configureMessage,
"udp source mac not configured [entry:%d]\n", i);
LOG(logWARNING, ("%s", configureMessage));
return FAIL;
}
if (udpDetails[i].dstmac == 0) {
sprintf(configureMessage, "udp destination mac not configured [entry:%d]\n", i);
sprintf(configureMessage,
"udp destination mac not configured [entry:%d]\n", i);
LOG(logWARNING, ("%s", configureMessage));
return FAIL;
}
#if defined(JUNGFRAUD) || defined(GOTTHARD2D)
if (getNumberofUDPInterfaces() == 2) {
if (udpDetails[i].srcip2 == 0) {
sprintf(configureMessage, "udp source ip2 not configured [entry:%d]\n", i);
sprintf(configureMessage,
"udp source ip2 not configured [entry:%d]\n", i);
LOG(logWARNING, ("%s", configureMessage));
return FAIL;
}
if (udpDetails[i].dstip2 == 0) {
sprintf(configureMessage, "udp destination ip2 not configured [entry:%d]\n", i);
sprintf(configureMessage,
"udp destination ip2 not configured [entry:%d]\n", i);
LOG(logWARNING, ("%s", configureMessage));
return FAIL;
}
if (udpDetails[i].srcmac2 == 0) {
sprintf(configureMessage, "udp source mac2 not configured [entry:%d]\n", i);
sprintf(configureMessage,
"udp source mac2 not configured [entry:%d]\n", i);
LOG(logWARNING, ("%s", configureMessage));
return FAIL;
}
if (udpDetails[i].dstmac2 == 0) {
sprintf(configureMessage, "udp destination mac2 not configured [entry:%d]\n", i);
sprintf(configureMessage,
"udp destination mac2 not configured [entry:%d]\n", i);
LOG(logWARNING, ("%s", configureMessage));
return FAIL;
}
@ -4979,7 +5035,8 @@ void configure_mac() {
if (ret == -1) {
sprintf(mess, "Could not allocate RAM\n");
} else {
sprintf(mess, "Could not configure mac because of incorrect "
sprintf(mess,
"Could not configure mac because of incorrect "
"udp 1G destination IP and port\n");
}
#else
@ -5416,7 +5473,8 @@ int set_num_interfaces(int file_des) {
} else if (check_detector_idle("configure mac") == OK) {
if (getNumberofUDPInterfaces() != arg) {
setNumberofUDPInterfaces(arg);
for (int iRxEntry = 0; iRxEntry != numUdpDestinations; ++iRxEntry) {
for (int iRxEntry = 0; iRxEntry != numUdpDestinations;
++iRxEntry) {
if (arg == 1) {
udpDetails[iRxEntry].srcport2 = 0;
udpDetails[iRxEntry].srcip2 = 0;
@ -5426,19 +5484,24 @@ int set_num_interfaces(int file_des) {
udpDetails[iRxEntry].dstmac2 = 0;
} else {
// if still 0, set defaults
udpDetails[iRxEntry].srcport2 = DEFAULT_UDP_SRC_PORTNO + 1;
udpDetails[iRxEntry].srcport2 =
DEFAULT_UDP_SRC_PORTNO + 1;
if (udpDetails[iRxEntry].dstport2 == 0) {
udpDetails[iRxEntry].dstport2 = 2 * iRxEntry + 1 + DEFAULT_UDP_DST_PORTNO;
udpDetails[iRxEntry].dstport2 =
2 * iRxEntry + 1 + DEFAULT_UDP_DST_PORTNO;
}
// if still 0, copy from entry 0
if (iRxEntry != 0) {
udpDetails[iRxEntry].srcip2 = udpDetails[0].srcip2;
udpDetails[iRxEntry].srcmac2 = udpDetails[0].srcmac2;
udpDetails[iRxEntry].srcmac2 =
udpDetails[0].srcmac2;
if (udpDetails[iRxEntry].dstip2 == 0) {
udpDetails[iRxEntry].dstip2 = udpDetails[0].dstip2;
udpDetails[iRxEntry].dstip2 =
udpDetails[0].dstip2;
}
if (udpDetails[iRxEntry].dstmac2 == 0) {
udpDetails[iRxEntry].dstmac2 = udpDetails[0].dstmac2;
udpDetails[iRxEntry].dstmac2 =
udpDetails[0].dstmac2;
}
}
}
@ -6706,14 +6769,15 @@ int set_current_source(int file_des) {
if (Server_VerifyLock() == OK) {
if (enable != 0 && enable != 1) {
ret = FAIL;
strcpy(mess,
"Could not enable/disable current source. Enable can be 0 or 1 only.\n");
strcpy(mess, "Could not enable/disable current source. Enable can "
"be 0 or 1 only.\n");
LOG(logERROR, (mess));
}
// disable
else if (enable == 0 && (fix != -1 || normal != -1)) {
ret = FAIL;
strcpy(mess,
strcpy(
mess,
"Could not disable current source. Requires no parameters.\n");
LOG(logERROR, (mess));
}
@ -6723,8 +6787,8 @@ int set_current_source(int file_des) {
// no parameters allowed
if (fix != -1 || normal != -1) {
ret = FAIL;
strcpy(mess,
"Could not enable current source. Fix and normal are invalid parameters for this detector.\n");
strcpy(mess, "Could not enable current source. Fix and normal "
"are invalid parameters for this detector.\n");
LOG(logERROR, (mess));
}
#else
@ -6747,7 +6811,8 @@ int set_current_source(int file_des) {
if (fix != 0 && fix != 1) {
ret = FAIL;
strcpy(mess,
"Could not enable current source. Invalid value for parameter (fix). Options: 0 or 1.\n");
"Could not enable current source. Invalid value "
"for parameter (fix). Options: 0 or 1.\n");
LOG(logERROR, (mess));
} else if (normal != -1) {
ret = FAIL;
@ -6781,7 +6846,8 @@ int set_current_source(int file_des) {
#endif
int retval = getCurrentSource();
LOG(logDEBUG1, ("current source enable retval: %u\n", retval));
validate(&ret, mess, enable, retval, "set current source enable", DEC);
validate(&ret, mess, enable, retval, "set current source enable",
DEC);
}
}
#endif
@ -7847,7 +7913,8 @@ int set_filter_resistor(int file_des) {
if (Server_VerifyLock() == OK) {
if (arg < 0 || arg > ASIC_FILTER_MAX_RES_VALUE) {
ret = FAIL;
sprintf(mess,
sprintf(
mess,
"Could not set filter resistor. Invalid filter argument %d. "
"Options [0-%d]\n",
arg, ASIC_FILTER_MAX_RES_VALUE);
@ -8483,8 +8550,8 @@ int set_veto_algorithm(int file_des) {
enum vetoAlgorithm alg = args[0];
enum streamingInterface interface = args[1];
LOG(logDEBUG1, ("Setting vetoalgorithm (interface: %d): %u\n", (int)interface,
(int)alg));
LOG(logDEBUG1, ("Setting vetoalgorithm (interface: %d): %u\n",
(int)interface, (int)alg));
#ifndef GOTTHARD2D
functionNotImplemented();
@ -8774,10 +8841,10 @@ int set_flip_rows(int file_des) {
#else
// only set
if (Server_VerifyLock() == OK) {
if ((check_detector_idle("set flip rows") == OK) && (arg != 0 && arg != 1)) {
if ((check_detector_idle("set flip rows") == OK) &&
(arg != 0 && arg != 1)) {
ret = FAIL;
sprintf(mess,
"Could not set flip rows. Invalid argument %d.\n",
sprintf(mess, "Could not set flip rows. Invalid argument %d.\n",
arg);
LOG(logERROR, (mess));
}
@ -8803,7 +8870,6 @@ int set_flip_rows(int file_des) {
return Server_SendResult(file_des, INT32, NULL, 0);
}
int get_filter_cell(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
@ -8839,7 +8905,8 @@ int set_filter_cell(int file_des) {
if (arg < 0 || arg > MAX_FILTER_CELL_VAL) {
ret = FAIL;
sprintf(mess,
"Could not set filter cell. Invalid argument %d. Options: 0 - %d\n",
"Could not set filter cell. Invalid argument %d. Options: "
"0 - %d\n",
arg, MAX_FILTER_CELL_VAL);
LOG(logERROR, (mess));
}
@ -8851,7 +8918,8 @@ int set_filter_cell(int file_des) {
LOG(logERROR, (mess));
} else {
setFilterCell(arg);
// no validation as it might take time to update status register if acquiring
// no validation as it might take time to update status register if
// acquiring
}
}
#endif
@ -9043,18 +9111,17 @@ int set_dest_udp_list(int file_des) {
if (entry < 1 || entry > MAX_UDP_DESTINATION) {
ret = FAIL;
sprintf(
mess,
"Could not set udp destination. Invalid entry. Options: 1 - %d\n",
sprintf(mess,
"Could not set udp destination. Invalid entry. Options: 1 "
"- %d\n",
MAX_UDP_DESTINATION);
LOG(logERROR, (mess));
}
#ifdef EIGERD
else if (args[4] != 0 || args64[1] != 0) {
ret = FAIL;
strcpy(
mess,
"Could not set udp destination. ip2 and mac2 not implemented for this detector.\n");
strcpy(mess, "Could not set udp destination. ip2 and mac2 not "
"implemented for this detector.\n");
LOG(logERROR, (mess));
}
#endif
@ -9086,12 +9153,14 @@ int set_dest_udp_list(int file_des) {
#endif
udpDetails[entry].srcport = DEFAULT_UDP_SRC_PORTNO;
if (udpDetails[entry].dstport == 0) {
udpDetails[entry].dstport = 2 * entry + DEFAULT_UDP_DST_PORTNO;
udpDetails[entry].dstport =
2 * entry + DEFAULT_UDP_DST_PORTNO;
}
if (myDetectorType == EIGER || twoInterfaces) {
udpDetails[entry].srcport2 = DEFAULT_UDP_SRC_PORTNO + 1;
if (udpDetails[entry].dstport2 == 0) {
udpDetails[entry].dstport2 = 2 * entry + 1 + DEFAULT_UDP_DST_PORTNO;
udpDetails[entry].dstport2 =
2 * entry + 1 + DEFAULT_UDP_DST_PORTNO;
}
}
// if still 0, copy from entry 0
@ -9162,9 +9231,10 @@ int get_num_dest_list(int file_des) {
int retval1 = 0;
if (getNumberofDestinations(&retval1) == FAIL || retval1 != retval) {
ret = FAIL;
sprintf(
mess,
"Could not get number of udp destinations. (server reads %d, fpga reads %d).\n", retval1, retval);
sprintf(mess,
"Could not get number of udp destinations. (server reads %d, "
"fpga reads %d).\n",
retval1, retval);
LOG(logERROR, (mess));
}
#endif
@ -9232,7 +9302,8 @@ int set_udp_first_dest(int file_des) {
if (check_detector_idle("set first udp destination") == OK) {
setFirstUDPDestination(arg);
int retval = getFirstUDPDestination();
validate(&ret, mess, arg, retval, "set udp first destination", DEC);
validate(&ret, mess, arg, retval, "set udp first destination",
DEC);
if (ret == OK) {
firstUDPDestination = arg;
// configure_mac();
@ -9244,7 +9315,6 @@ int set_udp_first_dest(int file_des) {
return Server_SendResult(file_des, INT32, NULL, 0);
}
int get_readout_speed(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
@ -9282,7 +9352,8 @@ int set_readout_speed(int file_des) {
#ifdef JUNGFRAUD
if (arg == (int)FULL_SPEED && isHardwareVersion2()) {
ret = FAIL;
strcpy(mess,
strcpy(
mess,
"Full speed not implemented for this board version (v1.0).\n");
LOG(logERROR, (mess));
}
@ -9319,7 +9390,6 @@ int set_readout_speed(int file_des) {
}
}
}
}
#endif
return Server_SendResult(file_des, INT32, NULL, 0);

45
slsDetectorSoftware/include/sls/Detector.h
View File

@ -83,7 +83,8 @@ class Detector {
/* [Jungfrau][Gotthard][Mythen3][Gotthard2][CTB][Moench] */
Result<int64_t> getSerialNumber(Positions pos = {}) const;
/** [Eiger][Gotthard2][Mythen3] 6 bit value (ideally unique) that is streamed out in the UDP header of the detector.*/
/** [Eiger][Gotthard2][Mythen3] 6 bit value (ideally unique) that is
* streamed out in the UDP header of the detector.*/
Result<int> getModuleId(Positions pos = {}) const;
Result<int64_t> getReceiverVersion(Positions pos = {}) const;
@ -310,8 +311,8 @@ class Detector {
* [Eiger] Options: FULL_SPEED (Default), HALF_SPEED, QUARTER_SPEED \n
* [Gotthard2] Options: G2_108MHZ (Default), G2_144MHZ \n
* [Jungfrau] FULL_SPEED option only available from v2.0 boards and is
* recommended to set number of interfaces to 2. \n Also overwrites adcphase to
* recommended default.
* recommended to set number of interfaces to 2. \n Also overwrites adcphase
* to recommended default.
*/
void setReadoutSpeed(defs::speedLevel value, Positions pos = {});
@ -404,8 +405,9 @@ class Detector {
* [Moench] Default is disabled. \n
* [Jungfrau] Default is disabled. Get will return power status. Can be off
* if temperature event occured (temperature over temp_threshold with
* temp_control enabled. Will configure chip (only chip v1.1)\n [Mythen3][Gotthard2] Default is 1. If module not
* connected or wrong module, powerchip will fail.
* temp_control enabled. Will configure chip (only chip v1.1)\n
* [Mythen3][Gotthard2] Default is 1. If module not connected or wrong
* module, powerchip will fail.
*/
void setPowerChip(bool on, Positions pos = {});
@ -518,7 +520,9 @@ class Detector {
/** [Eiger] Number of rows to read out per half module
* Options: 0 - 256. 256 is default. The permissible values depend on
* dynamic range and 10Gbe enabled. \n[Jungfrau] Number of rows per module starting from the centre. Options: 8 - 512, must be multiples of 8. Default is 512.
* dynamic range and 10Gbe enabled. \n[Jungfrau] Number of rows per module
* starting from the centre. Options: 8 - 512, must be multiples of 8.
* Default is 512.
*/
void setReadNRows(const int lines, Positions pos = {});
@ -1209,7 +1213,8 @@ class Detector {
Result<int> getStorageCellStart(Positions pos = {}) const;
/** [Jungfrau] Advanced. Sets the storage cell storing the first acquisition
* of the series. Options: 0-max. max is 15 (default) for chipv1.0 and 3 (default) for chipv1.1.
* of the series. Options: 0-max. max is 15 (default) for chipv1.0 and 3
* (default) for chipv1.1.
*/
void setStorageCellStart(int cell, Positions pos = {});
@ -1350,14 +1355,15 @@ class Detector {
/** [Gotthard2] */
Result<defs::streamingInterface> getVetoStream(Positions pos = {}) const;
/** [Gotthard2] Options: NONE (Default), LOW_LATENCY_LINK, ETHERNET_10GB (debugging), ALL
* Enable or disable the 2 veto streaming interfaces available. Can
* concatenate more than one interface. \nLOW_LATENCY_LINK is the default
* interface to work with. \nETHERNET_10GB is for debugging and also enables second
* interface in receiver for listening to veto packets (writes a separate
* file if writing enabled). Also restarts client and receiver zmq sockets
* if zmq streaming enabled.*/
void setVetoStream(const defs::streamingInterface value, Positions pos = {});
/** [Gotthard2] Options: NONE (Default), LOW_LATENCY_LINK, ETHERNET_10GB
* (debugging), ALL Enable or disable the 2 veto streaming interfaces
* available. Can concatenate more than one interface. \nLOW_LATENCY_LINK is
* the default interface to work with. \nETHERNET_10GB is for debugging and
* also enables second interface in receiver for listening to veto packets
* (writes a separate file if writing enabled). Also restarts client and
* receiver zmq sockets if zmq streaming enabled.*/
void setVetoStream(const defs::streamingInterface value,
Positions pos = {});
/** [Gotthard2] */
Result<defs::vetoAlgorithm>
@ -1723,11 +1729,12 @@ class Detector {
/** [Jungfrau][CTB][Moench] Advanced user Function! */
void resetFPGA(Positions pos = {});
/** [Jungfrau][Gotthard][CTB][Moench][Mythen3][Gotthard2]
/** [Jungfrau][Eiger][Gotthard][CTB][Moench][Mythen3][Gotthard2]
* Advanced user Function! \n
* Copy detector server fname from tftp folder of hostname to detector \n
* [Jungfrau][Gotthard][CTB][Moench] Also changes respawn server, which is
* effective after a reboot.
* Copy detector server fname from tftp folder of hostname to detector. Also
* creates a symbolic link to a shorter name (without vx.x.x) \n
* [Jungfrau][Gotthard][CTB][Moench] Also changes respawn server (to the
* link), which is effective after a reboot.
*/
void copyDetectorServer(const std::string &fname,
const std::string &hostname, Positions pos = {});

21
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -615,7 +615,8 @@ std::string CmdProxy::ReadoutSpeed(int action) {
"quarter_speed]\n\t\t[Eiger][Jungfrau] Readout "
"speed of chip.\n\t\t[Eiger] Default speed is full_speed."
"\n\t\t[Jungfrau] Default speed is half_speed. full_speed "
"option only available from v2.0 boards and is recommended to set "
"option only available from v2.0 boards and is recommended to "
"set "
"number of interfaces to 2. Also overwrites "
"adcphase to recommended default.\n\t [144|108]\n\t\t[Gotthard2] "
"Readout speed of chip in MHz. Default is 108."
@ -947,7 +948,8 @@ std::string CmdProxy::CurrentSource(int action) {
std::ostringstream os;
os << cmd << ' ';
if (action == defs::HELP_ACTION) {
os << "\n\t[0|1]\n\t\t[Gotthard2] Enable or disable current source. Default "
os << "\n\t[0|1]\n\t\t[Gotthard2] Enable or disable current source. "
"Default "
"is disabled.\n\t[0|1] [fix|nofix] [select source] [(only for "
"chipv1.1)normal|low]\n\t\t[Jungfrau] Disable or enable current "
"source with some parameters. The select source is 0-63 for "
@ -1320,7 +1322,8 @@ std::string CmdProxy::Trigger(int action) {
os << cmd << ' ';
if (action == defs::HELP_ACTION) {
if (cmd == "trigger") {
os << "\n\t[Eiger][Mythen3] Sends software trigger signal to detector";
os << "\n\t[Eiger][Mythen3] Sends software trigger signal to "
"detector";
} else if (cmd == "blockingtrigger") {
os << "\n\t[Eiger] Sends software trigger signal to detector and "
"blocks till "
@ -2032,7 +2035,8 @@ std::string CmdProxy::VetoStreaming(int action) {
if (action == defs::HELP_ACTION) {
os << "[none|lll|10gbe|...]\n\t[Gotthard2] Enable or disable the 2 "
"veto streaming interfaces available. Can include more than one "
"interface. \n\tDefault: none. lll (low latency link) is the default "
"interface. \n\tDefault: none. lll (low latency link) is the "
"default "
"interface to work with. \n\t10GbE is for debugging and also "
"enables second interface in receiver for listening to veto "
"packets (writes a separate file if writing enabled). Also "
@ -2839,10 +2843,11 @@ std::string CmdProxy::CopyDetectorServer(int action) {
os << cmd << ' ';
if (action == defs::HELP_ACTION) {
os << "[server_name] "
"[pc_host_name]\n\t[Jungfrau][Ctb][Moench][Mythen3][Gotthard2] "
"Copies detector server via tftp from pc. "
"\n\t[Jungfrau][Ctb][Moench]Also changes respawn server, which "
"is effective after a reboot."
"[pc_host_name]\n\t[Jungfrau][Eiger][Ctb][Moench][Mythen3]["
"Gotthard2] Copies detector server via tftp from pc. Makes a "
"symbolic link witha shorter name (without "
"vx.x.x).\n\t[Jungfrau][Ctb][Moench]Also changes respawn server "
"to the link, which is effective after a reboot."
<< '\n';
} else if (action == defs::GET_ACTION) {
throw sls::RuntimeError("Cannot get");