detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 06:29:21 +01:00
Code Issues Actions Packages Releases Activity

changed cluster file format

Browse Source
This commit is contained in:
bergamaschi
2018-11-09 12:34:14 +01:00
parent 817736fcd5
commit 2e83db7d45
10 changed files with 328 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
slsDetectorCalibration/multiThreadedAnalogDetector.h
View File

@@ -27,6 +27,7 @@
using namespace std;
class threadedAnalogDetector
{
public:
@@ -35,12 +36,25 @@ public:
det=d;
fifoFree=new CircularFifo<char>(fs);
fifoData=new CircularFifo<char>(fs);
mem=(char*)malloc(fs*det->getDataSize());
// cout << "data size is " << det->getDataSize()*fs << endl;
for (int i=0; i<fs; i++) {
mm=mem+i*det->getDataSize();
fifoFree->push(mm);
/* mem=(char*)calloc(fs, det->getDataSize()); */
/* if (mem) */
/* memset(mem,0, fs*det->getDataSize()); */
int i;
for (i=0; i<fs; i++) {
//
// mm=mem+i*det->getDataSize();
// cout << i << endl;
mm=(char*)calloc(1, det->getDataSize());
if (mm) {
//memset(mm,0, det->getDataSize());
fifoFree->push(mm);
} else
break;
}
if (i<fs) cout << "Could allocate only "<< i <<" frames";
busy=0;
stop=1;
fMode=eFrame;
@@ -264,6 +278,7 @@ public:
}
for (int i=0; i<nThreads; i++) {
cout << "**" << i << endl;
dets[i]=new threadedAnalogDetector(dd[i], fs);
}