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

moving towards c++ api

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-12-12 14:24:11 +01:00
parent a67f9d50de
commit e7621a6cd0
9 changed files with 180 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -140,6 +140,10 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
thisMultiDetector->fileIndex=0;
/** set frames per file to default to 1*/
thisMultiDetector->framesPerFile=1;
/** set fileIndex to default to 0*/
thisMultiDetector->fileIndex=0;
/** set fileFormat to default to ascii*/
thisMultiDetector->fileFormatType=ASCII;
/** set progress Index to default to 0*/
thisMultiDetector->progressIndex=0;
@ -245,6 +249,7 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
fileName=thisMultiDetector->fileName;
fileIndex=&thisMultiDetector->fileIndex;
framesPerFile=&thisMultiDetector->framesPerFile;
fileFormatType=&thisMultiDetector->fileFormatType;
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
@ -4824,6 +4829,25 @@ string multiSlsDetector::setFileName(string s) {
slsReceiverDefs::fileFormat multiSlsDetector::setFileFormat(fileFormat f) {
int ret=-100, ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=(int)detectors[idet]->setFileFormat(f);
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
}
return (fileFormat)ret;
}
int multiSlsDetector::setFileIndex(int i) {
int ret=-100, ret1;

14
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -121,6 +121,8 @@ class multiSlsDetector : public slsDetectorUtils {
char filePath[MAX_STR_LENGTH];
/** max frames per file */
int framesPerFile;
/** file format*/
fileFormat fileFormatType;
/** corrections to be applied to the data \see ::correctionFlags */
int correctionMask;
@ -1149,6 +1151,13 @@ class multiSlsDetector : public slsDetectorUtils {
*/
string setFileName(string s="");
/**
Sets up the file format
@param f file format
\returns file format
*/
fileFormat setFileFormat(fileFormat f=GET_FILE_FORMAT);
/**
Sets up the file index
@param i file index
@ -1166,6 +1175,11 @@ class multiSlsDetector : public slsDetectorUtils {
*/
string getFileName(){return setFileName();};
/**
\returns file name
*/
fileFormat getFileFormat(){return setFileFormat();};
/**
\returns file index
*/