From e5a7d834dba3672de5fccc72a2626a3ca3ca699e Mon Sep 17 00:00:00 2001 From: bergamaschi Date: Wed, 10 Oct 2012 08:50:02 +0000 Subject: [PATCH] detectorData now properly instantiated git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@289 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp index 224016050..6ad68490c 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp @@ -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;