diff --git a/slsDetectorGui/include/svnInfoGui.h b/slsDetectorGui/include/svnInfoGui.h index a5a7f1b3a..4926df9f5 100644 --- a/slsDetectorGui/include/svnInfoGui.h +++ b/slsDetectorGui/include/svnInfoGui.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui" //#define SVNREPPATH "" #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061" -//#define SVNREV 0x127 +//#define SVNREV 0x129 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x127 +#define SVNREV 0x129 #define SVNDATE 0x20121218 // diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index f16f4d110..4c0f49fdb 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -766,9 +766,9 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){ memcpy(histYAxis[i],histYAxis[i-1],nPixelsX*sizeof(double)); //normal data - if(resetPedestal) + if(resetPedestal){ memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double)); - else{ + }else{cout<<"SHOULD NOT BE HERE!!!!!!!!!!!!!"<