detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-22 15:18:55 +01:00
Code Issues Actions 4 Packages Releases Activity

users: added setroi and getroi, modified multi to allow imod for setroi on sls level, modified detectorsize to set a single roi or give roi if only one roi

Browse Source
This commit is contained in:
maliakal_d
2018-12-03 11:50:56 +01:00
parent c611523352
commit 2cebec90ee
8 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@@ -4534,7 +4534,7 @@ string slsDetectorCommand::cmdDetectorSize(int narg, char *args[], int action) {
ret=myDet->setDynamicRange(val);
} else if (cmd=="roi") {
ROI* r = myDet->getROI(ret);
if (r != NULL)
if (myDet->isMultiSlsDetectorClass() && r != NULL)
delete [] r;
} else if (cmd=="detsizechan") {
sprintf(ans,"%d %d",myDet->getMaxNumberOfChannelsPerDetector(X),myDet->getMaxNumberOfChannelsPerDetector(Y));
@@ -6997,7 +6997,7 @@ string slsDetectorCommand::cmdPattern(int narg, char *args[], int action) {
}
}
os << hex << reg << dec;
if (aa != NULL)
if (myDet->isMultiSlsDetectorClass() && aa != NULL)
delete [] aa;