detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 05:56:50 +01:00
Code Issues Actions Packages Releases Activity

Bad channels correction separated from postProcessing

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@241 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-09-06 12:03:22 +00:00
parent 6b34cb8e71
commit 6e4be40f37
8 changed files with 98 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@@ -5,6 +5,7 @@
#include "detectorData.h"
#include "slsDetectorBase.h"
#include "angularConversion.h"
#include "badChannelCorrections.h"
#include "fileIO.h"
#include <string>
@@ -20,7 +21,7 @@
using namespace std;
#define MAX_BADCHANS 2000
#define MAX_BADCHANS 20000
#define defaultTDead {170,90,750} /**< should be changed in order to have it separate for the different detector types */
@@ -32,7 +33,7 @@ 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 badChannelCorrections {
//public virtual angularConversion, public virtual fileIO {
@@ -73,8 +74,9 @@ class postProcessing : public angularConversion, public fileIO {
\returns 0 if bad channel disabled, >0 otherwise
*/
virtual int setBadChannelCorrection(string fname="")=0;
static int setBadChannelCorrection(ifstream &infile, int &nbad, int *badlist, int moff=0);
static int setBadChannelCorrection(ifstream &infile, int &nbad, int *badlist, int moff){int retval=readBadChannelCorrectionFile(infile,nbad,badlist); for (int ich=0; ich<nbad; ich++) badlist[ich]=badlist[ich]+moff; return retval;};
/**
set bad channels correction
\param fname file with bad channel list ("" disable)
@@ -244,40 +246,6 @@ s
protected:
int *threadedProcessing;
@@ -287,12 +255,6 @@ s
char *flatFieldDir;
char *flatFieldFile;
char *badChanFile;
int *nBadChans;
int *badChansList;
int *nBadFF;
int *badFFList;
/** mutex to synchronize main and data processing threads */
pthread_mutex_t mp;