detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-15 20:43:45 +01:00
Code Issues Actions Packages Releases Activity

reshuffling by Anna

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@179 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-05-14 13:39:18 +00:00
parent b484ad7f20
commit b5e966bb58
19 changed files with 528 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@@ -2,8 +2,8 @@
#define POSTPROCESSING_H
#include "sls_detector_defs.h"
#include "detectorData.h"
#include "slsDetectorBase.h"
#include "angularConversion.h"
#include "fileIO.h"
#include <string>
@@ -31,7 +31,9 @@ using namespace std;
(including thread for writing data files and plotting in parallel with the acquisition)
*/
class postProcessing : public angularConversion, public fileIO {
class postProcessing : public angularConversion, public fileIO
//: public virtual angularConversion, public virtual fileIO
{
@@ -48,7 +50,7 @@ class postProcessing : public angularConversion, public fileIO {
\returns 0 if bad channel disabled or no bad channels, >0 otherwise
*/
virtual int getBadChannelCorrection(int *bad=NULL)=0;
/**
get flat field corrections
@@ -232,18 +234,6 @@ s
virtual void incrementProgress()=0;
virtual float getCurrentProgress()=0;
virtual void incrementFileIndex()=0;
virtual int setTotalProgress()=0;
virtual float* decodeData(int *datain, float *fdata=NULL)=0;
virtual int getTotalNumberOfChannels()=0;
virtual int rateCorrect(float*, float*, float*, float*)=0;
virtual int flatFieldCorrect(float*, float*, float*, float*)=0;
@@ -361,6 +351,19 @@ s
float *fdata;
// private:
/* virtual void incrementProgress()=0; */
/* virtual float getCurrentProgress()=0; */
/* virtual void incrementFileIndex()=0; */
/* virtual int setTotalProgress()=0; */
/* virtual float* decodeData(int *datain, float *fdata=NULL)=0; */
/* virtual int getTotalNumberOfChannels()=0; */
};