101 Commits

Author SHA1 Message Date
Dhanya Thattil
8d6b8d66cc
size of shm needs to be only sometimes checked when opening shared memory (#443) 2022-05-16 12:27:48 +02:00
Dhanya Thattil
0129c2c686
M3: master starts twice (non blocking) part 2 (#445)
* slaves and master vectors empty means all positions included: fixing double acquisition in masters

* debug print out
2022-05-10 15:23:39 +02:00
Dhanya Thattil
f55bdd6eae
M3: master starts twice (non blocking) (#444)
* start acq for master m3 was sent twice (non blocking), removed redundant code, check that there is only one master

* m3 can have more than 1 master (when many master modules used independently)

* fix for singe mod m3 or other dets
2022-05-10 14:27:40 +02:00
Dhanya Thattil
afeee5501c
Fixpositions (#436)
* fix positions on server side

* wip

* numports wip

* wip

* jungfrau top inner interface row increment

* x, y detpos, wip

* removed eiger row indices flipping in gui (bottom flipping maintained)

* wip

* wip, jungfrau numinterfaces2

* jungfrau virtual works

* eiger, jungfrau, g2 virtual server works

* eiger positions fix, wip

* binaries in

* minor printout

* binaries in

* pointer bug

* comment to define test_mod_geometry define
2022-04-28 16:32:26 +02:00
61f38bf5a9 clearer error message for unknown detector type when hostname error 2022-04-04 13:10:27 +02:00
Erik Fröjdh
e55e18d5e9
Refactoring of SharedMemory.h (#418)
Function names match Detector.h
Removed double print due to LOG then throw
file descriptor not kept as a member variable
2022-03-28 16:13:56 +02:00
Erik Fröjdh
1ff35edb99
Setting dac names for CTB (C++ and Python) (#413)
# Setting DAC names for CTB
* Introduced new shared memory for CTB only
* Prepared for additional functionality 
* Works from C++ and Python

Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2022-03-28 14:27:47 +02:00
9ff43efdc5 Merge branch 'developer' into numudp 2022-03-25 10:50:51 +01:00
Dhanya Thattil
2a1f6dc544
Merge pull request #371 from slsdetectorgroup/g225gui
Gotthard25um: gui image
2022-03-23 12:06:27 +01:00
2b35101b17 moved shm numUdpInterfaces initialization up front, moved updating this value in DetectorImpl::setHostname to DetectorImpl::addModule for more readability, renamed getNumberofUdpInterfaces to an updateNumberofUdpInterfaces as the shm was being updated and is used only in setHostname, everywhere else getNumberofUdpInterfaces is replaced by getNumberofUdpInterfacesFromShm 2022-03-22 10:23:22 +01:00
a1ee681135 - framescaught and frameindex now returns a vector for each port
- progress looks at activated or enabled ports, so progress does not stagnate
- (eiger) disable datastreaming also for virtual servers only for 10g
- missing packets also takes care of disabled ports
2022-02-24 11:15:03 +01:00
753387c34c gotthard type can only have max 2 modules 2022-02-04 13:29:42 +01:00
753cbbd18c gui doesnt need to multply to get port geometry for number of interfaces, previously worked as bool was used instead of int for numInterfaces in DetectorImpl:readframefromreceiver 2022-01-18 17:10:12 +01:00
c15131f8f6 fixed eiger bottom port now shows, because number of udp interfaces for eiger was set by default to get zmq port, has to be calcualted again now 2022-01-13 16:39:17 +01:00
182e5fdadb missing one line 2022-01-07 12:55:40 +01:00
79affe1ea4 updated client and rxr, not tested 2022-01-06 18:46:14 +01:00
904af4de06 fix to allowing update mode functions in update mode and removing exception about set_position for hostname in update mode 2021-11-16 09:55:29 +01:00
5190e2ab30 refactoring 2021-11-10 15:56:01 +01:00
db88f67cda unknown function enum error proper print 2021-11-09 15:37:12 +01:00
90b9b57865 bugfix 2021-11-09 09:49:21 +01:00
7b4f8c118b client done 2021-11-08 14:26:53 +01:00
d438b53c68 wip 2021-11-04 19:18:10 +01:00
6e49b77b08 updating kernel like program fpga, execute command to print which module failed, unlinking temporary file while programming bug fix 2021-11-03 17:17:24 +01:00
b39c64032d clang format 2021-10-19 14:49:43 +02:00
dac60ad76d added .cpp licenses 2021-10-15 15:47:04 +02:00
c2202a97e1 minor fix 2021-09-17 11:00:40 +02:00
732270f437 renaming sls and detectors to modules, multis to detector 2021-09-15 14:53:31 +02:00
0f8869153e works for niosg 2021-09-14 10:30:04 +02:00
bd5f85cdff wip 2021-09-10 16:05:27 +02:00
88c8f05387 wip 2021-09-10 16:05:00 +02:00
b8086dcd70 fix for flash 2021-09-10 13:25:17 +02:00
a9f82985bc programs, but flashes checksum wrong 2021-09-09 17:52:36 +02:00
c6af0d34fb wip 2021-09-08 18:28:40 +02:00
b7f694142a replaced md5 in client 2021-09-07 14:10:50 +02:00
441fb8064f wip 2021-09-06 15:20:34 +02:00
e1ed49a843 wip 2021-09-03 17:34:55 +02:00
f1b31100db wip 2021-09-03 17:34:28 +02:00
a718d69368 wip 2021-09-03 17:29:27 +02:00
bb6abe4e93 wip 2021-09-03 15:48:36 +02:00
ecf38d6110 wip 2021-09-03 15:32:01 +02:00
8c02b6636d wip 2021-09-03 15:31:49 +02:00
d6d1d60800 wip 2021-09-03 15:26:13 +02:00
2eba0c9d74 wip 2021-09-03 15:24:59 +02:00
c5826e905b wip 2021-09-03 15:24:33 +02:00
f3744a10c6 wip 2021-09-03 15:22:41 +02:00
bd895148ea wip 2021-09-03 15:18:46 +02:00
c3a26fdcaf wip 2021-09-03 15:15:39 +02:00
8c527bcc0d wip 2021-09-03 14:55:06 +02:00
8e58d1907d wip 2021-09-03 14:49:42 +02:00
8cc0804f99 wip 2021-09-03 14:43:31 +02:00