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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-12 19:54:44 +02:00
parent 9686f78300
commit 160ce17a91
3 changed files with 266 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

805
slsDetectorSoftware/include/Detector.h
View File

File diff suppressed because it is too large Load Diff

40
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -680,26 +680,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
void sendSoftwareTrigger(int detPos = -1);//
/**
* Start detector acquisition and read all data (Blocking until end of
* acquisition)
* @param detPos -1 for all detectors in list or specific detector position
*/
void startAndReadAll(int detPos = -1);//
/**
* Start readout (without exposure or interrupting exposure) (Eiger store in
* ram)
* @param detPos -1 for all detectors in list or specific detector position
*/
void startReadOut(int detPos = -1);//
/**
* Requests and receives all data from the detector (Eiger store in ram)
* @param detPos -1 for all detectors in list or specific detector position
*/
void readAll(int detPos = -1);//
/**
* Configures in detector the destination for UDP packets
* @param detPos -1 for all detectors in list or specific detector position
@ -2320,6 +2300,26 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
void startProcessingThread();
/**
* Start detector acquisition and read all data (Blocking until end of
* acquisition)
* @param detPos -1 for all detectors in list or specific detector position
*/
void startAndReadAll(int detPos = -1);//
/**
* Start readout (without exposure or interrupting exposure) (Eiger store in
* ram)
* @param detPos -1 for all detectors in list or specific detector position
*/
void startReadOut(int detPos = -1);//
/**
* Requests and receives all data from the detector (Eiger store in ram)
* @param detPos -1 for all detectors in list or specific detector position
*/
void readAll(int detPos = -1);//
/**
* Check if processing thread is ready to join main thread
* @returns true if ready, else false

87
slsDetectorSoftware/src/Detector.cpp
View File

@ -60,7 +60,7 @@ Result<int64_t> Detector::getReceiverSoftwareVersion(Positions pos) const {
return pimpl->Parallel(&slsDetector::getReceiverSoftwareVersion, pos);
}
std::string Detector::getUserDetails() const { return pimpl->getUserDetails(); }
std::string Detector::getUserDetailsFromSharedMemory() const { return pimpl->getUserDetails(); }
defs::detectorType Detector::getDetectorType() const {
return pimpl->getDetectorTypeAsEnum();
@ -152,14 +152,6 @@ void Detector::setStopPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setStopPort, pos, value);
}
Result<int> Detector::getReceiverPort(Positions pos) const {
return pimpl->Parallel(&slsDetector::getReceiverPort, pos);
}
void Detector::setReceiverPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setReceiverPort, pos, value);
}
Result<bool> Detector::getLockServer(Positions pos) const {
return pimpl->Parallel(&slsDetector::lockServer, pos, -1);
}
@ -217,40 +209,6 @@ void Detector::saveSettingsFile(const std::string &value, Positions pos) {
pimpl->Parallel(&slsDetector::saveSettingsFile, pos, value);
}
Result<defs::runStatus> Detector::getRunStatus(Positions pos) {
return pimpl->Parallel(&slsDetector::getRunStatus, pos);
}
void Detector::prepareAcquisition() {
pimpl->Parallel(&slsDetector::prepareAcquisition, {});
}
void Detector::startAcquisition() {
if (getDetectorType() == defs::EIGER) {
prepareAcquisition();
}
pimpl->Parallel(&slsDetector::startAcquisition, {});
}
void Detector::stopAcquisition() { pimpl->stopAcquisition(); }
void Detector::sendSoftwareTrigger(Positions pos) {
pimpl->Parallel(&slsDetector::sendSoftwareTrigger, pos);
}
void Detector::startAndReadAll() {
if (getDetectorType() == defs::EIGER) {
prepareAcquisition();
}
pimpl->Parallel(&slsDetector::startAndReadAll, {});
}
void Detector::startReadOut() {
pimpl->Parallel(&slsDetector::startReadOut, {});
}
void Detector::readAll() { pimpl->Parallel(&slsDetector::readAll, {}); }
void Detector::configureMAC(Positions pos) {
pimpl->Parallel(&slsDetector::configureMAC, pos);
}
@ -271,7 +229,7 @@ void Detector::setNumberOfCycles(int64_t value) {
pimpl->Parallel(&slsDetector::setTimer, {}, defs::CYCLES_NUMBER, value);
}
Result<int64_t> Detector::getNumberOfStorageCells() const {
Result<int64_t> Detector::getNumberOfAdditionalStorageCells() const {
return pimpl->Parallel(&slsDetector::setTimer, {},
defs::STORAGE_CELL_NUMBER, -1);
}
@ -454,8 +412,8 @@ Result<int> Detector::getADCClock(Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::ADC_CLOCK, -1, 0);
}
void Detector::setADCClock(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::ADC_CLOCK, value, 0);
void Detector::setADCClock(int value_in_MHz, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::ADC_CLOCK, value_in_MHz, 0);
}
Result<int> Detector::getDBITClock(Positions pos) const {
@ -463,8 +421,8 @@ Result<int> Detector::getDBITClock(Positions pos) const {
0);
}
void Detector::setDBITClock(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::DBIT_CLOCK, value, 0);
void Detector::setDBITClock(int value_in_MHz, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::DBIT_CLOCK, value_in_MHz, 0);
}
Result<int> Detector::getRUNClock(Positions pos) const {
@ -472,8 +430,8 @@ Result<int> Detector::getRUNClock(Positions pos) const {
0);
}
void Detector::setRUNClock(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::CLOCK_DIVIDER, value, 0);
void Detector::setRUNClock(int value_in_MHz, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::CLOCK_DIVIDER, value_in_MHz, 0);
}
Result<int> Detector::getSYNCClock(Positions pos) const {
@ -1440,6 +1398,14 @@ Result<std::string> Detector::printReceiverConfiguration(Positions pos) const {
return pimpl->Parallel(&slsDetector::printReceiverConfiguration, pos);
}
Result<int> Detector::getReceiverPort(Positions pos) const {
return pimpl->Parallel(&slsDetector::getReceiverPort, pos);
}
void Detector::setReceiverPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setReceiverPort, pos, value);
}
Result<bool> Detector::getReceiverLock(Positions pos) {
return pimpl->Parallel(&slsDetector::lockReceiver, pos, -1);
}
@ -1561,6 +1527,27 @@ bool Detector::getAcquiringFlag() const { return pimpl->getAcquiringFlag(); }
void Detector::setAcquiringFlag(bool value) { pimpl->setAcquiringFlag(value); }
Result<defs::runStatus> Detector::getRunStatus(Positions pos) {
return pimpl->Parallel(&slsDetector::getRunStatus, pos);
}
void Detector::prepareAcquisition() {
pimpl->Parallel(&slsDetector::prepareAcquisition, {});
}
void Detector::startAcquisition() {
if (getDetectorType() == defs::EIGER) {
prepareAcquisition();
}
pimpl->Parallel(&slsDetector::startAcquisition, {});
}
void Detector::stopAcquisition() { pimpl->stopAcquisition(); }
void Detector::sendSoftwareTrigger(Positions pos) {
pimpl->Parallel(&slsDetector::sendSoftwareTrigger, pos);
}
void Detector::startReceiver(Positions pos) {
pimpl->Parallel(&slsDetector::startReceiver, pos);
}