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

formatting

Browse Source
This commit is contained in:
maliakal_d 2024-08-20 16:28:09 +02:00
parent b4533ac11f
commit 9c57571a41
9 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -626,8 +626,8 @@ int Feb_Control_SetTrimbits(unsigned int *trimbits, int top) {
<< ((7 - i) * 4); // upper << ((7 - i) * 4); // upper
} }
} // end column loop i } // end column loop i
} // end supercolumn loop sc } // end supercolumn loop sc
} // end row loop } // end row loop
if (Feb_Control_activated) { if (Feb_Control_activated) {
if (!Feb_Interface_WriteMemoryInLoops(Feb_Control_leftAddress, if (!Feb_Interface_WriteMemoryInLoops(Feb_Control_leftAddress,
@ -644,7 +644,7 @@ int Feb_Control_SetTrimbits(unsigned int *trimbits, int top) {
} }
} // end row_set loop (groups of 16 rows) } // end row_set loop (groups of 16 rows)
} // end l_r loop } // end l_r loop
memcpy(Feb_Control_last_downloaded_trimbits, trimbits, memcpy(Feb_Control_last_downloaded_trimbits, trimbits,
Feb_Control_trimbit_size * sizeof(unsigned int)); Feb_Control_trimbit_size * sizeof(unsigned int));

12
slsDetectorServers/slsDetectorServer/src/arm64.c
View File

@ -11,8 +11,8 @@
#include <sys/mman.h> // mmap #include <sys/mman.h> // mmap
/* global variables */ /* global variables */
#define CSP0 (0xB0080000) #define CSP0 (0xB0080000)
#define CSP1 (0xB0050000) // udp #define CSP1 (0xB0050000) // udp
#define MEM_SIZE_CSP0 (0x10000) #define MEM_SIZE_CSP0 (0x10000)
#define MEM_SIZE_CSP1 (0x2000) // smaller size for udp #define MEM_SIZE_CSP1 (0x2000) // smaller size for udp
@ -63,7 +63,8 @@ int mapCSP0(void) {
*cspbases[i] = malloc(memsize[i]); *cspbases[i] = malloc(memsize[i]);
if (*cspbases[i] == NULL) { if (*cspbases[i] == NULL) {
LOG(logERROR, LOG(logERROR,
("Could not allocate virtual memory of size %d for %s.\n", memsize[i], names[i])); ("Could not allocate virtual memory of size %d for %s.\n",
memsize[i], names[i]));
return FAIL; return FAIL;
} }
LOG(logINFO, ("memory allocated for %s\n", names[i])); LOG(logINFO, ("memory allocated for %s\n", names[i]));
@ -83,8 +84,9 @@ int mapCSP0(void) {
return FAIL; return FAIL;
} }
#endif #endif
LOG(logINFO, ("%s mapped of size %d from %p to %p,(CSP:0x%x) \n", names[i], memsize[i], LOG(logINFO,
*cspbases[i], *cspbases[i] + memsize[i], csps[i])); ("%s mapped of size %d from %p to %p,(CSP:0x%x) \n", names[i],
memsize[i], *cspbases[i], *cspbases[i] + memsize[i], csps[i]));
// LOG(logINFO, ("Status Register: %08x\n", bus_r(STATUS_REG))); // LOG(logINFO, ("Status Register: %08x\n", bus_r(STATUS_REG)));
} else } else
LOG(logINFO, ("Memory %s already mapped before\n", names[i])); LOG(logINFO, ("Memory %s already mapped before\n", names[i]));

2
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -146,7 +146,7 @@ typedef struct udp_header_struct {
uint16_t ip_destip_lsb; uint16_t ip_destip_lsb;
// padding // padding
uint32_t padding0; uint32_t padding0;
uint32_t padding1; uint32_t padding1;
} udp_header; } udp_header;
#define IP_HEADER_SIZE (20) #define IP_HEADER_SIZE (20)

5
slsDetectorSoftware/generator/Caller.in.h
View File

@ -71,8 +71,9 @@ class Caller {
using StringMap = std::map<std::string, std::string>; using StringMap = std::map<std::string, std::string>;
Detector *ptr; // pointer to the detector that executes the command Detector *ptr; // pointer to the detector that executes the command
static void EmptyDataCallBack(detectorData *data, uint64_t frameIndex, uint32_t subFrameIndex, void *this_pointer); static void EmptyDataCallBack(detectorData *data, uint64_t frameIndex,
uint32_t subFrameIndex, void *this_pointer);
FunctionMap functions{ FunctionMap functions{
{"list", &Caller::list}, {"list", &Caller::list},

2
slsDetectorSoftware/src/CallerSpecial.cpp
View File

@ -214,7 +214,7 @@ std::string Caller::hostname(int action) {
} }
void Caller::EmptyDataCallBack(detectorData *data, uint64_t frameIndex, void Caller::EmptyDataCallBack(detectorData *data, uint64_t frameIndex,
uint32_t subFrameIndex, void *this_pointer) { uint32_t subFrameIndex, void *this_pointer) {
LOG(logDEBUG) << "EmptyDataCallBack to start up zmq sockets"; LOG(logDEBUG) << "EmptyDataCallBack to start up zmq sockets";
} }

3
slsDetectorSoftware/src/CmdApp.cpp
View File

@ -42,7 +42,8 @@ int main(int argc, char *argv[]) {
sls::CmdParser parser; sls::CmdParser parser;
parser.Parse(argc, argv); parser.Parse(argc, argv);
if (action == slsDetectorDefs::READOUT_ACTION || action == slsDetectorDefs::READOUT_ZMQ_ACTION) if (action == slsDetectorDefs::READOUT_ACTION ||
action == slsDetectorDefs::READOUT_ZMQ_ACTION)
parser.setCommand("acquire"); parser.setCommand("acquire");
if (parser.isHelp()) if (parser.isHelp())

24
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -744,8 +744,9 @@ void DetectorImpl::readFrameFromReceiver() {
} }
} }
LOG(logDEBUG) << "Call Back Info:" << "\n\t nDetPixelsX: " LOG(logDEBUG) << "Call Back Info:"
<< nDetPixelsX << "\n\t nDetPixelsY: " << nDetPixelsY << "\n\t nDetPixelsX: " << nDetPixelsX
<< "\n\t nDetPixelsY: " << nDetPixelsY
<< "\n\t databytes: " << multisize << "\n\t databytes: " << multisize
<< "\n\t dynamicRange: " << dynamicRange; << "\n\t dynamicRange: " << dynamicRange;
@ -763,8 +764,8 @@ void DetectorImpl::readFrameFromReceiver() {
callbackImage = multigappixels; callbackImage = multigappixels;
imagesize = n; imagesize = n;
} }
LOG(logDEBUG) << "Image Info:" << "\n\tnDetActualPixelsX: " LOG(logDEBUG) << "Image Info:"
<< nDetActualPixelsX << "\n\tnDetActualPixelsX: " << nDetActualPixelsX
<< "\n\tnDetActualPixelsY: " << nDetActualPixelsY << "\n\tnDetActualPixelsY: " << nDetActualPixelsY
<< "\n\timagesize: " << imagesize << "\n\timagesize: " << imagesize
<< "\n\tdynamicRange: " << dynamicRange; << "\n\tdynamicRange: " << dynamicRange;
@ -799,7 +800,8 @@ void DetectorImpl::readFrameFromReceiver() {
int DetectorImpl::insertGapPixels(char *image, char *&gpImage, bool quadEnable, int DetectorImpl::insertGapPixels(char *image, char *&gpImage, bool quadEnable,
int dr, int &nPixelsx, int &nPixelsy) { int dr, int &nPixelsx, int &nPixelsy) {
LOG(logDEBUG) << "Insert Gap pixels:" << "\n\t nPixelsx: " << nPixelsx LOG(logDEBUG) << "Insert Gap pixels:"
<< "\n\t nPixelsx: " << nPixelsx
<< "\n\t nPixelsy: " << nPixelsy << "\n\t nPixelsy: " << nPixelsy
<< "\n\t quadEnable: " << quadEnable << "\n\t dr: " << dr; << "\n\t quadEnable: " << quadEnable << "\n\t dr: " << dr;
@ -884,10 +886,12 @@ int DetectorImpl::insertGapPixels(char *image, char *&gpImage, bool quadEnable,
<< "nMod1Pixelsy: " << nMod1Pixelsy << "\n\t" << "nMod1Pixelsy: " << nMod1Pixelsy << "\n\t"
<< "nMod1GapPixelsx: " << nMod1GapPixelsx << "\n\t" << "nMod1GapPixelsx: " << nMod1GapPixelsx << "\n\t"
<< "nMod1GapPixelsy: " << nMod1GapPixelsy << "\n\t" << "nMod1GapPixelsy: " << nMod1GapPixelsy << "\n\t"
<< "nChipy: " << nChipy << "\n\t" << "nChipx: " << nChipx << "nChipy: " << nChipy << "\n\t"
<< "\n\t" << "nModx: " << nModx << "\n\t" << "nChipx: " << nChipx << "\n\t"
<< "nMody: " << nMody << "\n\t" << "nTotx: " << nTotx << "nModx: " << nModx << "\n\t"
<< "\n\t" << "nToty: " << nToty << "\n\t" << "nMody: " << nMody << "\n\t"
<< "nTotx: " << nTotx << "\n\t"
<< "nToty: " << nToty << "\n\t"
<< "bytesPerPixel: " << bytesPerPixel << "\n\t" << "bytesPerPixel: " << bytesPerPixel << "\n\t"
<< "imagesize: " << imagesize << "\n\t" << "imagesize: " << imagesize << "\n\t"
<< "nChipBytesx: " << nChipBytesx << "\n\t" << "nChipBytesx: " << nChipBytesx << "\n\t"
@ -1321,7 +1325,7 @@ void DetectorImpl::startAcquisition(const bool blocking, Positions pos) {
if (blocking) { if (blocking) {
Parallel(&Module::startAndReadAll, masters); Parallel(&Module::startAndReadAll, masters);
// ensure all status normal (slaves not blocking) // ensure all status normal (slaves not blocking)
// to catch those slaves that are still 'waiting' // to catch those slaves that are still 'waiting'
auto statusList = Parallel(&Module::getRunStatus, pos); auto statusList = Parallel(&Module::getRunStatus, pos);
// if any slave still waiting, wait up to 1s (gotthard) // if any slave still waiting, wait up to 1s (gotthard)
for (int i = 0; i != 20 && statusList.any(WAITING); ++i) { for (int i = 0; i != 20 && statusList.any(WAITING); ++i) {

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

@ -216,7 +216,13 @@ typedef struct {
/** /**
type of action performed (for text client) type of action performed (for text client)
*/ */
enum { GET_ACTION, PUT_ACTION, READOUT_ACTION, HELP_ACTION, READOUT_ZMQ_ACTION }; enum {
GET_ACTION,
PUT_ACTION,
READOUT_ACTION,
HELP_ACTION,
READOUT_ZMQ_ACTION
};
/** /**
dimension indexes dimension indexes

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

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