From 711cb836c06aaf9f6585101faebbadb13ba6d6af Mon Sep 17 00:00:00 2001 From: x04sa Date: Mon, 29 Apr 2013 21:58:29 +0000 Subject: [PATCH] post processing debugging at the beamline git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@537 951219d9-93cf-4727-9268-0efd64621fa3 --- .../multiSlsDetector/multiSlsDetector.cpp | 11 +++--- .../slsDetector/slsDetector.cpp | 8 +++-- .../slsDetector/slsDetectorUtils.cpp | 5 ++- .../angularConversionStatic.cpp | 18 +++++++--- .../badChannelCorrections.h | 3 +- .../slsDetectorAnalysis/postProcessing.cpp | 24 ++++++++----- .../postProcessingFuncs.cpp | 34 +++++++++++++------ 7 files changed, 69 insertions(+), 34 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index a6c80ade4..9754c7ef1 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -2164,11 +2164,12 @@ int multiSlsDetector::setFlatFieldCorrection(string fname){ int chpm[nm]; int mMask[nm]; for (int i=0; i=0) { strcpy(thisMultiDetector->flatFieldFile,fname.c_str()); @@ -2494,9 +2495,9 @@ int multiSlsDetector::setBadChannelCorrection(string fname){ ret=setBadChannelCorrection(fname, nbad, badlist); -#ifdef VERBOSE + //#ifdef VERBOSE cout << "file contained " << ret << " badchans" << endl; -#endif + //#endif if (ret==0) { thisMultiDetector->correctionMask&=~(1<correctionMask|=(1<nMod[X]*thisDetector->nMod[Y]*thisDetector->nChans*thisDetector->nChips; ichan++) { - corr[ichan]=(ffcoefficients[ichan]*ffcoefficients[ichan])/(fferrors[ichan]*fferrors[ichan]); + // corr[ichan]=(ffcoefficients[ichan]*ffcoefficients[ichan])/(fferrors[ichan]*fferrors[ichan]); + corr[ichan]=ffcoefficients[ichan]; if (ecorr) { - ecorr[ichan]=ffcoefficients[ichan]/fferrors[ichan]; + //ecorr[ichan]=ffcoefficients[ichan]/fferrors[ichan]; + ecorr[ichan]=fferrors[ichan]; } } } diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index 902f3fdb0..0bef94898 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -261,9 +261,12 @@ void slsDetectorUtils::acquire(int delflag){ } pthread_mutex_unlock(&mg); } - +#ifdef VERBOSE + cout << "Acquiring " << endl; +#endif startAndReadAll(); #ifdef VERBOSE + cout << "finished " << endl; cout << "returned! " << endl; #endif diff --git a/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.cpp b/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.cpp index d936c241f..b457bd255 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.cpp @@ -39,9 +39,9 @@ double* angularConversionStatic::convertAngles(double pos, int nch, int *chansPe enc=pos; for (int ip=0; ipchlast) { imod++; p=angOff[imod]; @@ -50,10 +50,12 @@ double* angularConversionStatic::convertAngles(double pos, int nch, int *chansPe else enc=pos; - if (p) +#ifdef VERBOSE + if (p) cout << enc << endl << fo+go << endl << p->r_conversion << endl << p->center << endl << p->offset << endl << p->tilt << angdir << endl; else cout << "no ang conv " << endl; +#endif ch0=chlast+1; nchmod=chansPerMod[imod]; @@ -70,7 +72,9 @@ double* angularConversionStatic::convertAngles(double pos, int nch, int *chansPe p->offset, \ p->tilt, \ angdir ); +#ifdef VERBOSE cout << "ip " << ip << " ch0 " << ch0 << " chlast " << chlast << " imod " << imod << endl; +#endif } return ang; } @@ -208,10 +212,10 @@ int angularConversionStatic::readAngularConversion( ifstream& infile, int nmod, //" module %i center %E +- %E conversion %E +- %E offset %f +- %f \n" while (infile.good() and interrupt==0) { getline(infile,str); - //#ifdef VERBOSE +#ifdef VERBOSE cout << "** mod " << nm << " " ; std::cout<< str << std::endl; - //#endif +#endif istringstream ssstr(str); ssstr >> ss >> mod; ssstr >> ss >> center; @@ -228,7 +232,9 @@ int angularConversionStatic::readAngularConversion( ifstream& infile, int nmod, ssstr >> ss >> er_conv; ssstr >> ss >> off; ssstr >> ss >> eoff; +#ifdef VERBOSE cout << nm << " " << nmod << endl; +#endif if (nm=0 ) { angOff[nm].center=center; angOff[nm].r_conversion=r_conv; @@ -250,7 +256,9 @@ int angularConversionStatic::readAngularConversion( ifstream& infile, int nmod, } else break; +#ifdef VERBOSE cout << nm<<" " << angOff[nm].offset << endl; +#endif nm++; if (nm>=nmod) break; diff --git a/slsDetectorSoftware/slsDetectorAnalysis/badChannelCorrections.h b/slsDetectorSoftware/slsDetectorAnalysis/badChannelCorrections.h index 028363a21..faffe15f3 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/badChannelCorrections.h +++ b/slsDetectorSoftware/slsDetectorAnalysis/badChannelCorrections.h @@ -36,6 +36,7 @@ class badChannelCorrections{ ssstr >> chmax; \ for (ich=chmin; ich<=chmax; ich++) { \ badlist[nbad]=ich; \ + cout << badlist[nbad] << " " << moff << endl; \ nbad++; \ } \ } else { \ @@ -49,7 +50,7 @@ class badChannelCorrections{ static int setBadChannelCorrection(ifstream &infile, int &nbad, int *badlist, int moff){ \ int retval=readBadChannelCorrectionFile(infile,nbad,badlist); \ - for (int ich=0; ichoffset; angCenter[im]=p->center; - +#ifdef VERBOSE cout << im << " " << angCenter[im] << " " << angRad[im] << " " << angOff[im] << endl; - +#endif } diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp index 546f7b575..6eff3db78 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFuncs.cpp @@ -1,7 +1,7 @@ #include "postProcessingFuncs.h" #include "angleConversionConstant.h" -#define VERBOSE +//#define VERBOSE postProcessingFuncs::postProcessingFuncs(int *nModules,int *chPerMod,int modMask[],int badCh[], double ffcoeff[], double fferr[], double* t, int *dir, double angRadius[], double angOffset[], double angCentre[], double* to, double* bs, double *sX, double *sY): nMods(0), chansPerMod(NULL), moduleMask(NULL), badChannelMask(NULL), ffCoeff(NULL), ffErr(NULL), tDead(0), angDir(1), angConv(NULL), totalOffset(0), binSize(0), sampleX(0), sampleY(0), totalChans(0), nBins(0), mp(NULL), mv(NULL), me(NULL), mm(NULL) @@ -89,6 +89,7 @@ int postProcessingFuncs::addFrame(double *data, double *pos, double *I0, double if (ich>chlast) { + // cout << *pos << " " << moduleMask[imod] << endl; imod++; ch0=chlast+1; nchmod=chansPerMod[imod]; @@ -281,7 +282,9 @@ int postProcessingFuncs::initDataset(int *nModules,int *chPerMod,int modMask[],i angConv=new angleConversionConstant*[nMods]; nBins=(int)(360./binSize)+1; } +#ifdef VERBOSE cout << "nBins " << nBins << endl; +#endif for (int im=0; im=0) e=sqrt(datain); else @@ -417,6 +423,8 @@ int postProcessingFuncs::calculateFlatField(int* nModules, int *chPerMod, int *m int nmed=0, im=0; double *xmed; + // cout << "Claculate flat field " << endl; + if (chPerMod==NULL) return -1; // if (moduleMask==NULL) @@ -428,15 +436,18 @@ int postProcessingFuncs::calculateFlatField(int* nModules, int *chPerMod, int *m return -1; + // cout << *nModules << " pp chpm0 " << chPerMod[0] << endl; int totch=0; - for (int im=0; im<*nModules; im++) { + int nm= *nModules; + for (int im=0; im1 && xmed[nmed/2]>0) { -#ifdef VERBOSE - std::cout<< "Flat field median is " << xmed[nmed/2] << " calculated using "<< nmed << " points" << std::endl; -#endif + //#ifdef VERBOSE + // std::cout<< "Flat field median is " << xmed[nmed/2] << " calculated using "<< nmed << " points" << std::endl; + //#endif - + // cout << "checking bad channel mask " << endl; for (int ich=0; ich