detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

resetting frame index for scans for eiger

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-08-19 15:47:24 +02:00
parent 5dd5c250f3
commit 587d357f3e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -2187,11 +2187,8 @@ void UDPStandardImplementation::startFrameIndices(int ithread){
FILE_LOG(logDEBUG) << __AT__ << " called"; FILE_LOG(logDEBUG) << __AT__ << " called";
if (myDetectorType == EIGER){ if (myDetectorType == EIGER){
//add currframenum later in this method for scans startFrameIndex = 0;
/*if(dynamicRange == 32) /*startFrameIndex = htonl(*(unsigned int*)((eiger_image_header *)((char*)(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS)))->fnum);*/
startFrameIndex = htonl(*(unsigned int*)((eiger_image_header32 *)((char*)(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS)))->fnum);
else*/
startFrameIndex = htonl(*(unsigned int*)((eiger_image_header *)((char*)(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS)))->fnum);
} }
//gotthard has +1 for frame number and not a short frame //gotthard has +1 for frame number and not a short frame
else if ((myDetectorType == PROPIX) || ((myDetectorType == GOTTHARD) && (shortFrame == -1))) else if ((myDetectorType == PROPIX) || ((myDetectorType == GOTTHARD) && (shortFrame == -1)))
@ -2209,6 +2206,7 @@ void UDPStandardImplementation::startFrameIndices(int ithread){
acqStarted = true; acqStarted = true;
cout << "startAcquisitionIndex:" << hex << startAcquisitionIndex<<endl; cout << "startAcquisitionIndex:" << hex << startAcquisitionIndex<<endl;
} }
/*
//for scans, cuz currfraenum resets //for scans, cuz currfraenum resets
else if (myDetectorType == EIGER){ else if (myDetectorType == EIGER){
if(dynamicRange == 32) if(dynamicRange == 32)
@ -2217,7 +2215,7 @@ void UDPStandardImplementation::startFrameIndices(int ithread){
startFrameIndex += currframenum; startFrameIndex += currframenum;
} }
*/
cout << "startFrameIndex:" << startFrameIndex<<endl; cout << "startFrameIndex:" << startFrameIndex<<endl;
prevframenum=startFrameIndex; prevframenum=startFrameIndex;