From 1b88f322b30924ccac8a5382ada48b02567b069c Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Tue, 18 Feb 2014 16:35:52 +0000
Subject: [PATCH] gotthard compression works.. but no short frames

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@737 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsReceiver/slsReceiverFunctionList.cpp               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
index 100eeb4ad..b22804ed9 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
@@ -267,8 +267,8 @@ int slsReceiverFunctionList::setShortFrame(int i){
 	onePacketSize = bufferSize/packetsPerFrame;
 
 	/** done only in the case that compression can be chosen only at the beginn of program exe */
-	if(dataCompression)
-		setupFilter();
+	/*if(dataCompression)
+		setupFilter();*/
 
 	return shortFrame;
 }
@@ -712,7 +712,7 @@ int slsReceiverFunctionList::createCompressionFile(int ithr, int iframe){
 		//resets the pedestalSubtraction array and the commonModeSubtraction
 		singlePhotonDet[ithr]->newDataSet();
 		if(myFile[ithr]==NULL){
-			cout<<"file not null"<<endl;
+			cout<<"file null"<<endl;
 			return FAIL;
 		}
 		if(!myFile[ithr]->IsOpen()){
@@ -819,7 +819,7 @@ void slsReceiverFunctionList::closeFile(int ithr){
 			//close file
 			if(myTree[ithr] && myFile[ithr])
 				myFile[ithr] = myTree[ithr]->GetCurrentFile();
-			if(myFile[ithr])
+			if(myFile[ithr] != NULL)
 				myFile[ithr]->Close();
 			myFile[ithr] = NULL;
 			myTree[ithr] = NULL;