Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

XiaDxp
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

54f3bba4

Commit 54f3bba4 authored 5 months ago by Patrick MADELA

Downloads
- Plain Diff

Merge branch 'main' of...

Merge branch 'main' of gitlab.synchrotron-soleil.fr:software-control-system/tango-devices/acquisition/1d/xiadxp

parents 5c0f5fa5 2e536932

No related branches found

No related tags found

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

conanfile.py 1 addition, 1 deletion

conanfile.py
pom.xml 1 addition, 1 deletion

pom.xml
src/AcquisitionMca.cpp 12 additions, 10 deletions

src/AcquisitionMca.cpp
src/AcquisitionMca.h 3 additions, 3 deletions

src/AcquisitionMca.h
src/Controller.cpp 13 additions, 8 deletions

src/Controller.cpp
src/Controller.h 1 addition, 1 deletion

src/Controller.h
src/DataStore.cpp 11 additions, 6 deletions

src/DataStore.cpp
src/DataStore.h 2 additions, 2 deletions

src/DataStore.h
src/XiaDxpClass.cpp 1 addition, 1 deletion

src/XiaDxpClass.cpp
test/test_xiadxp_load.py 21 additions, 20 deletions

test/test_xiadxp_load.py

with 66 additions and 53 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

The place to be for your source code