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

somenthing on calibration

Browse Source
This commit is contained in:
bergamaschi
2020-03-19 11:41:55 +01:00
parent c2639854fa
commit 6091271f37
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h
View File

@ -44,6 +44,28 @@ class moench04CtbZmq10GbData : public slsDetectorData<uint16_t> {
int adc_nr[32]={9, 8,11,10,13,12,15,14,1,0,3,2,5,4,7,6,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24 };
/*
iadc=ptr%32
isample=ptr/32
col=(adc_nr[iadc]%16)*25+isample%25
if (adc_nr[iadc]<16)
row=199-isample/25;
else
row=200+isample/25
adc0 col(9*25..10*25-1) row(199..0)
adc1 col(8*25..9*25-1) row(199..0)
adc2 col(11*25..12*25-1) row(199..0)
adc3 col(10*25..11*25-1) row(199..0)
adc4 col(13*25..14*25-1) row(199..0)
adc5 col(12*25..13*25-1) row(199..0)
adc6 col(15*25..16*25-1) row(199..0)
adc7 col(14*25..15*25-1) row(199..0)
adc8 col(1*25..2*25-1) row(199..0)
*/
int row, col;
//int isample;

5
slsDetectorCalibration/multiThreadedAnalogDetector.h
View File

@ -123,7 +123,7 @@ public:
return fifoFree->pop(ptr);
}
virtual int isBusy() {return busy;}
virtual int isBusy() {if (fifoData->isEmpty() && busy==0) return 0; else return 1;}
//protected:
/** Implement this method in your subclass with the code you want your thread to run. */
@ -249,7 +249,7 @@ protected:
}
void * processData() {
busy=1;
// busy=1;
while (!stop) {
if (fifoData->isEmpty()) {
busy=0;
@ -259,6 +259,7 @@ protected:
fifoData->pop(data); //blocking!
det->processData(data);
fifoFree->push(data);
//busy=0;
}
}
return NULL;