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

moench has only analog readout

Browse Source
This commit is contained in:
maliakal_d
2019-03-06 14:52:21 +01:00
parent 2676e8b43d
commit abc7a9bd2f
7 changed files with 124 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -447,8 +447,8 @@ int slsReceiverImplementation::setReadOutFlags(const readOutFlags f) {
readoutFlags = f;
// side effects
if (myDetectorType == CHIPTESTBOARD || myDetectorType == MOENCH) {
generalData->setImageSize(readoutFlags, roi, numberOfSamples, tengigaEnable);
if (myDetectorType == CHIPTESTBOARD) {
generalData->setImageSize(roi, numberOfSamples, tengigaEnable, readoutFlags);
for (const auto& it : dataProcessor)
it->SetPixelDimension();
if (SetupFifoStructure() == FAIL)
@ -642,10 +642,10 @@ int slsReceiverImplementation::setROI(const std::vector<slsDetectorDefs::ROI> i)
framesPerFile = generalData->maxFramesPerFile;
break;
case MOENCH:
generalData->SetROI(i);
generalData->setImageSize(roi, numberOfSamples, tengigaEnable);
break;
case CHIPTESTBOARD:
generalData->setImageSize(readoutFlags, roi, numberOfSamples, tengigaEnable);
generalData->setImageSize(roi, numberOfSamples, tengigaEnable, readoutFlags);
break;
default:
break;
@ -789,18 +789,13 @@ int slsReceiverImplementation::setNumberofSamples(const uint64_t i) {
if (numberOfSamples != i) {
numberOfSamples = i;
switch(myDetectorType) {
case MOENCH:
generalData->setNumberofSamples(i);
break;
case CHIPTESTBOARD:
generalData->setImageSize(readoutFlags, roi, numberOfSamples, tengigaEnable);
for (const auto& it : dataProcessor)
it->SetPixelDimension();
break;
default:
break;
if(myDetectorType == MOENCH) {
generalData->setImageSize(roi, numberOfSamples, tengigaEnable);
} else if(myDetectorType == CHIPTESTBOARD) {
generalData->setImageSize(roi, numberOfSamples, tengigaEnable, readoutFlags);
}
for (const auto& it : dataProcessor)
it->SetPixelDimension();
if (SetupFifoStructure() == FAIL)
return FAIL;
}
@ -811,6 +806,7 @@ int slsReceiverImplementation::setNumberofSamples(const uint64_t i) {
int slsReceiverImplementation::setDynamicRange(const uint32_t i) {
// only eiger
if (dynamicRange != i) {
dynamicRange = i;
generalData->SetDynamicRange(i,tengigaEnable);
@ -830,7 +826,20 @@ int slsReceiverImplementation::setTenGigaEnable(const bool b) {
if (tengigaEnable != b) {
tengigaEnable = b;
//side effects
generalData->SetTenGigaEnable(b,dynamicRange);
switch(myDetectorType) {
case EIGER:
generalData->SetTenGigaEnable(b,dynamicRange);
break;
case MOENCH:
generalData->setImageSize(roi, numberOfSamples, tengigaEnable);
break;
case CHIPTESTBOARD:
generalData->setImageSize(roi, numberOfSamples, tengigaEnable, readoutFlags);
break;
default:
break;
}
if (SetupFifoStructure() == FAIL)
return FAIL;
}

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -1947,7 +1947,7 @@ int slsReceiverTCPIPInterface::set_readout_flags() {
if (interface->Server_ReceiveArg(ret, mess, &arg, sizeof(arg), true, receiver) == FAIL)
return FAIL;
if (myDetectorType == JUNGFRAU || myDetectorType == GOTTHARD)
if (myDetectorType == JUNGFRAU || myDetectorType == GOTTHARD || myDetectorType == MOENCH)
functionNotImplemented();
// base object not null