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

gotthard2: veto reference

Browse Source
This commit is contained in:
maliakal_d
2019-11-14 19:01:10 +01:00
parent fd631ebb71
commit 5518531620
17 changed files with 562 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -450,6 +450,8 @@ int setClockDivider(enum CLKINDEX ind, int val);
int getClockDivider(enum CLKINDEX ind);
int setInjectChannel(int offset, int increment);
void getInjectedChannels(int* offset, int* increment);
int setVetoPhoton(int chipIndex, int gainIndex, int* values);
int getVetoPhoton(int chipIndex, int* retvals);
#endif

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

@ -196,4 +196,6 @@ int get_pipeline(int);
int set_on_chip_dac(int);
int get_on_chip_dac(int);
int set_inject_channel(int);
int get_inject_channel(int);
int get_inject_channel(int);
int set_veto_photon(int);
int get_veto_photon(int);

8
slsDetectorServers/slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c
View File

@ -83,8 +83,8 @@ int ALTERA_PLL_C10_GetMaxPhaseShiftStepsofVCO() {
int ALTERA_PLL_C10_Reconfigure(int pllIndex) {
FILE_LOG(logINFO, ("\tReconfiguring PLL %d\n", pllIndex));
uint32_t waitreg = ALTERA_PLL_C10_Wait_Reg[pllIndex];
uint32_t waitmsk = ALTERA_PLL_C10_Wait_Msk[pllIndex];
//uint32_t waitreg = ALTERA_PLL_C10_Wait_Reg[pllIndex];
//uint32_t waitmsk = ALTERA_PLL_C10_Wait_Msk[pllIndex];
// write anything to base address to start reconfiguring
FILE_LOG(logDEBUG1, ("\tWriting 1 to base address 0x%x to start reconfiguring\n", ALTERA_PLL_C10_BaseAddress[pllIndex]));
@ -115,8 +115,8 @@ int ALTERA_PLL_C10_Reconfigure(int pllIndex) {
void ALTERA_PLL_C10_ResetPLL (int pllIndex) {
FILE_LOG(logINFO, ("Resetting PLL %d\n", pllIndex));
uint32_t resetreg = ALTERA_PLL_C10_Reset_Reg[pllIndex];
uint32_t resetmsk = ALTERA_PLL_C10_Reset_Msk[pllIndex];
//uint32_t resetreg = ALTERA_PLL_C10_Reset_Reg[pllIndex];
//uint32_t resetmsk = ALTERA_PLL_C10_Reset_Msk[pllIndex];
FILE_LOG(logERROR, ("Reset not implemented yet!\n"));
/* TODO reset reg and reset mask to be done in firware, so wait instead (above)

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

@ -298,6 +298,8 @@ const char* getFunctionName(enum detFuncs func) {
case F_GET_ON_CHIP_DAC: return "F_GET_ON_CHIP_DAC";
case F_SET_INJECT_CHANNEL: return "F_SET_INJECT_CHANNEL";
case F_GET_INJECT_CHANNEL: return "F_GET_INJECT_CHANNEL";
case F_SET_VETO_PHOTON: return "F_SET_VETO_PHOTON";
case F_GET_VETO_PHOTON: return "F_GET_VETO_PHOTON";
default: return "Unknown Function";
}
@ -473,7 +475,9 @@ void function_table() {
flist[F_GET_ON_CHIP_DAC] = &get_on_chip_dac;
flist[F_SET_INJECT_CHANNEL] = &set_inject_channel;
flist[F_GET_INJECT_CHANNEL] = &get_inject_channel;
flist[F_SET_VETO_PHOTON] = &set_veto_photon;
flist[F_GET_VETO_PHOTON] = &get_veto_photon;
// check
if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) {
FILE_LOG(logERROR, ("The last detector function enum has reached its limit\nGoodbye!\n"));
@ -6176,7 +6180,6 @@ int set_inject_channel(int file_des) {
} else {
ret = setInjectChannel(offset, increment);
if (ret == FAIL) {
ret = FAIL;
strcpy(mess, "Could not inject channel\n");
FILE_LOG(logERROR, (mess));
}
@ -6206,3 +6209,102 @@ int get_inject_channel(int file_des) {
#endif
return Server_SendResult(file_des, INT32, UPDATE, retvals, sizeof(retvals));
}
int set_veto_photon(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
int args[3] = {-1, -1, -1};
if (receiveData(file_des, args, sizeof(args), INT32) < 0)
return printSocketReadError();
int values[args[2]];
if (receiveData(file_des, values, sizeof(values), INT32) < 0)
return printSocketReadError();
FILE_LOG(logINFO, ("Setting Veto Photon: [chipIndex:%d, G%d, nch:%d]\n", args[0], args[1], args[2]));
#ifndef GOTTHARD2D
functionNotImplemented();
#else
// only set
if (Server_VerifyLock() == OK) {
int chipIndex = args[0];
int gainIndex = args[1];
int numChannels = args[2];
if (chipIndex < -1 || chipIndex >= NCHIP) {
ret = FAIL;
sprintf(mess, "Could not set veto photon. Invalid chip index %d\n", chipIndex);
FILE_LOG(logERROR, (mess));
} else if (gainIndex < 0 || gainIndex > 2) {
ret = FAIL;
sprintf(mess, "Could not set veto photon. Invalid gain index %d\n", gainIndex);
FILE_LOG(logERROR, (mess));
} else if (numChannels != NCHAN) {
ret = FAIL;
sprintf(mess, "Could not set veto photon. Invalid number of channels %d. Expected %d\n", numChannels, NCHAN);
FILE_LOG(logERROR, (mess));
} else {
int i = 0;
for (i = 0; i < NCHAN; ++i) {
if (values[i] > ADU_MAX_VAL) {
ret = FAIL;
sprintf(mess, "Could not set veto photon. Invalid ADU value 0x%x for channel %d, must be 12 bit.\n", i, values[i]);
FILE_LOG(logERROR, (mess));
break;
}
}
if (ret == OK) {
ret = setVetoPhoton(chipIndex, gainIndex, values);
if (ret == FAIL) {
sprintf(mess, "Could not set veto photon for chip index %d\n", chipIndex);
FILE_LOG(logERROR, (mess));
}
}
}
}
#endif
return Server_SendResult(file_des, INT32, UPDATE, NULL, 0);
}
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));
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
return printSocketReadError();
FILE_LOG(logDEBUG1, ("Getting veto photon [chip Index:%d]\n", arg));
#ifndef GOTTHARD2D
functionNotImplemented();
#else
// 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);
FILE_LOG(logERROR, (mess));
} else {
ret = getVetoPhoton(chipIndex, retvals);
if (ret == FAIL) {
strcpy(mess, "Could not get veto photon for chipIndex -1. Not the same for all chips.\n");
FILE_LOG(logERROR, (mess));
} else {
int i = 0;
for (i = 0; i < NCHAN; ++i) {
FILE_LOG(logDEBUG1, ("%d:0x%x\n", i, retvals[i]));
}
}
}
#endif
Server_SendResult(file_des, INT32, UPDATE, NULL, 0);
if (ret != FAIL) {
int nch = NCHAN;
sendData(file_des, &nch, sizeof(nch), INT32);
sendData(file_des, retvals, sizeof(retvals), INT32);
}
return ret;
}