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

rxr: fixed all updates from rxParameters, connected them in masterAttributes, added json header and scan parametes in metadata

Browse Source
This commit is contained in:
maliakal_d
2020-09-04 13:49:30 +02:00
parent 9218ef5a95
commit 5b182469a1
10 changed files with 288 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6938,6 +6938,16 @@ int get_receiver_parameters(int file_des) {
if (n < 0)
return printSocketReadError();
// additional storage cells
#ifdef JUNGFRAUD
i32 = getNumAdditionalStorageCells();
#else
i32 = 0;
#endif
n += sendData(file_des, &i32, sizeof(i32), INT32);
if (n < 0)
return printSocketReadError();
// analog samples
#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
i32 = getNumAnalogSamples();
@ -7015,6 +7025,26 @@ int get_receiver_parameters(int file_des) {
if (n < 0)
return printSocketReadError();
// readnlines
#ifdef EIGERD
i32 = getReadNLines();
#else
i32 = 0;
#endif
n += sendData(file_des, &i32, sizeof(i32), INT32);
if (n < 0)
return printSocketReadError();
// threshold ev
#ifdef EIGERD
i32 = getThresholdEnergy();
#else
i32 = 0;
#endif
n += sendData(file_des, &i32, sizeof(i32), INT32);
if (n < 0)
return printSocketReadError();
// dynamic range
i32 = setDynamicRange(GET_FLAG);
n += sendData(file_des, &i32, sizeof(i32), INT32);
@ -7175,6 +7205,26 @@ int get_receiver_parameters(int file_des) {
if (n < 0)
return printSocketReadError();
// scan parameters
// scan enable, dac, start, stop, step
// scan dac settle time
int i32s[5] = {0, 0, 0, 0, 0};
i64 = 0;
i32s[0] = scan;
if (scan) {
i32s[1] = scanGlobalIndex;
i32s[2] = scanSteps[0];
i32s[3] = scanSteps[numScanSteps - 1];
i32s[4] = scanSteps[1] - scanSteps[0];
i64 = scanSettleTime_ns;
}
n += sendData(file_des, i32s, sizeof(i32s), INT32);
if (n < 0)
return printSocketReadError();
n += sendData(file_des, &i64, sizeof(i64), INT64);
if (n < 0)
return printSocketReadError();
LOG(logINFO, ("Sent %d bytes for receiver parameters\n", n));
return OK;