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

cleaning up of servers

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-02 19:29:34 +02:00
parent 2465eafff0
commit 0254ff0281
8 changed files with 1083 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -97,12 +97,17 @@ int setROI(int n, ROI arg[], int *retvalsize, int *ret);
int setSpeed(enum speedVariable arg, int val);
#if defined(EIGERD) || defined(MYTHEND)
enum readOutFlags setReadOutFlags(enum readOutFlags val);
#endif
#ifdef MYTHEND
int executeTrimming(enum trimMode mode, int par1, int par2, int imod);
#endif
// parameters - timer
int64_t setTimer(enum timerIndex ind, int64_t val);
#ifndef EIGERD
int64_t getTimeLeft(enum timerIndex ind);
#endif
// parameters - channel, chip, module, settings
#ifdef MYTHEND
@ -128,12 +133,22 @@ int setThresholdEnergy(int ev, int imod);
#endif
// parameters - dac, adc, hv
void setDAC(enum detDacIndex ind, int val, int imod, int mV, int retval[]);
int getADC(enum detAdcIndex ind, int imod);
#ifdef JUNGFRAUD
void serializeToSPI(u_int32_t addr, u_int32_t val, u_int16_t csmask, int numbitstosend, u_int16_t clkmask, u_int16_t digoutmask, int digofset);
void initDac(int dacnum);
void prepareADC();
void setAdc(int addr, int val);
int voltageToDac(int value);
int dacToVoltage(unsigned int digital);
#endif
void setDAC(enum DAC_INDEX ind, int val, int imod, int mV, int retval[]);
int getADC(enum ADC_INDEX ind, int imod);
#ifndef MYTHEND
int setHighVoltage(int val);
#endif
// parameters - timing, extsig
#ifdef MYTHEND
enum externalSignalFlag getExtSignal(int signalindex);
@ -159,7 +174,10 @@ int resetCounterBlock(int startACQ);
int calibratePedestal(int frames);
#elif JUNGFRAUD
// jungfrau specific - flashing fpga
// jungfrau specific - pll, flashing firmware
void resetPLL();
u_int32_t setPllReconfigReg(u_int32_t reg, u_int32_t val);
void configurePll();
void eraseFlash();
int startWritingFPGAprogram(FILE** filefp);
int stopWritingFPGAprogram(FILE* filefp);
@ -183,7 +201,7 @@ int setAllTrimbits(int val);
int getAllTrimbits();
int getBebFPGATemp();
int activate(int enable);
int setNetworkParameter(enum detNetworkParameter mode, int value);
int setNetworkParameter(enum NETWORK_PARA_INDEX mode, int value);
#endif
@ -195,9 +213,14 @@ int startReceiver(int d);
#endif
int startStateMachine();
int stopStateMachine();
#ifndef JUNGFRAUD
int startReadOut();
#endif
enum runStatus getRunStatus();
void readFrame(int *ret, char *mess);
#ifdef JUNGFRAUD
u_int32_t runBusy(void);
#endif
//common
@ -206,7 +229,6 @@ int calculateDataBytes();
int getTotalNumberOfChannels();
int getTotalNumberOfChips();
int getTotalNumberOfModules();
int getNumberOfChannelsPerChip();
int getNumberOfChannelsPerModule();
int getNumberOfChipsPerModule();
int getNumberOfDACsPerModule();
@ -215,6 +237,7 @@ int getNumberOfADCsPerModule();
int getNumberOfGainsPerModule();
int getNumberOfOffsetsPerModule();
#endif
int getNumberOfChannelsPerChip();
// sync
enum masterFlags setMaster(enum masterFlags arg);

20
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1210,6 +1210,7 @@ int set_dac(int file_des) {
retval[0] = setIODelay(val,imod);
else{
setDAC(idac,val,imod,mV,retval);
#ifdef EIGERD
if(val != -1) {
//changing dac changes settings to undefined
switch(idac){
@ -1226,6 +1227,7 @@ int set_dac(int file_des) {
break;
}
}
#endif
}
}
@ -1344,10 +1346,12 @@ int get_adc(int file_des) {
iadc = TEMP_FPGAFEBR;
break;
#endif
#ifdef GOTTHARDD
#if defined(GOTTHARD) || defined(JUNGFRAUD)
case TEMPERATURE_FPGA:
iadc = TEMP_FPGA;
break;
case TEMPERATURE_ADC:
iadc = TEMP_ADC;
break;
#endif
default:
@ -2751,15 +2755,24 @@ int set_dynamic_range(int file_des) {
ret=FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP);
} else {
#ifdef EIGERD
switch(dr){
#ifdef EIGERD
case -1:case 4: case 8: case 16:case 32:break;
#elif JUNGFRAUD
case 16: break;
#endif
default:
#ifdef EIGERD
strcpy(mess,"could not set dynamic range. Must be 4,8,16 or 32.\n");
#elif JUNGFRAUD
strcpy(mess,"could not change dynamic range from 16 for this detector.\n");
#endif
ret = FAIL;
}
#endif
}
#ifdef EIGERD
if(ret == OK){
int old_dr = setDynamicRange(-1);
retval=setDynamicRange(dr);
@ -2783,6 +2796,7 @@ int set_dynamic_range(int file_des) {
}
}
}
#endif
#endif
if (dr>=0 && retval!=dr)
ret=FAIL;