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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-09 14:28:18 +02:00
parent 1a60b59a48
commit 9913194774
2 changed files with 211 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
slsDetectorSoftware/include/Detector.h
View File

@ -706,6 +706,126 @@ class Detector {
*/
Result<ns> getMeasuredSubFramePeriod(Positions pos = {}) const;
/**
* Get speed (Eiger, Jungfrau)
* @param pos detector position
* @returns speed (0 full speed, 1 half speed, 2 quarter speed)
*/
Result<int> getSpeed(Positions pos = {}) const;
/**
* Set speed (Eiger, Jungfrau)
* @param value speed (0 full speed, 1 half speed, 2 quarter speed)
* @param pos detector position
*/
void setSpeed(int value, Positions pos = {});
/**
* Get ADC Phase (Gotthard, Jungfrau, CTB)
* @param inDeg in degrees (Jungfrau, CTB)
* @returns ADC Phase
*/
Result<int> getADCPhase(bool inDeg, Positions pos = {}) const;
/**
* Set sADC Phase (Gotthard, Jungfrau, CTB)
* @param value ADC Phase
* @param inDeg in degrees (Jungfrau, CTB)
*/
void setADCPhase(int value, bool inDeg, Positions pos = {});
/**
* Get Max ADC Phase Shift (Jungfrau, CTB)
* @returns Max ADC Phase Shift
*/
Result<int> getMaxADCPhaseShift(Positions pos = {}) const;
/**
* Get DBIT Phase (Jungfrau, CTB)
* @param inDeg in degrees
* @returns DBIT Phase
*/
Result<int> getDBITPhase(bool inDeg, Positions pos = {}) const;
/**
* Set DBIT Phase (CTB)
* @param value DBIT Phase
* @param inDeg in degrees
*/
void setDBITPhase(int value, bool inDeg, Positions pos = {});
/**
* Get Max DBIT Phase Shift (CTB)
* @returns Max DBIT Phase Shift
*/
Result<int> getMaxDBITPhaseShift(Positions pos = {}) const;
/**
* Get ADC Clock in MHz (CTB)
* @returns ADC Clock in MHz
*/
Result<int> getADCClock(Positions pos = {}) const;
/**
* Set ADC Clock in MHz (CTB)
* @param value ADC Clock in MHz
*/
void setADCClock(int value, Positions pos = {});
/**
* Get DBIT Clock in MHz (CTB)
* @returns DBIT Clock in MHz
*/
Result<int> getDBITClock(Positions pos = {}) const;
/**
* Set DBIT Clock in MHz (CTB)
* @param value DBIT Clock in MHz
*/
void setDBITClock(int value, Positions pos = {});
/**
* Get RUN Clock in MHz (CTB)
* @returns RUN Clock in MHz
*/
Result<int> getRUNClock(Positions pos = {}) const;
/**
* Set RUN Clock in MHz (CTB)
* @param value RUN Clock in MHz
*/
void setRUNClock(int value, Positions pos = {});
/**
* Get SYNC Clock in MHz (CTB)
* @returns SYNC Clock in MHz
*/
Result<int> getSYNCClock(Positions pos = {}) const;
/**
* Get ADC Pipeline (CTB)
* @returns ADC Pipeline
*/
Result<int> getADCPipeline(Positions pos = {}) const;
/**
* Set ADC Pipeline (CTB)
* @param value ADC Pipeline
*/
void setADCPipeline(int value, Positions pos = {});
/**
* Get DBIT Pipeline (CTB)
* @returns DBIT Pipeline
*/
Result<int> getDBITPipeline(Positions pos = {}) const;
/**
* Set DBIT Pipeline (CTB)
* @param value DBIT Pipeline
*/
void setDBITPipeline(int value, Positions pos = {});
// Erik
Result<int> getFramesCaughtByReceiver(Positions pos = {}) const;

102
slsDetectorSoftware/src/Detector.cpp
View File

@ -142,9 +142,7 @@ Result<std::string> Detector::getDetectorTypeAsString(Positions pos) const {
return pimpl->Parallel(&slsDetector::getDetectorTypeAsString, pos);
}
int Detector::size() const {
return pimpl->size();
}
int Detector::size() const { return pimpl->size(); }
defs::coordinates Detector::getNumberOfDetectors() const {
defs::coordinates coord;
@ -432,7 +430,8 @@ Result<int64_t> Detector::getNumberOfCyclesLeft(Positions pos) const {
}
Result<ns> Detector::getExptimeLeft(Positions pos) const {
return pimpl->Parallel(&slsDetector::getTimeLeft, pos, defs::ACQUISITION_TIME);
return pimpl->Parallel(&slsDetector::getTimeLeft, pos,
defs::ACQUISITION_TIME);
}
Result<ns> Detector::getPeriodLeft(Positions pos) const {
@ -440,11 +439,13 @@ Result<ns> Detector::getPeriodLeft(Positions pos) const {
}
Result<ns> Detector::getDelayAfterTriggerLeft(Positions pos) const {
return pimpl->Parallel(&slsDetector::getTimeLeft, pos, defs::DELAY_AFTER_TRIGGER);
return pimpl->Parallel(&slsDetector::getTimeLeft, pos,
defs::DELAY_AFTER_TRIGGER);
}
Result<int64_t> Detector::getNumberOfFramesFromStart(Positions pos) const {
return pimpl->Parallel(&slsDetector::getTimeLeft, pos, defs::FRAMES_FROM_START);
return pimpl->Parallel(&slsDetector::getTimeLeft, pos,
defs::FRAMES_FROM_START);
}
Result<ns> Detector::getActualTime(Positions pos) const {
@ -452,16 +453,95 @@ Result<ns> Detector::getActualTime(Positions pos) const {
}
Result<ns> Detector::getMeasurementTime(Positions pos) const {
return pimpl->Parallel(&slsDetector::getTimeLeft, pos, defs::MEASUREMENT_TIME);
return pimpl->Parallel(&slsDetector::getTimeLeft, pos,
defs::MEASUREMENT_TIME);
}
Result<ns> Detector::getMeasuredPeriod(Positions pos) const {
return pimpl->Parallel(&slsDetector::getTimeLeft, pos, defs::MEASURED_PERIOD);
};
return pimpl->Parallel(&slsDetector::getTimeLeft, pos,
defs::MEASURED_PERIOD);
}
Result<ns> Detector::getMeasuredSubFramePeriod(Positions pos) const {
return pimpl->Parallel(&slsDetector::getTimeLeft, pos, defs::MEASURED_SUBPERIOD);
};
return pimpl->Parallel(&slsDetector::getTimeLeft, pos,
defs::MEASURED_SUBPERIOD);
}
Result<int> Detector::getSpeed(Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::CLOCK_DIVIDER, -1, 0);
}
void Detector::setSpeed(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::CLOCK_DIVIDER, value, 0);
}
Result<int> Detector::getADCPhase(bool inDeg, Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::ADC_PHASE, -1, inDeg);
}
void Detector::setADCPhase(int value, bool inDeg, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::ADC_PHASE, value, inDeg);
}
Result<int> Detector::getMaxADCPhaseShift(Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::MAX_ADC_PHASE_SHIFT, -1, 0);
}
Result<int> Detector::getDBITPhase(bool inDeg, Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::DBIT_PHASE, -1, inDeg);
}
void Detector::setDBITPhase(int value, bool inDeg, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::DBIT_PHASE, value, inDeg);
}
Result<int> Detector::getMaxDBITPhaseShift(Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::MAX_DBIT_PHASE_SHIFT, -1, 0);
}
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);
}
Result<int> Detector::getDBITClock(Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::DBIT_CLOCK, -1, 0);
}
void Detector::setDBITClock(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::DBIT_CLOCK, value, 0);
}
Result<int> Detector::getRUNClock(Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::CLOCK_DIVIDER, -1, 0);
}
void Detector::setRUNClock(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::CLOCK_DIVIDER, value, 0);
}
Result<int> Detector::getSYNCClock(Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::SYNC_CLOCK, -1, 0);
}
Result<int> Detector::getADCPipeline(Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::ADC_PIPELINE, -1, 0);
}
void Detector::setADCPipeline(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::ADC_PIPELINE, value, 0);
}
Result<int> Detector::getDBITPipeline(Positions pos) const {
return pimpl->Parallel(&slsDetector::setSpeed, pos, defs::DBIT_PIPELINE, -1, 0);
}
void Detector::setDBITPipeline(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setSpeed, pos, defs::DBIT_PIPELINE, value, 0);
}
// Erik
Result<int> Detector::getFramesCaughtByReceiver(Positions pos) const {