Some bug fixes to slsReceiverData

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@17 113b152e-814d-439b-b186-022a431db7b5
This commit is contained in:
bergamaschi
2014-01-14 13:46:21 +00:00
parent 574f9cf566
commit facbce62cf
4 changed files with 43 additions and 20 deletions

View File

@ -18,7 +18,8 @@ class moench02ModuleData : public slsReceiverData<uint16_t> {
*/
moench02ModuleData(double c=0): slsReceiverData<uint16_t>(160, 160, 40, 1286), xtalk(c) {
moench02ModuleData(double c=0): slsReceiverData<uint16_t>(160, 160, 40, 1286),
xtalk(c) {
@ -96,8 +97,9 @@ class moench02ModuleData : public slsReceiverData<uint16_t> {
*/
double getValue(char *data, int ix, int iy=0) {
// cout << "##" << (void*)data << " " << ix << " " <<iy << endl;
if (xtalk==0 || ix%40==0)
return (double)getValue(data, ix, iy);
return slsDetectorData<uint16_t>::getValue(data, ix, iy);
else
return slsDetectorData<uint16_t>::getValue(data, ix, iy)-xtalk*slsDetectorData<uint16_t>::getValue(data, ix-1, iy);
};