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

formatting

Browse Source
This commit is contained in:
maliakal_d 2024-08-20 16:21:51 +02:00
parent 6d5180667a
commit 7a28ba03c9
6 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/src/CmdLineApp.cpp
View File

@ -50,7 +50,8 @@ int main(int argc, char *argv[]) {
parser.Parse(argc, argv); parser.Parse(argc, argv);
// If we called sls_detector_acquire, add the acquire command // If we called sls_detector_acquire, add the acquire command
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())

3
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -206,11 +206,10 @@ std::string CmdProxy::VirtualServer(int action) {
} }
void CmdProxy::EmptyDataCallBack(detectorData *data, uint64_t frameIndex, void CmdProxy::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";
} }
std::string CmdProxy::Acquire(int action) { std::string CmdProxy::Acquire(int action) {
std::ostringstream os; std::ostringstream os;
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {

3
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1350,7 +1350,8 @@ class CmdProxy {
std::string GapPixels(int action); std::string GapPixels(int action);
std::string BadChannels(int action); std::string BadChannels(int action);
/* acquisition parameters */ /* acquisition parameters */
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);
std::string Acquire(int action); std::string Acquire(int action);
std::string Exptime(int action); std::string Exptime(int action);
std::string ReadoutSpeed(int action); std::string ReadoutSpeed(int action);

24
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -742,8 +742,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;
@ -761,8 +762,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;
@ -797,7 +798,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;
@ -882,10 +884,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"
@ -1319,7 +1323,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

@ -215,7 +215,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

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

@ -9,5 +9,5 @@
#define APIJUNGFRAU "8.0.0 0x231109" #define APIJUNGFRAU "8.0.0 0x231109"
#define APIEIGER "8.0.0 0x231109" #define APIEIGER "8.0.0 0x231109"
#define APILIB "8.0.1 0x240112" #define APILIB "8.0.1 0x240112"
#define APIMOENCH "8.0.2 0x240703" #define APIMOENCH "8.0.2 0x240703"
#define APIMYTHEN3 "8.0.2 0x240715" #define APIMYTHEN3 "8.0.2 0x240715"