detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-20 00:21:02 +01:00
Code Issues Actions Packages Releases Activity

partial frames

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-11 12:14:52 +02:00
parent d00fd70d6d
commit dce7dcbfd4
12 changed files with 1269 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/include/multiSlsDetector.h
View File

@@ -1622,7 +1622,9 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns partial frames padding enable in receiver
*/
int setReceiverPartialFramesPadding(int f = -1, int detPos = -1);
int setPartialFramesPadding(bool padding, int detPos = -1);
int getPartialFramesPadding(int detPos = -1) const;
/**
* Returns file format

3
slsDetectorSoftware/include/slsDetector.h
View File

@@ -1480,7 +1480,8 @@ class slsDetector : public virtual slsDetectorDefs{
* @param f partial frames padding enable
* @returns partial frames padding enable in receiver
*/
int setReceiverPartialFramesPadding(int f = -1);
bool setPartialFramesPadding(bool padding);
bool getPartialFramesPadding() const;
/**
* Returns file format

17
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@@ -2912,14 +2912,17 @@ multiSlsDetector::setReceiverFramesDiscardPolicy(frameDiscardPolicy f, int detPo
return sls::minusOneIfDifferent(r);
}
int multiSlsDetector::setReceiverPartialFramesPadding(int f, int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->setReceiverPartialFramesPadding(f);
}
int multiSlsDetector::setPartialFramesPadding(bool padding, int detPos) {
if (detPos >= 0)
return detectors[detPos]->setPartialFramesPadding(padding);
auto r = parallelCall(&slsDetector::setPartialFramesPadding, padding);
return sls::minusOneIfDifferent(r);
}
// multi
auto r = parallelCall(&slsDetector::setReceiverPartialFramesPadding, f);
int multiSlsDetector::getPartialFramesPadding(int detPos) const {
if (detPos >= 0)
return detectors[detPos]->getPartialFramesPadding();
auto r = parallelCall(&slsDetector::getPartialFramesPadding);
return sls::minusOneIfDifferent(r);
}

1621
slsDetectorSoftware/src/slsDetector.cpp
View File

File diff suppressed because it is too large Load Diff

4
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

@@ -5086,12 +5086,12 @@ std::string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action,
else if (cmd == "r_padding") {
if (action == PUT_ACTION) {
if (sscanf(args[1], "%d", &ival)) {
myDet->setReceiverPartialFramesPadding(ival, detPos);
myDet->setPartialFramesPadding(ival, detPos);
} else
return std::string("could not scan receiver padding enable\n");
}
memset(answer, 0, 100);
sprintf(answer, "%d", myDet->setReceiverPartialFramesPadding(-1, detPos));
sprintf(answer, "%d", myDet->getPartialFramesPadding(detPos));
return std::string(answer);
}

5
slsDetectorSoftware/src/slsDetectorUsers.cpp
View File

@@ -359,7 +359,10 @@ int slsDetectorUsers::setReceiverFramesDiscardPolicy(int f, int detPos) {
}
int slsDetectorUsers::setReceiverPartialFramesPadding(int f, int detPos) {
return detector.setReceiverPartialFramesPadding(f, detPos);
if (f>=0)
return detector.setPartialFramesPadding(f, detPos);
else
return detector.getPartialFramesPadding(detPos);
}
int slsDetectorUsers::setReceiverFramesPerFile(int f, int detPos) {

34
slsDetectorSoftware/tests/test-SharedMemory.cpp
View File

@@ -13,11 +13,14 @@ struct Data {
using namespace sls;
constexpr int shm_id = 10;
TEST_CASE("Create SharedMemory read and write", "[detector]") {
SharedMemory<Data> shm(0, -1);
SharedMemory<Data> shm(shm_id, -1);
shm.CreateSharedMemory();
CHECK(shm.GetName() == "/slsDetectorPackage_multi_0");
CHECK(shm.GetName() ==
std::string("/slsDetectorPackage_multi_") + std::to_string(shm_id));
shm()->x = 3;
shm()->y = 5.7;
@@ -36,12 +39,12 @@ TEST_CASE("Create SharedMemory read and write", "[detector]") {
TEST_CASE("Open existing SharedMemory and read", "[detector]") {
{
SharedMemory<double> shm(0, -1);
SharedMemory<double> shm(shm_id, -1);
shm.CreateSharedMemory();
*shm() = 5.3;
}
SharedMemory<double> shm2(0, -1);
SharedMemory<double> shm2(shm_id, -1);
shm2.OpenSharedMemory();
CHECK(*shm2() == 5.3);
@@ -51,8 +54,8 @@ TEST_CASE("Open existing SharedMemory and read", "[detector]") {
TEST_CASE("Creating a second shared memory with the same name throws",
"[detector]") {
SharedMemory<double> shm0(0, -1);
SharedMemory<double> shm1(0, -1);
SharedMemory<double> shm0(shm_id, -1);
SharedMemory<double> shm1(shm_id, -1);
shm0.CreateSharedMemory();
CHECK_THROWS(shm1.CreateSharedMemory());
@@ -62,13 +65,13 @@ TEST_CASE("Creating a second shared memory with the same name throws",
TEST_CASE("Open two shared memories to the same place", "[detector]") {
//Create the first shared memory
SharedMemory<Data> shm(0, -1);
SharedMemory<Data> shm(shm_id, -1);
shm.CreateSharedMemory();
shm()->x = 5;
CHECK(shm()->x == 5);
//Open the second shared memory with the same name
SharedMemory<Data> shm2(0, -1);
SharedMemory<Data> shm2(shm_id, -1);
shm2.OpenSharedMemory();
CHECK(shm2()->x == 5);
CHECK(shm.GetName() == shm2.GetName());
@@ -86,21 +89,23 @@ TEST_CASE("Open two shared memories to the same place", "[detector]") {
TEST_CASE("Move SharedMemory", "[detector]") {
SharedMemory<Data> shm(0,-1);
CHECK(shm.GetName() == "/slsDetectorPackage_multi_0");
SharedMemory<Data> shm(shm_id, -1);
CHECK(shm.GetName() ==
std::string("/slsDetectorPackage_multi_") + std::to_string(shm_id));
shm.CreateSharedMemory();
shm()->x = 9;
CHECK(shm.size()== sizeof(Data));
SharedMemory<Data> shm2(1,-1);
SharedMemory<Data> shm2(shm_id+1, -1);
shm2 = std::move(shm); //shm is now a moved from object!
CHECK(shm2()->x == 9);
CHECK(shm() == nullptr);
CHECK(shm.size() == 0);
CHECK(shm2.GetName() == "/slsDetectorPackage_multi_0");
CHECK(shm2.GetName() == std::string("/slsDetectorPackage_multi_") +
std::to_string(shm_id));
shm2.RemoveSharedMemory();
}
@@ -110,7 +115,7 @@ TEST_CASE("Create several shared memories", "[detector]") {
std::vector<SharedMemory<int>> v;
v.reserve(N);
for (int i = 0; i != N; ++i) {
v.emplace_back(i, -1);
v.emplace_back(shm_id+i, -1);
CHECK(v[i].IsExisting() == false);
v[i].CreateSharedMemory();
*v[i]() = i;
@@ -119,7 +124,8 @@ TEST_CASE("Create several shared memories", "[detector]") {
for (int i = 0; i != N; ++i) {
CHECK(*v[i]() == i);
CHECK(v[i].GetName() == std::string("/slsDetectorPackage_multi_")+std::to_string(i));
CHECK(v[i].GetName() == std::string("/slsDetectorPackage_multi_") +
std::to_string(i + shm_id));
}
for (int i = 0; i != N; ++i) {

29
slsDetectorSoftware/tests/test-multiSlsDetector.cpp
View File

@@ -11,10 +11,10 @@ using namespace sls;
SCENARIO("Multi detector operation", "[detector]") {
multiSlsDetector::freeSharedMemory(0, -1);
multiSlsDetector::freeSharedMemory(20, -1);
GIVEN("An empty multi detector") {
multiSlsDetector m(0);
multiSlsDetector m(20);
THEN("the size is zero") {
CHECK(m.getNumberOfDetectors() == 0);
CHECK(m.getDataBytes() == 0);
@@ -23,7 +23,7 @@ SCENARIO("Multi detector operation", "[detector]") {
WHEN("we add a detector") {
m.addSlsDetector(sls::make_unique<slsDetector>(
slsDetectorDefs::detectorType::EIGER, 0, 0));
slsDetectorDefs::detectorType::EIGER, 20, 0));
THEN("the size and number of detector changes") {
CHECK(m.getNumberOfDetectors() == 1);
CHECK(m.getTotalNumberOfChannels() == 256 * 1024);
@@ -31,7 +31,7 @@ SCENARIO("Multi detector operation", "[detector]") {
WHEN("we add another detector") {
m.addSlsDetector(sls::make_unique<slsDetector>(
slsDetectorDefs::detectorType::EIGER, 0, 1));
slsDetectorDefs::detectorType::EIGER, 20, 1));
THEN("the size and number of detector changes") {
CHECK(m.getNumberOfDetectors() == 2);
CHECK(m.getTotalNumberOfChannels() == 2 * 256 * 1024);
@@ -61,3 +61,24 @@ SCENARIO("Multi detector operation", "[detector]") {
m.freeSharedMemory();
}
}
TEST_CASE("Set and get partialFramesPadding", "[detector]"){
multiSlsDetector::freeSharedMemory(20, -1);
multiSlsDetector m(20);
m.addSlsDetector(sls::make_unique<slsDetector>(
slsDetectorDefs::detectorType::EIGER, 20, 0));
m.addSlsDetector(sls::make_unique<slsDetector>(
slsDetectorDefs::detectorType::EIGER, 20, 1));
m.setPartialFramesPadding(0);
CHECK(m.getPartialFramesPadding() == 0);
m.setPartialFramesPadding(1);
CHECK(m.getPartialFramesPadding() == 1);
m.setPartialFramesPadding(0, 0);
CHECK(m.getPartialFramesPadding() == -1);
m.freeSharedMemory();
}

31
slsDetectorSoftware/tests/test-slsDetector.cpp
View File

@@ -11,10 +11,10 @@ using namespace sls;
TEST_CASE("Set and get trimen", "[detector]") {
// Free shared memory to be sure that we start in a clean state
slsDetector::freeSharedMemory(0, 0);
slsDetector::freeSharedMemory(20, 20);
// Create a detector and check that the type is set correctly
slsDetector d(slsDetectorDefs::detectorType::EIGER, 0, 0);
slsDetector d(slsDetectorDefs::detectorType::EIGER, 20, 20);
CHECK(d.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER);
// At the beginning there should be no trimen set
@@ -48,8 +48,8 @@ TEST_CASE("Set and get trimen", "[detector]") {
}
TEST_CASE("Set additional JSON header", "[detector]") {
slsDetector::freeSharedMemory(0, 0);
slsDetector d(slsDetectorDefs::detectorType::EIGER, 0, 0);
slsDetector::freeSharedMemory(20, 20);
slsDetector d(slsDetectorDefs::detectorType::EIGER, 20, 20);
auto header = d.getAdditionalJsonHeader();
CHECK(header.empty());
@@ -102,8 +102,8 @@ TEST_CASE("Set additional JSON header", "[detector]") {
TEST_CASE("Set ROI", "[detector]") {
using ROI = slsDetectorDefs::ROI;
slsDetector::freeSharedMemory(0, 0);
slsDetector d(slsDetectorDefs::detectorType::EIGER, 0, 0);
slsDetector::freeSharedMemory(20,20);
slsDetector d(slsDetectorDefs::detectorType::EIGER, 20, 20);
int n{0};
d.getROI(n);
@@ -133,8 +133,8 @@ TEST_CASE("Set ROI", "[detector]") {
TEST_CASE("Set multiple ROIs", "[detector]") {
using ROI = slsDetectorDefs::ROI;
slsDetector::freeSharedMemory(0, 0);
slsDetector d(slsDetectorDefs::detectorType::EIGER, 0, 0);
slsDetector::freeSharedMemory(20, 20);
slsDetector d(slsDetectorDefs::detectorType::EIGER, 20, 20);
// set one ROI
constexpr int n = 3;
@@ -176,4 +176,19 @@ TEST_CASE("Set multiple ROIs", "[detector]") {
CHECK(res[2].ymax == 800);
d.freeSharedMemory();
}
TEST_CASE("Padding and discard policy", "[detector][new]"){
slsDetector::freeSharedMemory(20, 20);
slsDetector d(slsDetectorDefs::detectorType::EIGER, 20, 20);
//
d.setPartialFramesPadding(false);
CHECK(d.getPartialFramesPadding() == false);
d.setPartialFramesPadding(true);
CHECK(d.getPartialFramesPadding() == true);
d.freeSharedMemory();
}