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

detectorData now properly instantiated

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@289 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi 2012-10-10 08:50:02 +00:00
parent b75b09cc7b
commit e5a7d834db
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -99,7 +99,7 @@ void postProcessing::processFrame(int *myData, int delflag) {
doProcessing(fdata,delflag, fname);
} else
if (dataReady) {
thisData=new detectorData(NULL,fdata,NULL,getCurrentProgress(),(fname+string(".raw")).c_str(),getTotalNumberOfChannels());
thisData=new detectorData(fdata,NULL,NULL,getCurrentProgress(),(fname+string(".raw")).c_str(),getTotalNumberOfChannels());
dataReady(thisData, pCallbackArg);
delete thisData;
fdata=NULL;
@ -208,7 +208,7 @@ void postProcessing::doProcessing(double *lfdata, int delflag, string fname) {
if (dataReady) {
thisData=new detectorData(ang,val,err,getCurrentProgress(),(fname+ext).c_str(),np);
thisData=new detectorData(val,err,ang,getCurrentProgress(),(fname+ext).c_str(),np);
dataReady(thisData, pCallbackArg);
delete thisData;
ang=NULL;