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

jf stuff

Browse Source
This commit is contained in:
Erik Frojdh
2020-05-28 09:28:53 +02:00
parent 6c753f3b50
commit e2eb1598d3
8 changed files with 68 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1844,7 +1844,7 @@ class CmdProxy {
"(#storagecells + 1).");
INTEGER_COMMAND(
storagecell_start, getStorageCellStart, setStoragecellStart,
storagecell_start, getStorageCellStart, setStorageCellStart,
StringTo<int>,
"[0-15]\n\t[Jungfrau] Storage cell that stores the first acquisition "
"of the series. Default is 15. For advanced users only.");

6
slsDetectorSoftware/src/Detector.cpp
View File

@ -1132,11 +1132,11 @@ void Detector::setNumberOfAdditionalStorageCells(int value) {
}
Result<int> Detector::getStorageCellStart(Positions pos) const {
return pimpl->Parallel(&Module::setStoragecellStart, pos, -1);
return pimpl->Parallel(&Module::setStorageCellStart, pos, -1);
}
void Detector::setStoragecellStart(int cell, Positions pos) {
pimpl->Parallel(&Module::setStoragecellStart, pos, cell);
void Detector::setStorageCellStart(int cell, Positions pos) {
pimpl->Parallel(&Module::setStorageCellStart, pos, cell);
}
Result<ns> Detector::getStorageCellDelay(Positions pos) const {

2
slsDetectorSoftware/src/Module.cpp
View File

@ -2355,7 +2355,7 @@ int Module::setTemperatureEvent(int val) {
return retval;
}
int Module::setStoragecellStart(int pos) {
int Module::setStorageCellStart(int pos) {
return sendToDetector<int>(F_STORAGE_CELL_START, pos);
}

2
slsDetectorSoftware/src/Module.h
View File

@ -1200,7 +1200,7 @@ class Module : public virtual slsDetectorDefs {
* @param value storage cell index. Value can be 0 to 15. (-1 gets)
* @returns the storage cell that stores the first acquisition of the series
*/
int setStoragecellStart(int pos = -1);
int setStorageCellStart(int pos = -1);
/**
* [Jungfau][Ctb] Programs FPGA with raw file from pof file