detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-18 15:57:13 +02:00
Code Issues Actions Packages Releases Activity

gotthard compression works.. but no short frames

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@737 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-02-18 16:35:52 +00:00
parent 45a93e827f
commit 1b88f322b3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

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