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

fixed CM corrections

Browse Source
This commit is contained in:
bergamaschi 2024-02-02 17:08:22 +01:00
parent f3c669f193
commit ef9e769c4b
6 changed files with 136 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorCalibration/analogDetector.h
View File

@ -866,7 +866,7 @@ template <class dataType> class analogDetector {
for (ix = xmin; ix < xmax; ++ix) {
if (det->isGood(ix, iy)) {
// addToPedestal(data,ix,iy,1);
addToPedestal(data, ix, iy, cm);
addToPedestal(data, ix, iy, 0);
/* if (ix==50 && iy==50) */
/* cout<< "*ped* " << id << " " << ix << " " << iy << " "
* << det->getChannel(data,ix,iy) << " " <<
@ -1097,8 +1097,7 @@ template <class dataType> class analogDetector {
return thr;
};
virtual int setClusterSize(int n = -1) {
};
virtual int setClusterSize(int n = -1) { return 0; };
/**
gets threshold value for conversion into number of photons

7
slsDetectorCalibration/commonModeSubtractionNew.h
View File

@ -100,7 +100,10 @@ class commonModeSubtraction {
if (iroi >= 0 && iroi < nROI) {
if (nCm[iroi] > 0)
return mean[iroi] / nCm[iroi];
}
else
std::cout << ix << " " << iy << " no data in cm " << iroi << std::endl;
} else
std::cout << ix << " " << iy << " bad roi " << iroi << std::endl;
return 0;
};
@ -117,6 +120,8 @@ class commonModeSubtraction {
return sqrt(mean2[iroi] / nCm[iroi] -
(mean[iroi] / nCm[iroi]) *
(mean[iroi] / nCm[iroi]));
else
std::cout << ix << " " << iy << " no data in cm " << iroi << std::endl;
}
return 0;
};

2
slsDetectorCalibration/interpolations/slsInterpolation.h
View File

@ -27,6 +27,8 @@ enum quadrant {
//#ifdef MYROOT1
//: public TObject
//#endif
using namespace std;
class slsInterpolation {
public:

25
slsDetectorCalibration/jungfrauCommonMode.h
View File

@ -30,4 +30,29 @@ class commonModeSubtractionSuperColumnJF : public commonModeSubtraction {
};
class commonModeSubtractionChip : public commonModeSubtraction {
public:
commonModeSubtractionChip()
: commonModeSubtraction(8){};
virtual int getROI(int ix, int iy) { int top=iy/256; int sc=ix/256; return sc+top*4; };
/*
virtual void addToCommonMode(double val, int ix = 0, int iy = 0) {
int iroi = getROI(ix, iy);
// cout << iy << " " << ix << " " << iroi ;
if (iroi >= 0 && iroi < nROI) {
mean[iroi] += val;
mean2[iroi] += val * val;
nCm[iroi]++;
if (nCm[iroi] > 64*256)
std::cout << "Too many pixels added " << nCm[iroi] << std::endl;
}
};
*/
virtual commonModeSubtractionChip *Clone() {
return new commonModeSubtractionChip();
};
};
#endif

74
slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
View File

@ -4,9 +4,9 @@
#include <iostream>
//enable common mode subtraction
//#define CMS
#define CMS
//disable common mode subtraction
#undef CMS
//#undef CMS
#undef CORR
#define C_GHOST 0.0004
@ -40,7 +40,8 @@
#include <map>
#include <stdio.h>
#include <sys/stat.h>
//#include "jungfrauCommonMode.h"
//#include "commonModeSubtractionNew.h"
#include "jungfrauCommonMode.h"
#include <ctime>
using namespace std;
@ -63,7 +64,7 @@ int main(int argc, char *argv[]) {
}
int fifosize = 1000;
int nthreads = 10;
int nthreads = 1;
int csize = 3; //3
int nsigma = 5;
int nped = 10000;
@ -73,10 +74,12 @@ int main(int argc, char *argv[]) {
#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && !defined JFSTRXCHIP6
#ifndef MODULE
cout << "This is a JF single chip!" <<endl;
jungfrauHighZSingleChipData *decoder = new jungfrauHighZSingleChipData();
int nx = 256, ny = 256;
#endif
#ifdef MODULE
cout << "This is a JF module!" <<endl;
jungfrauModuleData *decoder = new jungfrauModuleData();
int nx = 1024, ny = 512;
#endif
@ -186,7 +189,7 @@ int main(int argc, char *argv[]) {
uint32_t nnx, nny;
commonModeSubtraction *cm = NULL;
#ifdef CMS
cm = new commonModeSubtractionSuperColumnJF();
cm = new commonModeSubtractionChip();//commonModeSubtraction(1,5);//commonModeSubtractionSuperColumnJF();
std::cout << "Enabled common mode subtraction" << std::endl;
#endif
singlePhotonDetector *filter = new singlePhotonDetector(
@ -250,6 +253,7 @@ int main(int argc, char *argv[]) {
double *ped=new double[nx * ny];//, *ped1;
int pos,pos1;
int ipixX=351, ipixY=331;
if (pedfile) {
@ -277,19 +281,43 @@ int main(int argc, char *argv[]) {
ff = -1;
while (decoder->readNextFrame(filebin, ff, np, buff)) {
// if (np == 40) {
if ((ifr+1) % 100 == 0) {
cout << " ****" << decoder->getValue(buff,20,20);// << endl;
}
// if ((ifr+1) % 100 == 0) {
// cout << " ****" << decoder->getValue(buff,20,20);// << endl;
// }
mt->pushData(buff);
// while (mt->isBusy())
// ;
//if ((ifr+1) % 100 == 0)
// double pix=0,ped=0,sub=0,cmp=0, sub0=0;
// for (int ix=-1; ix<2; ix++) {
// for (int iy=-1; iy<2; iy++) {
// pix+=decoder->getValue(buff, ipixX+ix, ipixY+iy);
// sub+=filter->subtractPedestal(buff, ipixX+ix, ipixY+iy, 1);
// sub0+=filter->subtractPedestal(buff, ipixX+ix, ipixY+iy, 0);
// ped+=filter->getPedestal(ipixX+ix, ipixY+iy);
// cmp+=filter->getCommonMode(ipixX+ix, ipixY+iy);
// }
// }
// cout << pix << " " << sub << " " sub0 << " " << ped << " " << cmp << endl;
mt->nextThread();
mt->popFree(buff);
ifr++;
if (ifr % 100 == 0) {
cout << " ****" << ifr << " " << ff << " " << np << endl;
} //else
// if (ifr % 100 == 0) {
// cout << " ****" << ifr << " " << ff << " " << np << endl;
// }
//else
//cout << ifr << " " << ff << " " << np << endl;
if (ifr>=1000)
break;
// if (ifr>=1000)
// break;
ff = -1;
}
filebin.close();
@ -370,7 +398,25 @@ int main(int argc, char *argv[]) {
if ((ifr+1) % 100 == 0) {
cout << " ****" << decoder->getValue(buff,20,20);// << endl;
}
mt->pushData(buff);
mt->pushData(buff);
// while (mt->isBusy())
// double pix=0,ped=0,sub=0,cmp=0, sub0=0;
// for (int ix=-1; ix<2; ix++) {
// for (int iy=-1; iy<2; iy++) {
// pix+=decoder->getValue(buff, ipixX+ix, ipixY+iy);
// sub+=filter->subtractPedestal(buff, ipixX+ix, ipixY+iy, 1);
// sub0+=filter->subtractPedestal(buff, ipixX+ix, ipixY+iy, 0);
// ped+=filter->getPedestal(ipixX+ix, ipixY+iy);
// cmp+=filter->getCommonMode(ipixX+ix, ipixY+iy);
// }
// }
// cout << pix << " " << sub << " " sub0 << " " << ped << " " << cmp << endl;
// // //pop
mt->nextThread();
mt->popFree(buff);

44
slsDetectorCalibration/singlePhotonDetector.h
View File

@ -396,14 +396,14 @@ class singlePhotonDetector : public analogDetector<uint16_t> {
return 0;
}
newFrame(data);
/*
if (cmSub) {
addToCommonMode(data);
cm = 1;
}
*/
double *val = new double[ny * nx];
cm=0;
for (iy = ymin; iy < ymax; ++iy) {
for (ix = xmin; ix < xmax; ++ix) {
if (det->isGood(ix, iy) == 0)
@ -547,12 +547,50 @@ class singlePhotonDetector : public analogDetector<uint16_t> {
} else if (ee == PEDESTAL) {
addToPedestal(data, ix, iy, cm);
if (cmSub) {
addToCommonMode(data, ix, iy);
}
} /*else {
eventMask[iy][ix]=PHOTON;
}*/
// eventMask[iy][ix]=ee;
}
}
if (cmSub) {
double cmv=0;
for (int iph=0; iph<nph; iph++) {
ix=(clusters + iph)->x ;
iy=(clusters + nph)->y;
for (ir = -(clusterSizeY / 2); ir < (clusterSizeY / 2) + 1;
ir++) {
for (ic = -(clusterSize / 2);
ic < (clusterSize / 2) + 1; ic++) {
if ((iy + ir) >= 0 && (iy + ir) < ny &&
(ix + ic) >= 0 && (ix + ic) < nx) {
cmv=getCommonMode(ix+ic, iy+ir);
//if (ir==0 && ic==0)
//cout << cmv << endl;
(clusters + iph)
->set_data((clusters + iph)
->get_data(ic,ir)-cmv, ic,ir);
}
}
}
}
}
nphFrame = nph;
nphTot += nph;