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

formatting

Browse Source
This commit is contained in:
maliakal_d 2020-08-11 17:09:36 +02:00
parent 690947ec3a
commit 0c7759d7e4
12 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2048,11 +2048,12 @@ void *start_timer(void *arg) {
int colRight = top ? eiger_virtual_detPos[1] + 1 : eiger_virtual_detPos[1]; int colRight = top ? eiger_virtual_detPos[1] + 1 : eiger_virtual_detPos[1];
int ntotpixels = 256 * 256 * 4; int ntotpixels = 256 * 256 * 4;
LOG(logDEBUG1, (" dr:%d\n bytesperpixel:%f\n tgenable:%d\n datasize:%d\n " LOG(logDEBUG1,
"packetsize:%d\n numpackes:%d\n npixelsx:%d\n databytes:%d\n " (" dr:%d\n bytesperpixel:%f\n tgenable:%d\n datasize:%d\n "
"ntotpixels:%d\n", "packetsize:%d\n numpackes:%d\n npixelsx:%d\n databytes:%d\n "
dr, bytesPerPixel, tgEnable, datasize, packetsize, "ntotpixels:%d\n",
numPacketsPerFrame, npixelsx, databytes, ntotpixels)); dr, bytesPerPixel, tgEnable, datasize, packetsize, numPacketsPerFrame,
npixelsx, databytes, ntotpixels));
// Generate data // Generate data
char imageData[databytes * 2]; char imageData[databytes * 2];
@ -2181,7 +2182,8 @@ void *start_timer(void *arg) {
usleep(eiger_virtual_transmission_delay_right); usleep(eiger_virtual_transmission_delay_right);
sendUDPPacket(1, packetData2, packetsize); sendUDPPacket(1, packetData2, packetsize);
} }
LOG(logINFO, ("Sent frame: %d[%lld]\n", iframes, (long long unsigned int)(frameNr + iframes))); LOG(logINFO, ("Sent frame: %d[%lld]\n", iframes,
(long long unsigned int)(frameNr + iframes)));
clock_gettime(CLOCK_REALTIME, &end); clock_gettime(CLOCK_REALTIME, &end);
int64_t timeNs = ((end.tv_sec - begin.tv_sec) * 1E9 + int64_t timeNs = ((end.tv_sec - begin.tv_sec) * 1E9 +
(end.tv_nsec - begin.tv_nsec)); (end.tv_nsec - begin.tv_nsec));

3
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -1818,7 +1818,8 @@ int configureASICVetoReference(int chipIndex, int *gainIndices, int *values) {
("Unknown gain index %d for channel %d\n", gainIndices[i], i)); ("Unknown gain index %d for channel %d\n", gainIndices[i], i));
return FAIL; return FAIL;
} }
revValues[NCHAN - 1 - i] |= gainValue; // reversed list, so NCHAN - 1 - i revValues[NCHAN - 1 - i] |=
gainValue; // reversed list, so NCHAN - 1 - i
LOG(logDEBUG2, ("Values[%d]: 0x%x\n", i, revValues[i])); LOG(logDEBUG2, ("Values[%d]: 0x%x\n", i, revValues[i]));
} }

22
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -137,17 +137,17 @@ enum PLLINDEX { READOUT_PLL, SYSTEM_PLL };
#define ASIC_ADC_MAX_VAL (0x7F) #define ASIC_ADC_MAX_VAL (0x7F)
#define ASIC_GLOBAL_SETT_MAX_BITS (6) #define ASIC_GLOBAL_SETT_MAX_BITS (6)
#define ASIC_EXT_MEMCTRL_OFST (0) #define ASIC_EXT_MEMCTRL_OFST (0)
#define ASIC_EXT_MEMCTRL_MSK (0x1 << ASIC_EXT_MEMCTRL_OFST) #define ASIC_EXT_MEMCTRL_MSK (0x1 << ASIC_EXT_MEMCTRL_OFST)
#define ASIC_EXT_TIMING_OFST (1) #define ASIC_EXT_TIMING_OFST (1)
#define ASIC_EXT_TIMING_MSK (0x1 << ASIC_EXT_TIMING_OFST) #define ASIC_EXT_TIMING_MSK (0x1 << ASIC_EXT_TIMING_OFST)
#define ASIC_CONT_MODE_OFST (2) #define ASIC_CONT_MODE_OFST (2)
#define ASIC_CONT_MODE_MSK (0x1 << ASIC_CONT_MODE_OFST) #define ASIC_CONT_MODE_MSK (0x1 << ASIC_CONT_MODE_OFST)
#define ASIC_FILTER_OFST (3) #define ASIC_FILTER_OFST (3)
#define ASIC_FILTER_MSK (0x3 << ASIC_FILTER_OFST) #define ASIC_FILTER_MSK (0x3 << ASIC_FILTER_OFST)
#define ASIC_FILTER_MAX_VALUE (3) #define ASIC_FILTER_MAX_VALUE (3)
#define ASIC_CDS_GAIN_OFST (5) #define ASIC_CDS_GAIN_OFST (5)
#define ASIC_CDS_GAIN_MSK (0x1 << ASIC_CDS_GAIN_OFST) #define ASIC_CDS_GAIN_MSK (0x1 << ASIC_CDS_GAIN_OFST)
/* Struct Definitions */ /* Struct Definitions */
typedef struct udp_header_struct { typedef struct udp_header_struct {

2
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -1,7 +1,7 @@
#include "CmdProxy.h" #include "CmdProxy.h"
#include "bit_utils.h"
#include "TimeHelper.h" #include "TimeHelper.h"
#include "ToString.h" #include "ToString.h"
#include "bit_utils.h"
#include "container_utils.h" #include "container_utils.h"
#include "logger.h" #include "logger.h"
#include "sls_detector_defs.h" #include "sls_detector_defs.h"

8
slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
View File

@ -36,7 +36,7 @@ TEST_CASE("rx_version", "[.cmd][.rx][.new]") {
TEST_CASE("rx_start", "[.cmd][.rx][.new]") { TEST_CASE("rx_start", "[.cmd][.rx][.new]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
det.setFileWrite(false); //avoid writing or error on file creation det.setFileWrite(false); // avoid writing or error on file creation
// PUT only command // PUT only command
REQUIRE_THROWS(proxy.Call("rx_start", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("rx_start", {}, -1, GET));
{ {
@ -70,7 +70,7 @@ TEST_CASE("rx_stop", "[.cmd][.rx][.new]") {
TEST_CASE("rx_status", "[.cmd][.rx][.new]") { TEST_CASE("rx_status", "[.cmd][.rx][.new]") {
Detector det; Detector det;
det.setFileWrite(false); //avoid writing or error on file creation det.setFileWrite(false); // avoid writing or error on file creation
CmdProxy proxy(&det); CmdProxy proxy(&det);
det.startReceiver(); det.startReceiver();
{ {
@ -91,7 +91,7 @@ TEST_CASE("rx_framescaught", "[.cmd][.rx][.new]") {
CmdProxy proxy(&det); CmdProxy proxy(&det);
// This ensures 0 caught frames // This ensures 0 caught frames
det.setFileWrite(false); //avoid writing or error on file creation det.setFileWrite(false); // avoid writing or error on file creation
det.startReceiver(); det.startReceiver();
det.stopReceiver(); det.stopReceiver();
{ {
@ -113,7 +113,7 @@ TEST_CASE("rx_framescaught", "[.cmd][.rx][.new]") {
TEST_CASE("rx_missingpackets", "[.cmd][.rx][.new]") { TEST_CASE("rx_missingpackets", "[.cmd][.rx][.new]") {
Detector det; Detector det;
det.setFileWrite(false); //avoid writing or error on file creation det.setFileWrite(false); // avoid writing or error on file creation
CmdProxy proxy(&det); CmdProxy proxy(&det);
{ {
// some missing packets // some missing packets

4
slsReceiverSoftware/src/Implementation.cpp
View File

@ -22,9 +22,7 @@
/** cosntructor & destructor */ /** cosntructor & destructor */
Implementation::Implementation(const detectorType d) { Implementation::Implementation(const detectorType d) { setDetectorType(d); }
setDetectorType(d);
}
Implementation::~Implementation() { Implementation::~Implementation() {
delete generalData; delete generalData;

1
slsSupportLib/include/ClientSocket.h Executable file → Normal file
View File

@ -16,6 +16,7 @@ class ClientSocket : public DataSocket {
void *retval, size_t retval_size); void *retval, size_t retval_size);
std::string readErrorMessage(); std::string readErrorMessage();
private: private:
void readReply(int &ret, void *retval, size_t retval_size); void readReply(int &ret, void *retval, size_t retval_size);
struct sockaddr_in serverAddr {}; struct sockaddr_in serverAddr {};

4
slsSupportLib/include/bit_utils.h
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include <vector>
#include <bitset> #include <bitset>
#include <vector>
namespace sls { namespace sls {
template <typename T> std::vector<int> getSetBits(T val) { template <typename T> std::vector<int> getSetBits(T val) {
constexpr size_t bitsPerByte = 8; constexpr size_t bitsPerByte = 8;
constexpr size_t numBits = sizeof(T)*bitsPerByte; constexpr size_t numBits = sizeof(T) * bitsPerByte;
std::bitset<numBits> bs(val); std::bitset<numBits> bs(val);
std::vector<int> set_bits; std::vector<int> set_bits;
set_bits.reserve(bs.count()); set_bits.reserve(bs.count());

5
slsSupportLib/include/sls_detector_defs.h
View File

@ -135,8 +135,9 @@ class slsDetectorDefs {
} sls_detector_header; } sls_detector_header;
#ifdef __cplusplus #ifdef __cplusplus
//For sending and receiving data // For sending and receiving data
static_assert(sizeof(detectorType) == sizeof(int), "enum and int differ in size"); static_assert(sizeof(detectorType) == sizeof(int),
"enum and int differ in size");
#define MAX_NUM_PACKETS 512 #define MAX_NUM_PACKETS 512
using sls_bitset = std::bitset<MAX_NUM_PACKETS>; using sls_bitset = std::bitset<MAX_NUM_PACKETS>;
using bitset_storage = uint8_t[MAX_NUM_PACKETS / 8]; using bitset_storage = uint8_t[MAX_NUM_PACKETS / 8];

20
slsSupportLib/include/versionAPI.h
View File

@ -1,12 +1,12 @@
/** API versions */ /** API versions */
#define GITBRANCH "developer" #define GITBRANCH "developer"
#define APILIB 0x200810 #define APILIB 0x200810
#define APIRECEIVER 0x200810 #define APIRECEIVER 0x200810
#define APIGUI 0x200804 #define APIGUI 0x200804
#define APICTB 0x200810 #define APICTB 0x200810
#define APIGOTTHARD 0x200810 #define APIGOTTHARD 0x200810
#define APIGOTTHARD2 0x200810 #define APIGOTTHARD2 0x200810
#define APIJUNGFRAU 0x200810 #define APIJUNGFRAU 0x200810
#define APIMYTHEN3 0x200810 #define APIMYTHEN3 0x200810
#define APIMOENCH 0x200810 #define APIMOENCH 0x200810
#define APIEIGER 0x200810 #define APIEIGER 0x200810

2
slsSupportLib/src/ClientSocket.cpp
View File

@ -101,7 +101,7 @@ void ClientSocket::readReply(int &ret, void *retval, size_t retval_size) {
} }
} }
std::string ClientSocket::readErrorMessage(){ std::string ClientSocket::readErrorMessage() {
std::string error_msg(MAX_STR_LENGTH, '\0'); std::string error_msg(MAX_STR_LENGTH, '\0');
Receive(&error_msg[0], error_msg.size()); Receive(&error_msg[0], error_msg.size());
return error_msg; return error_msg;

20
slsSupportLib/tests/test-bit_utils.cpp
View File

@ -1,39 +1,39 @@
#include "bit_utils.h"
#include "catch.hpp" #include "catch.hpp"
#include <vector> #include <vector>
#include "bit_utils.h"
TEST_CASE("Get set bits from 0"){ TEST_CASE("Get set bits from 0") {
auto vec = sls::getSetBits(0); auto vec = sls::getSetBits(0);
REQUIRE(vec.empty()); REQUIRE(vec.empty());
} }
TEST_CASE("Get set bits from 1"){ TEST_CASE("Get set bits from 1") {
auto vec = sls::getSetBits(1); auto vec = sls::getSetBits(1);
REQUIRE(vec.size() == 1); REQUIRE(vec.size() == 1);
REQUIRE(vec[0] == 0); REQUIRE(vec[0] == 0);
} }
TEST_CASE("Get set bits from 2"){ TEST_CASE("Get set bits from 2") {
auto vec = sls::getSetBits(2ul); auto vec = sls::getSetBits(2ul);
REQUIRE(vec.size() == 1); REQUIRE(vec.size() == 1);
REQUIRE(vec[0] == 1); REQUIRE(vec[0] == 1);
} }
TEST_CASE("Get set bits from 3"){ TEST_CASE("Get set bits from 3") {
auto vec = sls::getSetBits(3u); auto vec = sls::getSetBits(3u);
REQUIRE(vec.size() == 2); REQUIRE(vec.size() == 2);
REQUIRE(vec[0] == 0); REQUIRE(vec[0] == 0);
REQUIRE(vec[1] == 1); REQUIRE(vec[1] == 1);
} }
TEST_CASE("All bits set"){ TEST_CASE("All bits set") {
uint8_t val = -1; uint8_t val = -1;
auto vec = sls::getSetBits(val); auto vec = sls::getSetBits(val);
REQUIRE(vec == std::vector<int>{0,1,2,3,4,5,6,7}); REQUIRE(vec == std::vector<int>{0, 1, 2, 3, 4, 5, 6, 7});
} }
TEST_CASE("Get set bits from 523"){ TEST_CASE("Get set bits from 523") {
//0b1000001011 == 523 // 0b1000001011 == 523
auto vec = sls::getSetBits(523); auto vec = sls::getSetBits(523);
REQUIRE(vec == std::vector<int>{0,1,3,9}); REQUIRE(vec == std::vector<int>{0, 1, 3, 9});
} }