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

WIP

Browse Source
This commit is contained in:
Erik Frojdh 2020-02-13 12:18:53 +01:00
parent 7b7641fb53
commit fbb901c8cc
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conda-recepie/meta.yaml
View File

@ -8,6 +8,7 @@ source:
build: build:
number: 1 number: 1
binary_relocation: True
rpaths: rpaths:
- lib/ - lib/
@ -71,12 +72,16 @@ outputs:
requirements: requirements:
build: build:
- {{ compiler('c') }}
- {{compiler('cxx')}}
- python - python
- {{ pin_subpackage('slsdetlib', exact=True) }} - {{ pin_subpackage('slsdetlib', exact=True) }}
- setuptools - setuptools
run: run:
- libstdcxx-ng
- libgcc-ng
- python - python
- numpy - numpy
- {{ pin_subpackage('slsdetlib', exact=True) }} - {{ pin_subpackage('slsdetlib', exact=True) }}

2
python/src/detector.cpp
View File

@ -610,6 +610,8 @@ void init_det(py::module &m) {
py::arg() = Positions{}) py::arg() = Positions{})
.def("writeAdcRegister", &Detector::writeAdcRegister, py::arg(), .def("writeAdcRegister", &Detector::writeAdcRegister, py::arg(),
py::arg(), py::arg() = Positions{}) py::arg(), py::arg() = Positions{})
.def("getInitialChecks", &Detector::getInitialChecks)
.def("setInitialChecks", &Detector::setInitialChecks, py::arg())
.def("getControlPort", &Detector::getControlPort, .def("getControlPort", &Detector::getControlPort,
py::arg() = Positions{}) py::arg() = Positions{})
.def("setControlPort", &Detector::setControlPort, py::arg(), .def("setControlPort", &Detector::setControlPort, py::arg(),