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

sharedmem: done with multi .h, sls and command line left

Browse Source
This commit is contained in:
maliakal_d
2018-06-20 17:12:48 +02:00
parent 2853f97fe7
commit 55517e6d4c
2 changed files with 512 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4220,6 +4220,24 @@ int multiSlsDetector::getFlatFieldCorrection(double* corr, double* ecorr)
return ff; return ff;
} }
int multiSlsDetector::flatFieldCorrect(double* datain, double* errin, double* dataout, double* errout)
{
int ichdet = 0;
double* perr = errin; //*pdata,
for (int idet = 0; idet < detectors.size(); ++idet) {
#ifdef VERBOSE
cout << " detector " << idet << " offset " << ichdet << endl;
#endif
if (errin)
perr += ichdet;
detectors[idet]->flatFieldCorrect(datain + ichdet, perr,
dataout + ichdet, errout + ichdet);
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
ichdet += detectors[idet]->getTotalNumberOfChannels();
}
return 0;
}
int multiSlsDetector::setBadChannelCorrection(string fname) int multiSlsDetector::setBadChannelCorrection(string fname)
{ {
@ -4451,25 +4469,6 @@ angleConversionConstant* multiSlsDetector::getAngularConversionPointer(int imod)
} }
int multiSlsDetector::flatFieldCorrect(double* datain, double* errin, double* dataout, double* errout)
{
int ichdet = 0;
double* perr = errin; //*pdata,
for (int idet = 0; idet < detectors.size(); ++idet) {
#ifdef VERBOSE
cout << " detector " << idet << " offset " << ichdet << endl;
#endif
if (errin)
perr += ichdet;
detectors[idet]->flatFieldCorrect(datain + ichdet, perr,
dataout + ichdet, errout + ichdet);
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
ichdet += detectors[idet]->getTotalNumberOfChannels();
}
return 0;
}
int multiSlsDetector::printReceiverConfiguration() int multiSlsDetector::printReceiverConfiguration()
{ {
int ret, ret1 = -100; int ret, ret1 = -100;

909
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

File diff suppressed because it is too large Load Diff