mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-12 04:47:14 +02:00
fixed merge
This commit is contained in:
@ -16,7 +16,7 @@
|
||||
#include <fstream>
|
||||
#include "moench02ModuleData.h"
|
||||
#include "moenchCommonMode.h"
|
||||
#define MYROOT1
|
||||
|
||||
#include "singlePhotonDetector.h"
|
||||
|
||||
//#include "MovingStat.h"
|
||||
@ -27,7 +27,8 @@ using namespace std;
|
||||
#define NR 160
|
||||
|
||||
|
||||
//#define MY_DEBUG 1
|
||||
#define MY_DEBUG 1
|
||||
|
||||
#ifdef MY_DEBUG
|
||||
#include <TCanvas.h>
|
||||
#endif
|
||||
@ -216,7 +217,7 @@ THStack *moenchReadData(char *fformat, char *tit, int runmin, int runmax, int nb
|
||||
#endif
|
||||
nf++;
|
||||
|
||||
cout << "=" << decoder->getFrameNumber(buff);
|
||||
cout << "=" ;
|
||||
delete [] buff;
|
||||
}
|
||||
cout << nph << endl;
|
||||
|
@ -92,23 +92,7 @@ class slsDetectorData {
|
||||
|
||||
|
||||
void setDataMap(int **dMap=NULL) {
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
if (dMap==NULL) {
|
||||
for (int iy=0; iy<ny; iy++)
|
||||
for (int ix=0; ix<nx; ix++)
|
||||
dataMap[iy][ix]=(iy*nx+ix)*sizeof(dataType);
|
||||
} else {
|
||||
cout << "set dmap "<< dataMap << " " << dMap << endl;
|
||||
for (int iy=0; iy<ny; iy++)
|
||||
for (int ix=0; ix<nx; ix++) {
|
||||
dataMap[iy][ix]=dMap[iy][ix];
|
||||
//cout << ix << " " << iy << endl;
|
||||
}
|
||||
}
|
||||
|
||||
=======
|
||||
int ip;
|
||||
|
||||
if (dMap==NULL) {
|
||||
@ -129,7 +113,7 @@ class slsDetectorData {
|
||||
}
|
||||
}
|
||||
// cout << "nx:" <<nx << " ny:" << ny << endl;
|
||||
>>>>>>> 844c207d55aa5279626c496c677446de61103a30
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user