detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 19:30:03 +02:00
Code Issues Actions Packages Releases Activity

receiver +4 and +10 to get only data out of the whole data with frame index etc

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@418 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-01-08 14:04:50 +00:00
parent 6f793abca8
commit 16f74ebdf2
8 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x416 //#define SVNREV 0x417
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x416 #define SVNREV 0x417
#define SVNDATE 0x20121218 #define SVNDATE 0x20121220
// //

6
slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x414 //#define SVNREV 0x417
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x414 #define SVNREV 0x417
#define SVNDATE 0x20121218 #define SVNDATE 0x20121220
// //

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x416 //#define SVNREV 0x417
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "l_maliakal_d" #define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x416 #define SVNREVLIB 0x417
#define SVNDATELIB 0x20121218 #define SVNDATELIB 0x20121220
// //

2
slsDetectorSoftware/slsReceiver/circularFifo.h
View File

@ -15,6 +15,8 @@
#ifndef CIRCULARFIFO_H_ #ifndef CIRCULARFIFO_H_
#define CIRCULARFIFO_H_ #define CIRCULARFIFO_H_
#include "sls_detector_defs.h"
/** Circular Fifo (a.k.a. Circular Buffer) /** Circular Fifo (a.k.a. Circular Buffer)
* Thread safe for one reader, and one writer */ * Thread safe for one reader, and one writer */
template<typename Element, unsigned int Size> template<typename Element, unsigned int Size>

2
slsDetectorSoftware/slsReceiver/slsReceiver.cpp
View File

@ -4,7 +4,7 @@
#include "receiver_defs.h" #include "receiver_defs.h"
#include "MySocketTCP.h" #include "MySocketTCP.h"
#include "slsReceiver_funcs.h" #include "slsReceiver_funcs.h"
#include "sls_detector_defs.h"
#include <signal.h> //SIGINT #include <signal.h> //SIGINT
#include <cstdlib> //EXIT #include <cstdlib> //EXIT

1
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -257,6 +257,7 @@ int slsReceiverFunctionList::startListening(){
//cout<<"startFrameIndex:"<<startFrameIndex<<endl; //cout<<"startFrameIndex:"<<startFrameIndex<<endl;
prevframenum=startFrameIndex; prevframenum=startFrameIndex;
} }
//start of acquisition //start of acquisition
if(startAcquisitionIndex==-1){ if(startAcquisitionIndex==-1){
startAcquisitionIndex=startFrameIndex; startAcquisitionIndex=startFrameIndex;

13
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -695,15 +695,15 @@ int slsReceiverFuncs::read_frame(){
if((index%2)!=index2%2){ if((index%2)!=index2%2){
//ideal situation (should be odd, even(index+1)) //ideal situation (should be odd, even(index+1))
if(index%2){ if(index%2){
memcpy(retval,((char*) origVal)+2, onedatasize); memcpy(retval,((char*) origVal)+4, onedatasize);
memcpy((((char*)retval)+onedatasize), ((char*) origVal)+8+onedatasize, onedatasize); memcpy((((char*)retval)+onedatasize), ((char*) origVal)+10+onedatasize, onedatasize);
break; break;
} }
//swap to even,odd //swap to even,odd
if(index2%2){ if(index2%2){
memcpy((((char*)retval)+onedatasize),((char*) origVal)+2, onedatasize); memcpy((((char*)retval)+onedatasize),((char*) origVal)+4, onedatasize);
memcpy(retval, ((char*) origVal)+8+onedatasize, onedatasize); memcpy(retval, ((char*) origVal)+10+onedatasize, onedatasize);
index=index2; index=index2;
break; break;
} }
@ -717,13 +717,12 @@ int slsReceiverFuncs::read_frame(){
if(count==20){ if(count==20){
cout << "same type: index:" << index << "\tindex2:" << index2 << endl; cout << "same type: index:" << index << "\tindex2:" << index2 << endl;
/**send garbage with -1 index to try again*/ /**send garbage with -1 index to try again*/
memcpy(retval,((char*) origVal)+2, onedatasize); memcpy(retval,((char*) origVal)+4, onedatasize);
memcpy((((char*)retval)+onedatasize), ((char*) origVal)+8+onedatasize, onedatasize); memcpy((((char*)retval)+onedatasize), ((char*) origVal)+10+onedatasize, onedatasize);
} }
arg=((index - startIndex)/2)-1; arg=((index - startIndex)/2)-1;
#ifdef VERBOSE #ifdef VERBOSE
cout << "\nstartIndex:" << startIndex << endl; cout << "\nstartIndex:" << startIndex << endl;
cout << "fName:" << fName << endl; cout << "fName:" << fName << endl;

6
slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x415 //#define SVNREV 0x417
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x415 #define SVNREV 0x417
#define SVNDATE 0x20121218 #define SVNDATE 0x20121220
// //