detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-20 00:37:12 +02:00
Code Issues Actions Packages Releases Activity
5,764 Commits 46 Branches 102 Tags
71a68c20228cd641487ce209a37003c49c01cd5c
Commit Graph

5764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
l_maliakal_d
6b935f3bd2 included exitReceiver, using different threads to listen and write packets in receiver, edited circularfifo to use pointer references, and acquire returns frames caught 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@362 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-30 09:28:52 +00:00
l_maliakal_d
d8af12456d receiver does the flipping and processing before sending client the correct frame to display 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@361 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-26 15:33:53 +00:00
l_cartier
997ffec2ee git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@360 951219d9-93cf-4727-9268-0efd64621fa3 2012-11-23 16:30:49 +00:00
l_maliakal_d
d0d7eac553 fixed gui expecting more databytes from receiver, cuz of probes changing databytes 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@359 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-23 16:15:26 +00:00
l_mozzanica
5236aa7cce added some includes for genericSocket.h x86_64 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@358 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-23 13:54:12 +00:00
l_maliakal_d
a781ca3422 edited generic socket for udp socket, prob:gap in files when using smaller buffers 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@357 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-22 13:55:37 +00:00
l_maliakal_d
c02075dc12 included a short filename for receiver for sebastian, which has a frameindex incrementing by 1 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@356 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-22 12:45:42 +00:00
l_maliakal_d
6a74fda3ed modified receiver to save a simpler file name for sebastian, set receiver port modified 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@355 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-22 10:25:42 +00:00
bergamaschi
2580c29886 makefile again 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@354 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-22 08:29:29 +00:00
bergamaschi
6ffe7ff229 makefile changed 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@353 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-21 09:01:14 +00:00
l_maliakal_d
a86141a608 changed dataport to receiver port 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@352 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-21 08:27:12 +00:00
l_maliakal_d
ffd392c7eb fixed changing ports inreceiver, included receiver config file 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@351 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-20 16:50:36 +00:00
l_maliakal_d
97ed3e8872 made udp socket in receiver use generic socket, included a incrememnt frame index in acquire before a break, got rid of infinite loop for unmatched index in receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@350 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-19 16:29:17 +00:00
l_maliakal_d
1b7c42540a included receiver defs in doxy 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@349 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-19 13:01:26 +00:00
l_maliakal_d
af3abff8dd converted receiver to c++, edited generic socket to include differentclients 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@348 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-19 12:44:17 +00:00
l_maliakal_d
3c94d2cb40 converted to c++ 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@347 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-19 12:41:35 +00:00
l_maliakal_d
58623dcd34 fixed file index problem 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@346 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-15 13:54:02 +00:00
l_maliakal_d
e4e46920cd fixed frames from receiver to flip accordingly, also display frame index as not visible from filename 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@345 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-15 11:19:50 +00:00
l_maliakal_d
89ddfa9b51 fixed the problem with multiple frame scan, frame index and file index included in gui 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@344 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-14 13:43:42 +00:00
bergamaschi
e0a1e4ab36 warnings fixed 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@343 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-14 11:37:06 +00:00
bergamaschi
09982d84f2 asm includes universally found 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@342 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-14 10:08:03 +00:00
l_maliakal_d
f6ff1359aa implemented server to have a phase shift input 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@341 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-13 12:31:41 +00:00
bergamaschi
d944ee5372 generic socket updated 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@340 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-13 12:28:13 +00:00
l_maliakal_d
dc94fc3c97 receiver-read frame in right order, cleaned fileio, config file-include extsig and vhighvoltage 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@339 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-13 10:21:22 +00:00
l_maliakal_d
bf7da5f493 closeDataFile is only for gotthard and included lock for socket while using receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@338 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-13 08:38:18 +00:00
l_maliakal_d
8f7872d056 gotthard receiver works so far without cpu file write and tcp generic socket lock 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@337 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-12 15:48:28 +00:00
l_maliakal_d
6ee21ba810 included progresscallback to use in the gui to get the progress for receivers 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@336 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-08 08:28:51 +00:00
l_maliakal_d
33fa69d546 configuremac doesnt return a retval, separated setdaqregister and clean fifo, included clean fifo before startstatemachine, set delay and gates to 0 at start of server 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@335 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-08 08:21:33 +00:00
l_maliakal_d
3cc914a8fb moved configuremac to receiverip and change the config file writing to have the correct order 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@334 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-08 08:18:01 +00:00
bergamaschi
fa9449e447 genericSocket implemented with also send/receive functions, possibility to select the binding network interface for the server and utilities to get the interface name, ip or mac 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@333 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-05 14:25:14 +00:00
bergamaschi
50beac1f8a defined generic socket class for both TCP and UDP, inherited by MySocketTCP - send receive funcs should still be implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@332 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-31 11:56:01 +00:00
bergamaschi
3f1780f71b circular fifo from the web added to the svn 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@331 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-31 09:45:59 +00:00
bergamaschi
96d08d61d0 frame index in file name, increments instead of file index for real time acquisitions 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@330 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-30 15:52:40 +00:00
l_maliakal_d
2f9dea8341 forgot to add slsREceiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@329 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-30 14:30:57 +00:00
l_maliakal_d
2338de4054 added receiver in here 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@328 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-30 10:06:58 +00:00
l_maliakal_d
007995a5ec changed the default of incrememnt progress to 1 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@327 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-30 10:04:05 +00:00
l_maliakal_d
b29d8d33f0 got rif of unnnecessary couts for receiver part in processing 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@326 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 17:02:42 +00:00
l_maliakal_d
439c2b1de8 got rid of client telling detector that receiver is down each time it doesnt work 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@325 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 17:01:59 +00:00
l_maliakal_d
f37cd6640f acquire works with receiver now 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@324 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 17:00:53 +00:00
l_maliakal_d
30e6c810a8 put some printf in verbose mode 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@323 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 13:49:41 +00:00
l_maliakal_d
7cd1f9138e frame index updated for receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@322 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 13:48:56 +00:00
l_maliakal_d
69d08ac546 frame index updated for receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@321 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 13:46:22 +00:00
l_maliakal_d
e94677cbf5 frame index updated for receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@320 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 13:46:04 +00:00
l_maliakal_d
1f69778a6f frame index updated for receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@319 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 13:45:22 +00:00
l_maliakal_d
5d50fa8e00 frame index updated for receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@318 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 13:44:57 +00:00
l_maliakal_d
b7dd317c08 frame index updated for receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@317 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 13:44:07 +00:00
l_maliakal_d
db249237c9 fixed error with cleaning fifo 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@316 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-26 10:21:09 +00:00
l_maliakal_d
8387f70071 doxygen for slsReceiver and slsReceiverInterface 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@315 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-26 09:38:54 +00:00
l_maliakal_d
83775bd7f3 separated slsReceiverInterface from slsDetector 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@314 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-26 08:59:04 +00:00
l_maliakal_d
4dcad48ecb separated slsReceiverInterface from slsDetector 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@313 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-26 08:58:26 +00:00