Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-pilatus
Commits
4245cfbe
Commit
4245cfbe
authored
Aug 30, 2018
by
Samuel Debionne
Browse files
Merge branch '16-generate-conda-packages' into 'master'
16 generate conda packages See merge request
!4
parents
0a26b61f
7688e5ca
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
4245cfbe
...
...
@@ -23,8 +23,6 @@
############################################################################
set
(
NAME
"pilatus"
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"-Wl,--add-needed"
)
set
(
${
NAME
}
_srcs src/PilatusCamera.cpp src/PilatusInterface.cpp
src/PilatusSaving.cpp
)
...
...
@@ -36,10 +34,9 @@ target_include_directories(lima${NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inclu
#LIBRARIES
find_library
(
PILATUS_CBF_LIB cbf
)
if
(
"
${
PILATUS_CBF_LIB
}
"
STREQUAL
"PILATUS_CBF_LIB-NOTFOUND"
)
message
(
FATAL_ERROR
"
${
NAME
}
:
libcbf
not found, you can search it in cmake-gui or try to install it if it isn't here."
)
message
(
FATAL_ERROR
"
${
NAME
}
:
CBF library
not found, you can search it in cmake-gui or try to install it if it isn't here."
)
endif
()
target_link_libraries
(
lima
${
NAME
}
limacore
)
target_link_libraries
(
lima
${
NAME
}
${
PILATUS_CBF_LIB
}
)
...
...
doc/index.rst
View file @
4245cfbe
...
...
@@ -81,7 +81,7 @@ This is a python code example for a simple test:
.. code-block:: python
from Lima import Pilatus
from
l
ima import Core
from
L
ima import Core
cam = Pilatus.Camera()
hwint = Pilatus.Interface(cam)
...
...
@@ -109,7 +109,7 @@ This is a python code example for a simple test:
# now ask for 2 sec. exposure and 10 frames
acq.setAcqExpoTime(2)
acq.set
NbImag
es(10)
acq.set
AcqNbFram
es(10)
ct.prepareAcq()
ct.startAcq()
...
...
include/PilatusCamera.h
View file @
4245cfbe
...
...
@@ -137,7 +137,7 @@ public:
bool
hasHighVoltageReset
();
void
resetHighVoltage
(
unsigned
int
sleeptime
=
1
);
private:
static
const
double
TIME_OUT
=
10.
;
static
const
expr
double
TIME_OUT
=
10.
;
enum
HIGH_VOLTAGE
{
NOT_INITIALIZED
,
HAS_HIGH_VOLTAGE
,
DONT_HAVE_HIGH_VOLTAGE
};
...
...
src/PilatusSaving.cpp
View file @
4245cfbe
...
...
@@ -19,8 +19,8 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#include <cbf/cbf.h>
#include <cbf/cbf_simple.h>
#include <cbf
lib
/cbf.h>
#include <cbf
lib
/cbf_simple.h>
#include "PilatusSaving.h"
#include "PilatusCamera.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment