no change

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@130 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2013-01-08 14:05:49 +00:00
parent c21d674e89
commit 6560a325ce
2 changed files with 4 additions and 4 deletions

View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061" #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061"
//#define SVNREV 0x127 //#define SVNREV 0x129
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x127 #define SVNREV 0x129
#define SVNDATE 0x20121218 #define SVNDATE 0x20121218
// //

View File

@ -766,9 +766,9 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
memcpy(histYAxis[i],histYAxis[i-1],nPixelsX*sizeof(double)); memcpy(histYAxis[i],histYAxis[i-1],nPixelsX*sizeof(double));
//normal data //normal data
if(resetPedestal) if(resetPedestal){
memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double)); memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double));
else{ }else{cout<<"SHOULD NOT BE HERE!!!!!!!!!!!!!"<<endl;
//start adding frames to get to the pedestal value //start adding frames to get to the pedestal value
if(pedestalCount<NUM_PEDESTAL_FRAMES){ if(pedestalCount<NUM_PEDESTAL_FRAMES){
for(unsigned int px=0;px<nPixelsX;px++) for(unsigned int px=0;px<nPixelsX;px++)