detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 22:40:02 +02:00
Code Issues Actions Packages Releases Activity
4,935 Commits 44 Branches 100 Tags
Commit Graph

4935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gemma Tinti
0c6304bdf8 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-06-06 17:53:52 +02:00
Gemma Tinti
2eaf7edd46 manual 2019-06-06 17:53:45 +02:00
Erik Frojdh
c86a1e7d48 WIP 2019-06-06 17:00:05 +02:00
Dhanya Thattil
bb760f3210 WIP datatoutput 2019-06-06 15:04:05 +02:00
Erik Frojdh
fc5306f7cc Merge branch 'sockettest' into developer 2019-06-06 10:37:11 +02:00
Erik Frojdh
3cfeb74529 minor 2019-06-06 10:36:40 +02:00
Erik Frojdh
5944957977 cleaning up socket 2019-06-06 10:34:57 +02:00
Erik Frojdh
7a11c6c986 hash 2019-06-06 08:51:46 +02:00
Erik Frojdh
2c7d78ff56 include 2019-06-06 08:46:11 +02:00
Erik Frojdh
c4ea181811 test 2019-06-06 08:41:50 +02:00
Erik Frojdh
45dc48721e server 2019-06-06 08:41:19 +02:00
Erik Frojdh
72e0d7e168 clang format on receiver TCP and Implementation 2019-06-06 08:07:40 +02:00
Dhanya Thattil
e4546c6121 WIP 2019-06-05 17:54:56 +02:00
Erik Frojdh
e46f3f9a2c WIP 2019-06-05 17:45:02 +02:00
Erik Frojdh
6c64bdb04a fixing tests for gcc 4.8 2019-06-05 17:40:48 +02:00
Erik Frojdh
03f8b389ad WIP 2019-06-05 17:30:21 +02:00
Erik Frojdh
3d6404952a fix sending 2019-06-05 15:51:21 +02:00
Erik Frojdh
b5e4d7d8fb fixed reading and double print in client 2019-06-05 15:40:28 +02:00
Erik Frojdh
8cf94537c8 minor 2019-06-05 15:29:12 +02:00
Erik Fröjdh
1db7521cfa exceptions TCP (#31) 
* WIP

* first test

* format

* test frames

* also 0:

* WIP

* WIP

* first test

* format

* test frames

* also 0:

* test and less local

* pass ret by value

* level

* WIP

* WIP

* cleaning up interface

* removed ref

* another

* updated api version

* cleanup

* cleanup

* WIP

* fixes

* fixed tests
 2019-06-05 15:25:18 +02:00
Dhanya Thattil
862dc824ba WIP 2019-06-05 11:27:19 +02:00
Dhanya Thattil
ff3e5001e6 Merge branch 'developer' into gui 2019-06-04 18:12:41 +02:00
Dhanya Thattil
a6144f658e ctb client and server bug fix: dac didnt compute indices correctly and set dac was not printing in server 2019-06-04 18:11:31 +02:00
Dhanya Thattil
ffbc0a0fc3 Merge branch 'developer' into gui 2019-06-04 12:18:20 +02:00
Dhanya Thattil
3aea917175 updated binaries for the extsig api change 2019-06-04 12:18:06 +02:00
Dhanya Thattil
b74ce95b24 removed colon in commands. affects dac, adc and extsig 2019-06-04 12:10:26 +02:00
Dhanya Thattil
d076be8887 WIP 2019-06-04 10:27:23 +02:00
Anna Bergamaschi
1a2e252665 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-06-04 08:48:58 +02:00
Dhanya Thattil
70ea143dcb Merge branch 'developer' into gui 2019-06-03 18:16:56 +02:00
Dhanya Thattil
7a9745e2da fixed typo in command, bsamples to dsamples 2019-06-03 18:14:23 +02:00
Anna Bergamaschi
e8296da064 enableall ADC fixed 2019-06-03 18:01:57 +02:00
Anna Bergamaschi
b7d81b1e87 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-06-03 17:42:57 +02:00
Anna Bergamaschi
3baa4b8ab1 trying to fix ctbGui bugs 2019-06-03 17:42:43 +02:00
Dhanya Thattil
17f745b45d ctb server: simulator effects, increased fpga reset time from 1 to 2 seconds 2019-06-03 17:22:59 +02:00
Dhanya Thattil
e7c164fb24 Merge branch 'developer' into gui 2019-06-03 11:13:03 +02:00
Dhanya Thattil
29141ac1a6
set starting frame number of next acquisition for both jungfrau and e… (#27) 
* set starting frame number of next acquisition for both jungfrau and eiger. firmware has not implemented a get, so workaround. tests included. frame number 0 not allowed due to Eiger. Eiger max frame is 48 bit, while jungfrau is 64 bit

* made argument of setstartingframenumber const
 2019-06-03 11:07:53 +02:00
Dhanya Thattil
894cc1c9e0
Simulator (#28) 
* WIP

* wip

* wip

* removed loop

* sending 1 frame

* send multiple frames

* c11 for server

* WIP

* WIP

* Add CMake for the simulators. Requires some refactoring to make slsDetectorServer a proper library.

* Working cmake for jungfrau

* Working cmake for eiger

* WIP

* WIP

* Add preliminary working eiger simulator and breaks the jungfrau simulator

* virtual servers connected

* changes to make it work for rhel7 and install binaries in bin

* removed some unnecessary prints

* removed binaries and virtual makefiles
 2019-06-03 10:16:54 +02:00
Dhanya Thattil
073d06f143 removed unnecessary print that might have been used for debugging 2019-06-03 08:59:54 +02:00
Erik Fröjdh
4b1a9bea32 Integration tests for the command line (#26) 
* WIP

* first test

* format

* test frames

* also 0:
 2019-05-31 14:40:45 +02:00
Anna Bergamaschi
0eec57f8a2 Corrected ctb Makefiles to work with bad bashrc 2019-05-29 16:44:02 +02:00
Anna Bergamaschi
4a112d7889 Added deserializer and moench04 map to ctbGui 2019-05-29 15:48:22 +02:00
Anna Bergamaschi
c90a7b0e8a Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-05-29 11:39:14 +02:00
Anna Bergamaschi
25541b37f6 added patternGenerator and slsDteectorCalibration directory in order to compile the ctbGui 2019-05-29 11:38:43 +02:00
Erik Frojdh
d935e78763 clang-format 2019-05-28 18:15:43 +02:00
Erik Frojdh
0f869e1215 fixed acquire not working 2019-05-28 18:15:15 +02:00
Erik Fröjdh
788ad8d3b6 Command proxy (#25) 
* added cmd proxy

* minor

* minor

* WIP

* clean up

* added comment
 2019-05-28 18:01:26 +02:00
Anna Bergamaschi
a008c2b2c8 added ctbGui 2019-05-28 17:15:59 +02:00
Erik Frojdh
85d4dfc7c8 Merge branch 'socket' into developer 2019-05-28 17:11:29 +02:00
Erik Frojdh
aa2bcfa308 fixed setup udp 2019-05-28 17:07:34 +02:00
Dhanya Thattil
f7aedf7711 client bug fix: typo in command line, get returned rx_udpip instead of rx_udpip2, same with mac jungfrau_draft_2.0 2019-05-28 16:56:15 +02:00