detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-09 11:30:43 +02:00
Code Issues Actions Packages Releases Activity

not necessary merge

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-04-15 14:48:27 +02:00
parent 6b38ad10d1
commit 83a766914f
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorCalibration/slsDetectorData.h
View File

@ -211,8 +211,6 @@ class slsDetectorData {
/** /**
<<<<<<< HEAD
Returns the value of the selected channel for the given dataset. Virtual function, can be overloaded. Returns the value of the selected channel for the given dataset. Virtual function, can be overloaded.
\param data pointer to the dataset (including headers etc) \param data pointer to the dataset (including headers etc)
\param ix pixel number in the x direction \param ix pixel number in the x direction
@ -263,9 +261,6 @@ class slsDetectorData {
}; };
/** /**
=======
>>>>>>> b3dac953736499019603c2201df6e7eb45cc890c
Returns the value of the selected channel for the given dataset as double. Returns the value of the selected channel for the given dataset as double.
\param data pointer to the dataset (including headers etc) \param data pointer to the dataset (including headers etc)
\param ix pixel number in the x direction \param ix pixel number in the x direction