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

conflict resolved

Browse Source
This commit is contained in:
maliakal_d
2019-04-18 15:32:07 +02:00
parent 266520741a faf7e0db82
commit 1bc6e7f978
6 changed files with 238 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -4550,9 +4550,6 @@ std::array<int, 3> slsDetector::setPatternLoops(int level, int start, int stop,
sizeof(retvals));
FILE_LOG(logDEBUG1) << "Set Pat Loops: " << retvals[0] << ", "
<< retvals[1] << ", " << retvals[2];
assert(start == retvals[0]);
assert(stop == retvals[1]);
assert(n == retvals[2]);
r[0] = retvals[0];
r[1] = retvals[1];
r[2] = retvals[2];