detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-20 16:48:01 +02:00
Code Issues Actions Packages Releases Activity

fixed merge

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-05-28 14:46:46 +02:00
parent 88ec090ee6
commit 7046d2ad6e
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorCalibration/slsDetectorData.h
View File

@ -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
};