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

patloops done

Browse Source
This commit is contained in:
maliakal_d
2019-10-24 18:59:23 +02:00
parent f73a15e786
commit f4a0780b51
21 changed files with 301 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ctbGui/ctbPattern.cpp
View File

@ -118,7 +118,7 @@ ctbLoop::ctbLoop(TGGroupFrame *page, int i, sls::Detector *det) : TGHorizontalFr
void ctbLoop::setNLoops() {
try{
myDet->setPatternLoops(id, -1, -1, eLoopNumber->GetNumber());
myDet->setPatternLoopCycles(id, eLoopNumber->GetNumber());
} CATCH_DISPLAY ("Could not set number of pattern loops for level " + to_string(id) + ".", "ctbLoop::setNLoops")
}
@ -127,10 +127,12 @@ void ctbLoop::setNLoops() {
void ctbLoop::update() {
try{
auto loop = myDet->getPatternLoops(id).tsquash("Different values");
eLoopStartAddr->SetHexNumber(loop[0]);
eLoopStopAddr->SetHexNumber(loop[1]);
eLoopNumber->SetNumber(loop[2]);
auto loop = myDet->getPatternLoopCycles(id).tsquash("Different values");
eLoopNumber->SetNumber(loop);
auto loopaddr = myDet->getPatternLoopAddresses(id).tsquash("Different values");
eLoopStartAddr->SetHexNumber(loopaddr[0]);
eLoopStopAddr->SetHexNumber(loopaddr[1]);
} CATCH_DISPLAY ("Could not get pattern loops for level " + to_string(id) + ".", "ctbLoop::update")
}
@ -825,7 +827,7 @@ void ctbPattern::update() {
} CATCH_DISPLAY ("Could not get number of triggers.", "ctbPattern::update")
try{
auto retval = myDet->getPatternLoops(-1).tsquash("Different values");
auto retval = myDet->getPatternLoopAddresses(-1).tsquash("Different values");
eStartAddr->SetHexNumber(retval[0]);
eStopAddr->SetHexNumber(retval[1]);
} CATCH_DISPLAY ("Could not get dbit phase shift.", "ctbPattern::update")