From b7bc8fd8e520db64cf6c7388655a22f2e952ddd9 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Tue, 28 Jan 2014 15:20:03 +0000 Subject: [PATCH] changes made for compression- works only for moench with 1 thread git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@720 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsReceiver/slsReceiverFunctionList.h | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h index d82d05d78..d8879c0cc 100644 --- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h +++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h @@ -18,6 +18,7 @@ #ifdef MYROOT1 #include +#include #endif @@ -246,6 +247,12 @@ private: */ int setupWriter(); + /** + * Creates new tree and file for compression + *\returns OK for succces or FAIL for failure + */ + int createCompressionFile(); + /** * Creates new file *\returns OK for succces or FAIL for failure @@ -447,8 +454,7 @@ private: /** total frame count the listening thread has listened to */ int totalListeningFrameCount; - /** 0 if receiver is idle, 1 otherwise */ - int running; + @@ -483,11 +489,6 @@ private: int iFrame; -#ifdef MYROOT1 - /** Tree where the hits are stored */ - TTree *myTree; -#endif - /** callback arguments are filepath @@ -533,12 +534,24 @@ private: public: + +#ifdef MYROOT1 + /** Tree where the hits are stored */ + static TTree *myTree; + + /** File where the tree is saved */ + static TFile *myFile; +#endif + + /** File Descriptor */ static FILE *sfilefd; /** if the receiver threads are running*/ static int receiver_threads_running; + /** 0 if receiver is idle, 1 otherwise */ + static int running; /** callback arguments are