detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-19 18:40:01 +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

12
pyctbgui/src/decoder.c
View File

@ -106,10 +106,9 @@ static PyObject *decode(PyObject *Py_UNUSED(self), PyObject *args,
return NULL;
}
if (n_threads == 1){
if (n_threads == 1) {
pm_decode(src, dst, pm, n_frames, n_rows * n_cols);
}else{
} else {
// Multithreaded processing
pthread_t *threads = malloc(sizeof(pthread_t *) * n_threads);
thread_args *arguments = malloc(sizeof(thread_args) * n_threads);
@ -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].dst = dst + (i * frames_per_thread * pm_size);
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;
assigned_frames += frames_per_thread;
}
@ -128,7 +128,7 @@ static PyObject *decode(PyObject *Py_UNUSED(self), PyObject *args,
for (size_t i = 0; i < n_threads; i++) {
pthread_create(&threads[i], NULL, (void *)thread_pmdecode,
&arguments[i]);
&arguments[i]);
}
for (size_t i = 0; i < n_threads; i++) {
pthread_join(threads[i], NULL);
@ -137,8 +137,6 @@ static PyObject *decode(PyObject *Py_UNUSED(self), PyObject *args,
free(arguments);
}
Py_DECREF(raw_data);
Py_DECREF(pixel_map);

13
pyctbgui/src/pm_decode.c
View File

@ -1,15 +1,16 @@
#include "pm_decode.h"
#include "thread_utils.h"
void thread_pmdecode(void* args){
thread_args* a;
a = (thread_args *) args;
void thread_pmdecode(void *args) {
thread_args *a;
a = (thread_args *)args;
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){
for(size_t i = 0; i<n_frames; i++){
for(size_t j=0; j<n_pixels; j++){
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 j = 0; j < n_pixels; j++) {
*dst++ = src[pm[j]];
}
src += n_pixels;

10
pyctbgui/src/pm_decode.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <stdint.h>
#include <stddef.h>
//Wrapper to be used with pthreads
void thread_pmdecode(void* args);
#include <stdint.h>
// Wrapper to be used with pthreads
void thread_pmdecode(void *args);
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);

12
pyctbgui/src/thread_utils.h
View File

@ -1,10 +1,10 @@
#pragma once
#include <stdint.h>
#include <stddef.h>
typedef struct{
uint16_t* src;
uint16_t* dst;
uint32_t* pm;
#include <stdint.h>
typedef struct {
uint16_t *src;
uint16_t *dst;
uint32_t *pm;
size_t n_frames;
size_t n_pixels;
}thread_args;
} thread_args;

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
// overwrite symbolic links with -sf)
if (deleteAbsoluteDirectory(mess, IIO_DEVICE_FOLDER,
"create sym links for device trees") ==
FAIL) {
"create sym links for device trees") == FAIL) {
return FAIL;
}
if (createAbsoluteDirectory(mess, IIO_DEVICE_FOLDER,
"create sym links for device trees") ==
FAIL) {
"create sym links for device trees") == FAIL) {
return FAIL;
}
@ -243,8 +241,7 @@ int createSymbolicLinksForDevices(int adcDeviceIndex, int dacDeviceIndex,
memset(retvals, 0, MAX_STR_LENGTH);
if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
snprintf(mess, MAX_STR_LENGTH,
"Could not create sym link [dac%d] (%s)\n", idac,
retvals);
"Could not create sym link [dac%d] (%s)\n", idac, retvals);
LOG(logERROR, (mess));
return FAIL;
}

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

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

5
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -567,7 +567,8 @@ int powerChip(int on, char *mess) {
LOG(logERROR, (mess));
// 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 FAIL;
@ -1334,7 +1335,7 @@ int startStateMachine() {
#endif
LOG(logINFOBLUE, ("Starting State Machine\n"));
//cleanFifos(); removing this for now as its done before readout pattern
// cleanFifos(); removing this for now as its done before readout pattern
// start state machine
bus_w(FLOW_CONTROL_REG, bus_r(FLOW_CONTROL_REG) | START_F_MSK);

6
slsSupportLib/include/sls/sls_detector_defs.h
View File

@ -181,9 +181,9 @@ class slsDetectorDefs {
int ymin{-1};
int ymax{-1};
ROI() = default;
ROI(int xmin, int xmax) : xmin(xmin), xmax(xmax) {};
ROI(int xmin, int xmax) : xmin(xmin), xmax(xmax){};
ROI(int xmin, int xmax, int ymin, int ymax)
: xmin(xmin), xmax(xmax), ymin(ymin), ymax(ymax) {};
: xmin(xmin), xmax(xmax), ymin(ymin), ymax(ymax){};
constexpr std::array<int, 4> getIntArray() const {
return std::array<int, 4>({xmin, xmax, ymin, ymax});
}
@ -234,7 +234,7 @@ typedef struct {
int x{0};
int y{0};
xy() = default;
xy(int x, int y) : x(x), y(y) {};
xy(int x, int y) : x(x), y(y){};
} __attribute__((packed));
#endif

12
slsSupportLib/include/sls/versionAPI.h
View File

@ -4,11 +4,11 @@
#define RELEASE "developer"
#define APILIB "developer 0x230224"
#define APIRECEIVER "developer 0x230224"
#define APICTB "developer 0x240910"
#define APIGOTTHARD "developer 0x240910"
#define APICTB "developer 0x240910"
#define APIGOTTHARD "developer 0x240910"
#define APIGOTTHARD2 "developer 0x240910"
#define APIJUNGFRAU "developer 0x240910"
#define APIMYTHEN3 "developer 0x240910"
#define APIMOENCH "developer 0x240910"
#define APIJUNGFRAU "developer 0x240910"
#define APIMYTHEN3 "developer 0x240910"
#define APIMOENCH "developer 0x240910"
#define APIXILINXCTB "developer 0x240910"
#define APIEIGER "developer 0x240910"
#define APIEIGER "developer 0x240910"