diff --git a/examples/jctb_moench03_T1.config b/examples/jctb_moench03_T1.config index 238de7d02..ce99d8be7 100644 --- a/examples/jctb_moench03_T1.config +++ b/examples/jctb_moench03_T1.config @@ -430,13 +430,13 @@ patwaittime2 0 ############################################# ### edit with 10 Gbs IP of your server ############################################ -#0:udp_dstip 10.1.1.102 -0:udp_dstip 129.129.202.136 +0:udp_dstip 10.1.1.102 +#0:udp_dstip 129.129.202.136 ############################################# ### edit with any number in the subnet of your server (first 3 numbers as above) ############################################ -#0:udp_srcip 10.1.1.19 -0:udp_srcip 129.129.202.13 +0:udp_srcip 10.1.1.19 +#0:udp_srcip 129.129.202.13 0:udp_dstport 33410 ############################################# @@ -457,7 +457,7 @@ patwaittime2 0 ############################################ rx_hostname mpc2011 -tengiga 0 +tengiga 1 rx_datastream 1 rx_readfreq 1 diff --git a/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h b/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h index f897724aa..45e51e133 100644 --- a/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h +++ b/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h @@ -44,6 +44,28 @@ class moench04CtbZmq10GbData : public slsDetectorData { 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; diff --git a/slsDetectorCalibration/multiThreadedAnalogDetector.h b/slsDetectorCalibration/multiThreadedAnalogDetector.h index bdfacf455..dae96aac9 100644 --- a/slsDetectorCalibration/multiThreadedAnalogDetector.h +++ b/slsDetectorCalibration/multiThreadedAnalogDetector.h @@ -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;