From 74cc08a7662fe5299c5fd1d01db89684fe8e7f4a Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 4 Oct 2013 08:49:28 +0000 Subject: [PATCH] included frameindexmask and frameindexoffset for moench git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@680 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsReceiver/slsReceiverFunctionList.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp index c340b11a2..03c6a55df 100644 --- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp +++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp @@ -77,6 +77,8 @@ slsReceiverFunctionList::slsReceiverFunctionList(detectorType det): maxFramesPerFile = MOENCH_MAX_FRAMES_PER_FILE; bufferSize = MOENCH_BUFFER_SIZE; packetsPerFrame = MOENCH_PACKETS_PER_FRAME; + frameIndexMask = MOENCH_FRAME_INDEX_MASK; + frameIndexOffset = MOENCH_FRAME_INDEX_OFFSET; } oneBufferSize = bufferSize/packetsPerFrame; @@ -540,6 +542,9 @@ int slsReceiverFunctionList::startListening(){ #endif continue; } + //cout<<"got index:"<> frameIndexOffset); + + if ((myDetectorType == GOTTHARD) && (shortFrame == -1)) (*((uint32_t*)(buffer+offset)))++; @@ -851,7 +856,8 @@ int slsReceiverFunctionList::startWriting(){ receiver_threads_running=0; pthread_mutex_unlock(&status_mutex); - cout << "RealTime Frames Caught:" << dec <