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

Common mode added, working for gotthard double modules

Browse Source
This commit is contained in:
bergamaschi
2018-03-26 09:07:27 +02:00
parent ab06c33107
commit b029f1fa26
17 changed files with 1540 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
slsDetectorCalibration/analogDetector.h
View File

@ -271,34 +271,37 @@ template <class dataType> class analogDetector {
else return 0;
}
virtual void addToCommonMode(double val, int ix, int iy=0){
/* virtual void addToCommonMode(double val, int ix, int iy=0){ */
if (ix>=0 && ix<nx && iy>=0 && iy<ny) {
if (cmSub) {
if (det) if (det->isGood(ix, iy)==0) return;
if (getNumpedestals(ix,iy)>0)
cmSub->addToCommonMode(val-getPedestal(ix,iy), ix, iy);
};
/* if (ix>=0 && ix<nx && iy>=0 && iy<ny) { */
/* if (cmSub) { */
/* if (det) if (det->isGood(ix, iy)==0) return; */
/* if (getNumpedestals(ix,iy)>0) { */
/* cmSub->addToCommonMode(val-getPedestal(ix,iy), ix, iy); */
/* } */
/* }; */
}
}
/* } */
/* } */
virtual void addToCommonMode(char *data){
if (cmSub) {
for (int ix=xmin; ix<xmax; ix++) {
for (int iy=ymin; iy<ymax; iy++) {
if (getNumpedestals(ix,iy)>0)
// if (getNumpedestals(ix,iy)>0)
addToCommonMode(data, ix, iy);
}
}
cout << "cm " << getCommonMode(0,0) << " " << getCommonMode(1,0) << endl;
//cout << "cm " << getCommonMode(0,0) << " " << getCommonMode(1,0) << endl;
}
}
virtual void addToCommonMode(char *data, int ix, int iy=0){
if (cmSub) {
if (det) if (det->isGood(ix, iy)==0) return;
if (getNumpedestals(ix,iy)>0)
if (getNumpedestals(ix,iy)>0){
cmSub->addToCommonMode(subtractPedestal(data,ix,iy,0), ix, iy);
// cout << ix << " " <<subtractPedestal(data,ix,iy,0) << endl;
}
}
}
/**
@ -668,9 +671,9 @@ template <class dataType> class analogDetector {
val=dataSign*det->getValue(data, ix, iy);
else
val=((double*)data)[iy*nx+ix];
if (cm && cmSub)
val-=getCommonMode(ix,iy);
addToPedestal(val,ix,iy);
/* if (cm && cmSub) */
/* val-=getCommonMode(ix,iy); */
addToPedestal(val,ix,iy, cm);
}
return ;
@ -722,7 +725,6 @@ template <class dataType> class analogDetector {
}
if (det) {
// cout << det->getValue(data, ix, iy) << " " << getPedestal(ix,iy) << " " << (dataSign*det->getValue(data, ix, iy)-getPedestal(ix,iy))/g << endl;
return (dataSign*det->getValue(data, ix, iy)-getPedestal(ix,iy, cm))/g;
}
else