fixed merge

This commit is contained in:
Erik Frojdh
2019-08-09 11:45:06 +02:00
15 changed files with 235 additions and 121 deletions

View File

@@ -505,12 +505,12 @@ class DetectorPythonInterface {
}
int getNumberOfGates() {
return det.setTimer(slsDetectorDefs::timerIndex::GATES_NUMBER, -1);
}
void setNumberOfGates(const int t) {
det.setTimer(slsDetectorDefs::timerIndex::GATES_NUMBER, t);
}
// int getNumberOfGates() {
// return det.setTimer(slsDetectorDefs::timerIndex::GATES_NUMBER, -1);
// }
// void setNumberOfGates(const int t) {
// det.setTimer(slsDetectorDefs::timerIndex::GATES_NUMBER, t);
// }
// time in ns
int64_t getDelay() {