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

Nextframenumber (#215)

Browse Source
This commit is contained in:
Dhanya Thattil
2020-11-16 17:26:12 +01:00
committed by GitHub
parent 4c4e2ccb6b
commit a6d696a0f8
39 changed files with 561 additions and 473 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.

20
slsDetectorServers/eigerDetectorServer/Beb.c
View File

@ -35,7 +35,7 @@ int Beb_activated = 1;
uint32_t Beb_detid = 0;
int Beb_top = 0;
uint64_t Beb_deactivatedStartFrameNumber = 0;
uint64_t Beb_deactivatedNextFrameNumber = 0;
int Beb_quadEnable = 0;
int Beb_positions[2] = {0, 0};
int Beb_readNLines = MAX_ROWS_PER_READOUT;
@ -1441,22 +1441,22 @@ int Beb_SetDetectorPosition(int pos[]) {
return ret;
}
int Beb_SetStartingFrameNumber(uint64_t value) {
int Beb_SetNextFrameNumber(uint64_t value) {
if (!Beb_activated) {
Beb_deactivatedStartFrameNumber = value;
Beb_deactivatedNextFrameNumber = value;
return OK;
}
LOG(logINFO,
("Setting start frame number: %llu\n", (long long unsigned int)value));
("Setting next frame number: %llu\n", (long long unsigned int)value));
u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_TEST_BASEADDR);
if (fd < 0) {
LOG(logERROR, ("Set Start Frame Number FAIL\n"));
LOG(logERROR, ("Set next Frame Number FAIL\n"));
return FAIL;
}
// since the read is not implemented in firmware yet
Beb_deactivatedStartFrameNumber = value;
Beb_deactivatedNextFrameNumber = value;
// decrement for firmware
uint64_t valueInFirmware = value - 1;
@ -1471,17 +1471,17 @@ int Beb_SetStartingFrameNumber(uint64_t value) {
return OK;
}
int Beb_GetStartingFrameNumber(uint64_t *retval, int tengigaEnable) {
int Beb_GetNextFrameNumber(uint64_t *retval, int tengigaEnable) {
if (!Beb_activated) {
*retval = Beb_deactivatedStartFrameNumber;
*retval = Beb_deactivatedNextFrameNumber;
return OK;
}
LOG(logDEBUG1, ("Getting start frame number\n"));
LOG(logDEBUG1, ("Getting next frame number\n"));
u_int32_t *csp0base = 0;
int fd = Beb_open(&csp0base, XPAR_COUNTER_BASEADDR);
if (fd < 0) {
LOG(logERROR, ("Get Start Frame Number FAIL\n"));
LOG(logERROR, ("Get next Frame Number FAIL\n"));
return FAIL;
}

4
slsDetectorServers/eigerDetectorServer/Beb.h
View File

@ -103,8 +103,8 @@ int Beb_SetQuad(int value);
int Beb_GetQuad();
int *Beb_GetDetectorPosition();
int Beb_SetDetectorPosition(int pos[]);
int Beb_SetStartingFrameNumber(uint64_t value);
int Beb_GetStartingFrameNumber(uint64_t *retval, int tengigaEnable);
int Beb_SetNextFrameNumber(uint64_t value);
int Beb_GetNextFrameNumber(uint64_t *retval, int tengigaEnable);
void Beb_SetReadNLines(int value);

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

26
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -85,7 +85,7 @@ int eiger_virtual_transmission_delay_right = 0;
int eiger_virtual_transmission_delay_frame = 0;
int eiger_virtual_transmission_flowcontrol_10g = 0;
int eiger_virtual_activate = 1;
uint64_t eiger_virtual_startingframenumber = 1;
uint64_t eiger_virtual_nextframenumber = 1;
int eiger_virtual_detPos[2] = {0, 0};
int eiger_virtual_test_mode = 0;
int eiger_virtual_quad_mode = 0;
@ -702,7 +702,7 @@ void setupDetector() {
setClockDivider(RUN_CLK, DEFAULT_CLK_SPEED); // clk_devider,half speed
setIODelay(DEFAULT_IO_DELAY);
setTiming(DEFAULT_TIMING_MODE);
setStartingFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
setNextFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
setReadNLines(MAX_ROWS_PER_READOUT);
// SetPhotonEnergyCalibrationParameters(-5.8381e-5,1.838515,5.09948e-7,-4.32390e-11,1.32527e-15);
eiger_tau_ns = DEFAULT_RATE_CORRECTION;
@ -851,21 +851,21 @@ int getOverFlowMode() { return eiger_overflow32; }
/* parameters - timer */
int setStartingFrameNumber(uint64_t value) {
int setNextFrameNumber(uint64_t value) {
#ifdef VIRTUAL
eiger_virtual_startingframenumber = value;
eiger_virtual_nextframenumber = value;
return OK;
#else
return Beb_SetStartingFrameNumber(value);
return Beb_SetNextFrameNumber(value);
#endif
}
int getStartingFrameNumber(uint64_t *retval) {
int getNextFrameNumber(uint64_t *retval) {
#ifdef VIRTUAL
*retval = eiger_virtual_startingframenumber;
*retval = eiger_virtual_nextframenumber;
return OK;
#else
return Beb_GetStartingFrameNumber(retval, send_to_ten_gig);
return Beb_GetNextFrameNumber(retval, send_to_ten_gig);
#endif
}
@ -2256,7 +2256,7 @@ void *start_timer(void *arg) {
// Send data
{
uint64_t frameNr = 0;
getStartingFrameNumber(&frameNr);
getNextFrameNumber(&frameNr);
// loop over number of frames
for (int iframes = 0; iframes != numFrames; ++iframes) {
@ -2264,7 +2264,7 @@ void *start_timer(void *arg) {
// check if manual stop
if (sharedMemory_getStop() == 1) {
setStartingFrameNumber(frameNr + iframes + 1);
setNextFrameNumber(frameNr + iframes + 1);
break;
}
@ -2357,7 +2357,7 @@ void *start_timer(void *arg) {
}
}
}
setStartingFrameNumber(frameNr + numFrames);
setNextFrameNumber(frameNr + numFrames);
}
closeUDPSocket(0);
@ -2395,8 +2395,8 @@ int stopStateMachine() {
// ensure all have same starting frame numbers
uint64_t retval = 0;
if (Beb_GetStartingFrameNumber(&retval, send_to_ten_gig) == -2) {
Beb_SetStartingFrameNumber(retval + 1);
if (Beb_GetNextFrameNumber(&retval, send_to_ten_gig) == -2) {
Beb_SetNextFrameNumber(retval + 1);
}
return OK;
#endif

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

16
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -446,7 +446,7 @@ void setupDetector() {
/*setClockDivider(RUN_CLK, HALF_SPEED); depends if all the previous stuff
* works*/
setTiming(DEFAULT_TIMING_MODE);
setStartingFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
setNextFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
// temp threshold and reset event
setThresholdTemperature(DEFAULT_TMP_THRSHLD);
@ -533,9 +533,9 @@ int selectStoragecellStart(int pos) {
DAQ_STRG_CELL_SLCT_OFST);
}
int setStartingFrameNumber(uint64_t value) {
LOG(logINFO, ("Setting starting frame number: %llu\n",
(long long unsigned int)value));
int setNextFrameNumber(uint64_t value) {
LOG(logINFO,
("Setting next frame number: %llu\n", (long long unsigned int)value));
#ifdef VIRTUAL
setU64BitReg(value, FRAME_NUMBER_LSB_REG, FRAME_NUMBER_MSB_REG);
#else
@ -547,7 +547,7 @@ int setStartingFrameNumber(uint64_t value) {
return OK;
}
int getStartingFrameNumber(uint64_t *retval) {
int getNextFrameNumber(uint64_t *retval) {
#ifdef VIRTUAL
*retval = getU64BitReg(FRAME_NUMBER_LSB_REG, FRAME_NUMBER_MSB_REG);
#else
@ -1727,14 +1727,14 @@ void *start_timer(void *arg) {
// Send data
{
uint64_t frameNr = 0;
getStartingFrameNumber(&frameNr);
getNextFrameNumber(&frameNr);
for (int iframes = 0; iframes != numFrames; ++iframes) {
usleep(transmissionDelayUs);
// check if manual stop
if (sharedMemory_getStop() == 1) {
setStartingFrameNumber(frameNr + iframes + 1);
setNextFrameNumber(frameNr + iframes + 1);
break;
}
@ -1800,7 +1800,7 @@ void *start_timer(void *arg) {
}
}
}
setStartingFrameNumber(frameNr + numFrames);
setNextFrameNumber(frameNr + numFrames);
}
closeUDPSocket(0);

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

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

@ -200,8 +200,8 @@ int getReadoutMode();
int selectStoragecellStart(int pos);
#endif
#if defined(JUNGFRAUD) || defined(EIGERD)
int setStartingFrameNumber(uint64_t value);
int getStartingFrameNumber(uint64_t *value);
int setNextFrameNumber(uint64_t value);
int getNextFrameNumber(uint64_t *value);
#endif
void setNumFrames(int64_t val);
int64_t getNumFrames();

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

@ -140,8 +140,8 @@ int set_adc_invert(int);
int get_adc_invert(int);
int set_external_sampling_source(int);
int set_external_sampling(int);
int set_starting_frame_number(int);
int get_starting_frame_number(int);
int set_next_frame_number(int);
int get_next_frame_number(int);
int set_quad(int);
int get_quad(int);
int set_interrupt_subframe(int);
@ -241,4 +241,5 @@ int reconfigure_udp(int);
int validate_udp_configuration(int);
int get_bursts_left(int);
int start_readout(int);
int set_default_dacs(int);
int set_default_dacs(int);
int is_virtual(int);

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

@ -262,8 +262,8 @@ void function_table() {
flist[F_GET_ADC_INVERT] = &get_adc_invert;
flist[F_EXTERNAL_SAMPLING_SOURCE] = &set_external_sampling_source;
flist[F_EXTERNAL_SAMPLING] = &set_external_sampling;
flist[F_SET_STARTING_FRAME_NUMBER] = &set_starting_frame_number;
flist[F_GET_STARTING_FRAME_NUMBER] = &get_starting_frame_number;
flist[F_SET_NEXT_FRAME_NUMBER] = &set_next_frame_number;
flist[F_GET_NEXT_FRAME_NUMBER] = &get_next_frame_number;
flist[F_SET_QUAD] = &set_quad;
flist[F_GET_QUAD] = &get_quad;
flist[F_SET_INTERRUPT_SUBFRAME] = &set_interrupt_subframe;
@ -360,6 +360,7 @@ void function_table() {
flist[F_GET_BURSTS_LEFT] = &get_bursts_left;
flist[F_START_READOUT] = &start_readout;
flist[F_SET_DEFAULT_DACS] = &set_default_dacs;
flist[F_IS_VIRTUAL] = &is_virtual;
// check
if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) {
@ -1755,7 +1756,8 @@ int acquire(int blocking, int file_des) {
strcpy(mess, "Could not start acquisition thread!\n");
LOG(logERROR, (mess));
} else {
if (blocking) {
// only does not wait for non blocking and scan
if (blocking || !scan) {
pthread_join(pthread_tid, NULL);
}
}
@ -4497,14 +4499,14 @@ int set_external_sampling(int file_des) {
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
}
int set_starting_frame_number(int file_des) {
int set_next_frame_number(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
uint64_t arg = 0;
if (receiveData(file_des, &arg, sizeof(arg), INT64) < 0)
return printSocketReadError();
LOG(logINFO, ("Setting starting frame number to %llu\n", arg));
LOG(logINFO, ("Setting next frame number to %llu\n", arg));
#if (!defined(EIGERD)) && (!defined(JUNGFRAUD))
functionNotImplemented();
@ -4513,8 +4515,7 @@ int set_starting_frame_number(int file_des) {
if (Server_VerifyLock() == OK) {
if (arg == 0) {
ret = FAIL;
sprintf(mess,
"Could not set starting frame number. Cannot be 0.\n");
sprintf(mess, "Could not set next frame number. Cannot be 0.\n");
LOG(logERROR, (mess));
}
#ifdef EIGERD
@ -4522,12 +4523,12 @@ int set_starting_frame_number(int file_des) {
ret = FAIL;
#ifdef VIRTUAL
sprintf(mess,
"Could not set starting frame number. Must be less then "
"Could not set next frame number. Must be less then "
"%ld (0x%lx)\n",
UDP_HEADER_MAX_FRAME_VALUE, UDP_HEADER_MAX_FRAME_VALUE);
#else
sprintf(mess,
"Could not set starting frame number. Must be less then "
"Could not set next frame number. Must be less then "
"%lld (0x%llx)\n",
UDP_HEADER_MAX_FRAME_VALUE, UDP_HEADER_MAX_FRAME_VALUE);
#endif
@ -4535,21 +4536,21 @@ int set_starting_frame_number(int file_des) {
}
#endif
else {
ret = setStartingFrameNumber(arg);
ret = setNextFrameNumber(arg);
if (ret == FAIL) {
sprintf(mess, "Could not set starting frame number. Failed to "
sprintf(mess, "Could not set next frame number. Failed to "
"map address.\n");
LOG(logERROR, (mess));
}
if (ret == OK) {
uint64_t retval = 0;
ret = getStartingFrameNumber(&retval);
ret = getNextFrameNumber(&retval);
if (ret == FAIL) {
sprintf(mess, "Could not get starting frame number. Failed "
sprintf(mess, "Could not get next frame number. Failed "
"to map address.\n");
LOG(logERROR, (mess));
} else if (ret == -2) {
sprintf(mess, "Inconsistent starting frame number from "
sprintf(mess, "Inconsistent next frame number from "
"left and right FPGA. Please set it.\n");
LOG(logERROR, (mess));
} else {
@ -4557,12 +4558,12 @@ int set_starting_frame_number(int file_des) {
ret = FAIL;
#ifdef VIRTUAL
sprintf(mess,
"Could not set starting frame number. Set "
"Could not set next frame number. Set "
"0x%lx, but read 0x%lx\n",
arg, retval);
#else
sprintf(mess,
"Could not set starting frame number. Set "
"Could not set next frame number. Set "
"0x%llx, but read 0x%llx\n",
arg, retval);
#endif
@ -4576,28 +4577,28 @@ int set_starting_frame_number(int file_des) {
return Server_SendResult(file_des, INT64, NULL, 0);
}
int get_starting_frame_number(int file_des) {
int get_next_frame_number(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
uint64_t retval = -1;
LOG(logDEBUG1, ("Getting Starting frame number \n"));
LOG(logDEBUG1, ("Getting next frame number \n"));
#if (!defined(EIGERD)) && (!defined(JUNGFRAUD))
functionNotImplemented();
#else
// get
ret = getStartingFrameNumber(&retval);
ret = getNextFrameNumber(&retval);
if (ret == FAIL) {
sprintf(mess, "Could not get starting frame number. Failed to map "
sprintf(mess, "Could not get next frame number. Failed to map "
"address.\n");
LOG(logERROR, (mess));
} else if (ret == -2) {
sprintf(mess, "Inconsistent starting frame number from left and right "
sprintf(mess, "Inconsistent next frame number from left and right "
"FPGA. Please set it.\n");
LOG(logERROR, (mess));
} else {
LOG(logDEBUG1, ("Start frame number retval: %u\n", retval));
LOG(logDEBUG1, ("next frame number retval: %u\n", retval));
}
#endif
return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
@ -6364,13 +6365,19 @@ int set_veto_photon(int file_des) {
const int chipIndex = args[0];
const int numChannels = args[1];
int gainIndices[numChannels];
if (receiveData(file_des, gainIndices, sizeof(gainIndices), INT32) < 0)
int *gainIndices = malloc(sizeof(int) * numChannels);
if (receiveData(file_des, gainIndices, sizeof(int) * numChannels, INT32) <
0) {
free(gainIndices);
return printSocketReadError();
}
int values[numChannels];
if (receiveData(file_des, values, sizeof(values), INT32) < 0)
int *values = malloc(sizeof(int) * numChannels);
if (receiveData(file_des, values, sizeof(int) * numChannels, INT32) < 0) {
free(gainIndices);
free(values);
return printSocketReadError();
}
LOG(logINFO, ("Setting Veto Photon: [chipIndex:%d, nch:%d]\n", chipIndex,
numChannels));
@ -6425,6 +6432,12 @@ int set_veto_photon(int file_des) {
}
}
#endif
if (gainIndices != NULL) {
free(gainIndices);
}
if (values != NULL) {
free(values);
}
return Server_SendResult(file_des, INT32, NULL, 0);
}
@ -6432,10 +6445,8 @@ int get_veto_photon(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int arg = -1;
int retvals[NCHAN];
memset(retvals, 0, sizeof(retvals));
int gainRetvals[NCHAN];
memset(gainRetvals, 0, sizeof(gainRetvals));
int *retvals = NULL;
int *gainRetvals = NULL;
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError();
@ -6444,24 +6455,38 @@ int get_veto_photon(int file_des) {
#ifndef GOTTHARD2D
functionNotImplemented();
#else
// get only
int chipIndex = arg;
if (chipIndex < -1 || chipIndex >= NCHIP) {
retvals = malloc(sizeof(int) * NCHAN);
gainRetvals = malloc(sizeof(int) * NCHAN);
memset(retvals, 0, sizeof(int) * NCHAN);
memset(gainRetvals, 0, sizeof(int) * NCHAN);
if (retvals == NULL || gainRetvals == NULL) {
ret = FAIL;
sprintf(mess, "Could not get veto photon. Invalid chip index %d\n",
chipIndex);
strcpy(
mess,
"Could not get veto photon. Could not allocate memory in server\n");
LOG(logERROR, (mess));
} else {
ret = getVetoPhoton(chipIndex, retvals, gainRetvals);
if (ret == FAIL) {
strcpy(mess,
"Could not get veto photon for chipIndex -1. Not the "
"same for all chips. Select specific chip index instead.\n");
// get only
int chipIndex = arg;
if (chipIndex < -1 || chipIndex >= NCHIP) {
ret = FAIL;
sprintf(mess, "Could not get veto photon. Invalid chip index %d\n",
chipIndex);
LOG(logERROR, (mess));
} else {
for (int i = 0; i < NCHAN; ++i) {
LOG(logDEBUG1,
("%d:[%d, %d]\n", i, retvals[i], gainRetvals[i]));
ret = getVetoPhoton(chipIndex, retvals, gainRetvals);
if (ret == FAIL) {
strcpy(mess,
"Could not get veto photon for chipIndex -1. Not the "
"same for all chips. Select specific chip index "
"instead.\n");
LOG(logERROR, (mess));
} else {
for (int i = 0; i < NCHAN; ++i) {
LOG(logDEBUG1,
("%d:[%d, %d]\n", i, retvals[i], gainRetvals[i]));
}
}
}
}
@ -6473,6 +6498,12 @@ int get_veto_photon(int file_des) {
sendData(file_des, gainRetvals, sizeof(gainRetvals), INT32);
sendData(file_des, retvals, sizeof(retvals), INT32);
}
if (retvals != NULL) {
free(retvals);
}
if (gainRetvals != NULL) {
free(gainRetvals);
}
return ret;
}
@ -8162,4 +8193,15 @@ int set_default_dacs(int file_des) {
}
#endif
return Server_SendResult(file_des, INT32, NULL, 0);
}
}
int is_virtual(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int retval = 0;
#ifdef VIRTUAL
retval = 1;
#endif
LOG(logDEBUG1, ("is virtual retval: %d\n", retval));
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
}