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

WIP

Browse Source
This commit is contained in:
maliakal_d
2020-06-18 12:41:10 +02:00
parent ebc164aaa6
commit 7cc05ead89
19 changed files with 468 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -60,7 +60,6 @@ int eiger_iodelay = 0;
int eiger_photonenergy = 0;
int eiger_dynamicrange = 0;
int eiger_parallelmode = 0;
int eiger_storeinmem = 0;
int eiger_overflow32 = 0;
int eiger_readoutspeed = 0;
int eiger_triggermode = 0;
@ -687,8 +686,7 @@ void setupDetector() {
setDynamicRange(DEFAULT_DYNAMIC_RANGE);
eiger_photonenergy = DEFAULT_PHOTON_ENERGY;
setParallelMode(DEFAULT_PARALLEL_MODE);
setOverFlowMode(DEFAULT_READOUT_STOREINRAM_MODE);
setStoreInRamMode(DEFAULT_READOUT_OVERFLOW32_MODE);
setOverFlowMode(DEFAULT_READOUT_OVERFLOW32_MODE);
setClockDivider(RUN_CLK, DEFAULT_CLK_SPEED); // clk_devider,half speed
setIODelay(DEFAULT_IO_DELAY);
setTiming(DEFAULT_TIMING_MODE);
@ -805,14 +803,6 @@ int setOverFlowMode(int mode) {
int getOverFlowMode() { return eiger_overflow32; }
void setStoreInRamMode(int mode) {
mode = (mode == 0 ? 0 : 1);
LOG(logINFO, ("Setting Store in Ram mode to %d\n", mode));
eiger_storeinmem = mode;
}
int getStoreInRamMode() { return eiger_storeinmem; }
/* parameters - timer */
int setStartingFrameNumber(uint64_t value) {
@ -1118,37 +1108,6 @@ int setModule(sls_detector_module myMod, char *mess) {
return OK;
}
int getModule(sls_detector_module *myMod) {
#ifndef VIRTUAL
// trimbits
unsigned int *tt;
tt = Feb_Control_GetTrimbits();
// exclude gap pixels
int ip = 0, ich = 0;
for (int iy = 0; iy < 256; ++iy) {
for (int ichip = 0; ichip < 4; ++ichip) {
for (int ix = 0; ix < 256; ++iy) {
myMod->chanregs[ich++] = tt[ip++];
}
if (ichip < 3) {
ip++;
ip++;
}
}
}
#endif
// copy local module to myMod
if (detectorModules) {
if (copyModule(myMod, detectorModules) == FAIL)
return FAIL;
} else
return FAIL;
return OK;
}
enum detectorSettings setSettings(enum detectorSettings sett) {
if (sett == UNINITIALIZED) {
return thisSettings;
@ -2057,10 +2016,8 @@ int startStateMachine() {
LOG(logINFO, ("Going to start acquisition\n"));
Feb_Control_StartAcquisition();
if (!eiger_storeinmem) {
LOG(logINFO, ("requesting images right after start\n"));
ret = startReadOut();
}
LOG(logINFO, ("requesting images right after start\n"));
ret = startReadOut();
// wait for acquisition start
if (ret == OK) {
@ -2382,16 +2339,6 @@ void readFrame(int *ret, char *mess) {
}
LOG(logINFOGREEN, ("Acquisition finished\n"));
if (eiger_storeinmem) {
LOG(logINFO, ("requesting images after storing in memory\n"));
if (startReadOut() == FAIL) {
strcpy(mess, "Could not execute read image requests\n");
LOG(logERROR, (mess));
*ret = (int)FAIL;
return;
}
}
// wait for detector to send
int isTransmitting = 1;
while (isTransmitting) {

1
slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -103,7 +103,6 @@ enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE };
#define DEFAULT_DYNAMIC_RANGE (16)
#define DEFAULT_PARALLEL_MODE (1)
#define DEFAULT_READOUT_STOREINRAM_MODE (0)
#define DEFAULT_READOUT_OVERFLOW32_MODE (0)
#define DEFAULT_CLK_SPEED (FULL_SPEED)
#define DEFAULT_IO_DELAY (650)