diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 355fd1524..410c414c3 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git -Repsitory UUID: d2553484f575ec21e35c0a782cc307f9e0115554 -Revision: 16 +Repsitory UUID: e019a6ce7d96d4ac9cb5762b7137245aedb4d5b8 +Revision: 22 Branch: master -Last Changed Author: Maliakal_Dhanya -Last Changed Rev: 16 -Last Changed Date: 2014-07-31 12:13:15 +0200 +Last Changed Author: Anna_Bergamaschi +Last Changed Rev: 22 +Last Changed Date: 2014-10-15 09:22:40 +0200 diff --git a/slsReceiverSoftware/includes/gitInfoReceiver.h b/slsReceiverSoftware/includes/gitInfoReceiver.h index 586f715b0..967f26e15 100644 --- a/slsReceiverSoftware/includes/gitInfoReceiver.h +++ b/slsReceiverSoftware/includes/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "d2553484f575ec21e35c0a782cc307f9e0115554" -//#define SVNREV 0x16 +#define SVNREPUUID "e019a6ce7d96d4ac9cb5762b7137245aedb4d5b8" +//#define SVNREV 0x22 //#define SVNKIND "" //#define SVNSCHED "" -#define SVNAUTH "Maliakal_Dhanya" -#define SVNREV 0x16 -#define SVNDATE 0x20140731 +#define SVNAUTH "Anna_Bergamaschi" +#define SVNREV 0x22 +#define SVNDATE 0x20141015 // diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp index aa9458377..4be1529b4 100644 --- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp +++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp @@ -1551,19 +1551,21 @@ int slsReceiverUDPFunctions::startListening(){ //#endif - - //start indices for each start of scan/acquisition - eiger does it before - if((!measurementStarted) && (rc > 0) && (!ithread)) - startFrameIndices(ithread); + if((!measurementStarted) && (rc > 0) && (!ithread)) + startFrameIndices(ithread); + //problem in receiving or end of acquisition if((rc < expected)||(rc <= 0)){ stopListening(ithread,rc,packetcount,total); continue; } - - +/* + //start indices for each start of scan/acquisition - eiger does it before + if((!measurementStarted) && (rc > 0) && (!ithread)) + startFrameIndices(ithread); +*/ //reset packetcount = (packetsPerFrame/numListeningThreads) * numJobsPerThread;