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

merge vetoheader

Browse Source
This commit is contained in:
maliakal_d
2020-05-29 10:50:33 +02:00
parent f0a318777c 15eea51f12
commit c6ff50d753
25 changed files with 600 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h
View File

@ -89,6 +89,8 @@
#define CONFIG_VETO_ENBL_OFST (0)
#define CONFIG_VETO_ENBL_MSK (0x00000001 << CONFIG_VETO_ENBL_OFST)
#define CONFIG_VETO_CH_10GB_ENBL_OFST (1)
#define CONFIG_VETO_CH_10GB_ENBL_MSK (0x00000001 << CONFIG_VETO_CH_10GB_ENBL_OFST)
/* Control RW register */
#define CONTROL_REG (0x21 * REG_OFFSET + BASE_CONTROL)
@ -248,6 +250,6 @@
/* UDP datagram registers --------------------------------------------------*/
#define RXR_ENDPOINTS_MAX (32)
#define RXR_ENDPOINT_OFST (0x10)
#define RXR_ENDPOINT_OFST (16 * REG_OFFSET)
// clang-format on

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

76
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -1295,23 +1295,21 @@ void setNumberofUDPInterfaces(int val) {
// 2 interfaces (enable veto)
if (val > 1) {
LOG(logINFOBLUE,
("Setting #Interfaces: 2 (enabling veto streaming)\n"));
bus_w(addr, bus_r(addr) | CONFIG_VETO_ENBL_MSK);
LOG(logINFOBLUE, ("Setting #Interfaces: 2 (10gbps veto streaming)\n"));
bus_w(addr, bus_r(addr) | CONFIG_VETO_CH_10GB_ENBL_MSK);
}
// 1 interface (disable veto)
else {
LOG(logINFOBLUE,
("Setting #Interfaces: 1 (disabling veto streaming)\n"));
bus_w(addr, bus_r(addr) & ~CONFIG_VETO_ENBL_MSK);
LOG(logINFOBLUE, ("Setting #Interfaces: 1 (2.5gbps veto streaming)\n"));
bus_w(addr, bus_r(addr) & ~CONFIG_VETO_CH_10GB_ENBL_MSK);
}
LOG(logDEBUG, ("config reg:0x%x\n", bus_r(addr)));
}
int getNumberofUDPInterfaces() {
LOG(logDEBUG, ("config reg:0x%x\n", bus_r(CONFIG_REG)));
// return 2 if veto enabled, else 1
return ((bus_r(CONFIG_REG) & CONFIG_VETO_ENBL_MSK) ? 2 : 1);
// return 2 if 10gbps veto streaming enabled, else 1
return ((bus_r(CONFIG_REG) & CONFIG_VETO_CH_10GB_ENBL_MSK) ? 2 : 1);
}
void setupHeader(int iRxEntry, int vetoInterface, uint32_t destip,
@ -1422,7 +1420,10 @@ int configureMAC() {
getIpAddressinString(dst_ip2, dstip2);
int numInterfaces = getNumberofUDPInterfaces();
LOG(logINFO, ("\t#Interfaces : %d\n", numInterfaces));
int vetoEnabled = getVeto();
LOG(logINFO, ("\t#Veto : %d\n", vetoEnabled));
LOG(logINFO, ("\t#10Gb Interfaces : %d\n", numInterfaces));
LOG(logINFO, ("\tData Interface \n"));
LOG(logINFO, ("\tSource IP : %s\n"
@ -1433,8 +1434,9 @@ int configureMAC() {
"\tDest Port : %d\n",
src_ip, src_mac, srcport, dst_ip, dst_mac, dstport));
LOG(logINFO, ("\tVeto Interface (%s)\n",
(numInterfaces == 2 ? "enabled" : "disabled")));
LOG(logINFO,
("\tVeto Interface (%s)\n",
(vetoEnabled && numInterfaces == 2 ? "enabled" : "disabled")));
LOG(logINFO, ("\tSource IP2 : %s\n"
"\tSource MAC2 : %s\n"
"\tSource Port2: %d\n"
@ -1448,7 +1450,7 @@ int configureMAC() {
LOG(logERROR, ("could not set udp destination IP and port\n"));
return FAIL;
}
if (numInterfaces == 2 &&
if (vetoEnabled && numInterfaces == 2 &&
setUDPDestinationDetails(1, dst_ip2, dstport2) == FAIL) {
LOG(logERROR,
("could not set udp destination IP and port for interface 2\n"));
@ -1463,7 +1465,7 @@ int configureMAC() {
setupHeader(iRxEntry, 0, dstip, dstmac, dstport, srcmac, srcip, srcport);
// veto
if (numInterfaces == 2) {
if (vetoEnabled && numInterfaces == 2) {
setupHeader(iRxEntry, 1, dstip2, dstmac2, dstport2, srcmac2, srcip2,
srcport2);
}
@ -2207,6 +2209,27 @@ enum timingSourceType getTimingSource() {
return TIMING_INTERNAL;
}
void setVeto(int enable) {
if (enable >= 0) {
uint32_t addr = CONFIG_REG;
if (enable) {
LOG(logINFOBLUE, ("Enabling veto streaming\n"));
bus_w(addr, bus_r(addr) | CONFIG_VETO_ENBL_MSK);
} else {
LOG(logINFOBLUE, ("Disabling veto streaming\n"));
bus_w(addr, bus_r(addr) & ~CONFIG_VETO_ENBL_MSK);
}
LOG(logDEBUG, ("config reg:0x%x\n", bus_r(addr)));
}
}
int getVeto() {
LOG(logDEBUG, ("config reg:0x%x\n", bus_r(CONFIG_REG)));
return ((bus_r(CONFIG_REG) & CONFIG_VETO_ENBL_MSK) >>
CONFIG_VETO_ENBL_OFST);
}
/* aquisition */
int startStateMachine() {
@ -2215,7 +2238,8 @@ int startStateMachine() {
if (createUDPSocket(0) != OK) {
return FAIL;
}
if (getNumberofUDPInterfaces() == 2 && createUDPSocket(1) != OK) {
if (getVeto() && getNumberofUDPInterfaces() == 2 &&
createUDPSocket(1) != OK) {
return FAIL;
}
LOG(logINFOBLUE, ("Starting State Machine\n"));
@ -2258,6 +2282,8 @@ void *start_timer(void *arg) {
}
int numInterfaces = getNumberofUDPInterfaces();
int vetoEnabled = getVeto();
int numRepeats = getNumTriggers();
if (getTiming() == AUTO_TIMING) {
if (burstMode == BURST_OFF) {
@ -2274,7 +2300,7 @@ void *start_timer(void *arg) {
int datasize = imagesize;
int packetsize = datasize + sizeof(sls_detector_header);
int vetodatasize = VETO_DATA_SIZE;
int vetopacketsize = vetodatasize + sizeof(sls_detector_header);
int vetopacketsize = vetodatasize + sizeof(veto_header);
// Generate data
char imageData[imagesize];
@ -2331,21 +2357,15 @@ void *start_timer(void *arg) {
sendUDPPacket(0, packetData, packetsize);
// second interface (veto)
char packetData2[packetsize];
memset(packetData2, 0, packetsize);
if (numInterfaces == 2) {
char packetData2[vetopacketsize];
memset(packetData2, 0, vetopacketsize);
if (vetoEnabled && numInterfaces == 2) {
// set header
sls_detector_header *header =
(sls_detector_header *)(packetData2);
header->detType = (uint16_t)myDetectorType;
header->version = SLS_DETECTOR_HEADER_VERSION - 1;
veto_header *header = (veto_header *)(packetData2);
header->frameNumber = frameHeaderNr;
header->packetNumber = 0;
header->modId = 0;
header->row = detPos[X];
header->column = detPos[Y];
header->bunchId = 0;
// fill data
memcpy(packetData2 + sizeof(sls_detector_header), vetoData,
memcpy(packetData2 + sizeof(veto_header), vetoData,
vetodatasize);
// send 1 packet = 1 frame
sendUDPPacket(1, packetData2, vetopacketsize);
@ -2379,7 +2399,7 @@ void *start_timer(void *arg) {
}
closeUDPSocket(0);
if (numInterfaces == 2) {
if (vetoEnabled && numInterfaces == 2) {
closeUDPSocket(1);
}

7
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -12,7 +12,7 @@
#define NADC (32)
#define ONCHIP_NDAC (7)
#define DYNAMIC_RANGE (16)
#define HV_SOFT_MAX_VOLTAGE (200)
#define HV_SOFT_MAX_VOLTAGE (500)
#define HV_HARD_MAX_VOLTAGE (530)
#define HV_DRIVER_FILE_NAME ("/etc/devlinks/hvdac")
#define DAC_DRIVER_FILE_NAME ("/etc/devlinks/dac")
@ -57,6 +57,11 @@
#define READOUT_PLL_VCO_FREQ_HZ (866666688) // 866 MHz
#define SYSTEM_PLL_VCO_FREQ_HZ (722222224) // 722 MHz
#define VETO_DATA_SIZE (160)
typedef struct {
uint64_t frameNumber;
uint64_t bunchId;
} veto_header;
/** Other Definitions */
#define BIT16_MASK (0xFFFF)

2
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -518,6 +518,8 @@ void setCurrentSource(int value);
int getCurrentSource();
void setTimingSource(enum timingSourceType value);
enum timingSourceType getTimingSource();
void setVeto(int enable);
int getVeto();
#endif
#if defined(JUNGFRAUD) || defined(EIGERD)

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

@ -224,4 +224,6 @@ int get_num_gates(int);
int set_gate_delay(int);
int get_gate_delay(int);
int get_exptime_all_gates(int);
int get_gate_delay_all_gates(int);
int get_gate_delay_all_gates(int);
int get_veto(int);
int set_veto(int);

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

@ -336,6 +336,8 @@ void function_table() {
flist[F_GET_GATE_DELAY] = &get_gate_delay;
flist[F_GET_EXPTIME_ALL_GATES] = &get_exptime_all_gates;
flist[F_GET_GATE_DELAY_ALL_GATES] = &get_gate_delay_all_gates;
flist[F_GET_VETO] = &get_veto;
flist[F_SET_VETO] = &set_veto;
// check
if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) {
@ -7429,3 +7431,62 @@ int get_gate_delay_all_gates(int file_des) {
#endif
return Server_SendResult(file_des, INT64, retvals, sizeof(retvals));
}
int get_veto(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int retval = -1;
LOG(logDEBUG1, ("Getting veto\n"));
#ifndef GOTTHARD2D
functionNotImplemented();
#else
// get only
retval = getVeto();
LOG(logDEBUG1, ("veto mode retval: %u\n", retval));
#endif
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
}
int set_veto(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int arg = 0;
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError();
LOG(logINFO, ("Setting veto mode: %u\n", arg));
#ifndef GOTTHARD2D
functionNotImplemented();
#else
// only set
if (Server_VerifyLock() == OK) {
setVeto(arg);
// if numinterfaces is 2 and veto is 1 now, then configuremac
if (arg > 0 && getNumberofUDPInterfaces() == 2 &&
is_configurable() == OK) {
ret = configureMAC();
if (ret != OK) {
sprintf(mess, "Configure Mac failed after enabling veto\n");
strcpy(configureMessage, mess);
LOG(logERROR, (mess));
configured = FAIL;
LOG(logWARNING, ("Configure FAIL, not all parameters "
"configured yet\n"));
} else {
LOG(logINFOGREEN, ("\tConfigure MAC successful\n"));
configured = OK;
}
}
if (ret == OK) {
int retval = getVeto();
LOG(logDEBUG1, ("veto mode retval: %u\n", retval));
validate(arg, retval, "set veto mode", DEC);
}
}
#endif
return Server_SendResult(file_des, INT32, NULL, 0);
}