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

format

Browse Source
This commit is contained in:
maliakal_d 2024-09-26 15:39:49 +02:00
parent 492b4815a6
commit 007330caa7
9 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pyctbgui/src/decoder.c
View File

@ -106,7 +106,6 @@ static PyObject *decode(PyObject *Py_UNUSED(self), PyObject *args,
return NULL; return NULL;
} }
if (n_threads == 1) { if (n_threads == 1) {
pm_decode(src, dst, pm, n_frames, n_rows * n_cols); pm_decode(src, dst, pm, n_frames, n_rows * n_cols);
} else { } else {
@ -120,7 +119,8 @@ static PyObject *decode(PyObject *Py_UNUSED(self), PyObject *args,
arguments[i].src = src + (i * frames_per_thread * pm_size); arguments[i].src = src + (i * frames_per_thread * pm_size);
arguments[i].dst = dst + (i * frames_per_thread * pm_size); arguments[i].dst = dst + (i * frames_per_thread * pm_size);
arguments[i].pm = pm; arguments[i].pm = pm;
arguments[i].n_frames = frames_per_thread; // TODO! not matching frames. arguments[i].n_frames =
frames_per_thread; // TODO! not matching frames.
arguments[i].n_pixels = n_rows * n_cols; arguments[i].n_pixels = n_rows * n_cols;
assigned_frames += frames_per_thread; assigned_frames += frames_per_thread;
} }
@ -137,8 +137,6 @@ static PyObject *decode(PyObject *Py_UNUSED(self), PyObject *args,
free(arguments); free(arguments);
} }
Py_DECREF(raw_data); Py_DECREF(raw_data);
Py_DECREF(pixel_map); Py_DECREF(pixel_map);

3
pyctbgui/src/pm_decode.c
View File

@ -7,7 +7,8 @@ void thread_pmdecode(void* args){
pm_decode(a->src, a->dst, a->pm, a->n_frames, a->n_pixels); pm_decode(a->src, a->dst, a->pm, a->n_frames, a->n_pixels);
} }
void pm_decode(uint16_t* src, uint16_t* dst, uint32_t* pm, size_t n_frames, size_t n_pixels){ void pm_decode(uint16_t *src, uint16_t *dst, uint32_t *pm, size_t n_frames,
size_t n_pixels) {
for (size_t i = 0; i < n_frames; i++) { for (size_t i = 0; i < n_frames; i++) {
for (size_t j = 0; j < n_pixels; j++) { for (size_t j = 0; j < n_pixels; j++) {
*dst++ = src[pm[j]]; *dst++ = src[pm[j]];

6
pyctbgui/src/pm_decode.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
// Wrapper to be used with pthreads // Wrapper to be used with pthreads
void thread_pmdecode(void *args); void thread_pmdecode(void *args);
void pm_decode(uint16_t *src, uint16_t *dst, uint32_t *pm, size_t n_frames,
void pm_decode(uint16_t* src, uint16_t* dst, uint32_t* pm, size_t n_frames, size_t n_pixels); size_t n_pixels);

2
pyctbgui/src/thread_utils.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
typedef struct { typedef struct {
uint16_t *src; uint16_t *src;
uint16_t *dst; uint16_t *dst;

9
slsDetectorServers/slsDetectorServer/src/programViaArm.c
View File

@ -206,13 +206,11 @@ int createSymbolicLinksForDevices(int adcDeviceIndex, int dacDeviceIndex,
// delete andcreate iio device links folder (deleting because cannot // delete andcreate iio device links folder (deleting because cannot
// overwrite symbolic links with -sf) // overwrite symbolic links with -sf)
if (deleteAbsoluteDirectory(mess, IIO_DEVICE_FOLDER, if (deleteAbsoluteDirectory(mess, IIO_DEVICE_FOLDER,
"create sym links for device trees") == "create sym links for device trees") == FAIL) {
FAIL) {
return FAIL; return FAIL;
} }
if (createAbsoluteDirectory(mess, IIO_DEVICE_FOLDER, if (createAbsoluteDirectory(mess, IIO_DEVICE_FOLDER,
"create sym links for device trees") == "create sym links for device trees") == FAIL) {
FAIL) {
return FAIL; return FAIL;
} }
@ -243,8 +241,7 @@ int createSymbolicLinksForDevices(int adcDeviceIndex, int dacDeviceIndex,
memset(retvals, 0, MAX_STR_LENGTH); memset(retvals, 0, MAX_STR_LENGTH);
if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) { if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
snprintf(mess, MAX_STR_LENGTH, snprintf(mess, MAX_STR_LENGTH,
"Could not create sym link [dac%d] (%s)\n", idac, "Could not create sym link [dac%d] (%s)\n", idac, retvals);
retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }

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

@ -8470,7 +8470,8 @@ int start_readout(int file_des) {
#else #else
if (Server_VerifyLock() == OK) { if (Server_VerifyLock() == OK) {
enum runStatus s = getRunStatus(); enum runStatus s = getRunStatus();
if ((s == RUNNING || s == WAITING) && (myDetectorType != XILINX_CHIPTESTBOARD)) { if ((s == RUNNING || s == WAITING) &&
(myDetectorType != XILINX_CHIPTESTBOARD)) {
ret = FAIL; ret = FAIL;
strcpy(mess, "Could not start readout because the detector is " strcpy(mess, "Could not start readout because the detector is "
"already running!\n"); "already running!\n");

3
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -567,7 +567,8 @@ int powerChip(int on, char *mess) {
LOG(logERROR, (mess)); LOG(logERROR, (mess));
// to be removed when fixed later // to be removed when fixed later
LOG(logWARNING, ("Bypassing this error for now. To be fixed later...\n")); LOG(logWARNING,
("Bypassing this error for now. To be fixed later...\n"));
return OK; return OK;
return FAIL; return FAIL;