huge change in receiver in previous version, sortingand padding frames before movign into fifo; users small change in previous revision typecasting

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@676 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-10-02 14:28:37 +00:00
parent eba9bcf9ac
commit 9e08196677
8 changed files with 7 additions and 18 deletions

View File

@ -1116,7 +1116,7 @@ int slsReceiverFuncs::gotthard_read_frame(){
pindex = (bindex & GOTTHARD_SHORT_PACKET_INDEX_MASK);
index = ((bindex & GOTTHARD_SHORT_FRAME_INDEX_MASK) >> GOTTHARD_SHORT_FRAME_INDEX_OFFSET);
#ifdef VERBOSE
cout<<"index:"<<hex<<index<<endl;
cout << "index:" << hex << index << endl;
#endif
}else{
bindex = (uint32_t)(*((uint32_t*)raw));
@ -1126,8 +1126,8 @@ int slsReceiverFuncs::gotthard_read_frame(){
pindex2 =(bindex2 & GOTTHARD_PACKET_INDEX_MASK);
index2 =((bindex2 & GOTTHARD_FRAME_INDEX_MASK) >> GOTTHARD_FRAME_INDEX_OFFSET);
#ifdef VERBOSE
cout<<"index1:"<<hex<<index<<endl;
cout<<"index2:"<<hex<<index<<endl;
cout << "index1:" << hex << index << endl;
cout << "index2:" << hex << index << endl;
#endif
}