l_maliakal_d
|
c8535a15a8
|
updated svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@550 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-15 13:26:48 +00:00 |
|
l_maliakal_d
|
1eae11a87a
|
fixed the undefined state of gui when acquisition stopped
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@545 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-07 14:20:01 +00:00 |
|
l_msdetect
|
1ed4017988
|
moench great stuff
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@541 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-06 14:17:09 +00:00 |
|
l_msdetect
|
9c2c76237f
|
moench gui stuff
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@540 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-06 13:46:28 +00:00 |
|
l_msdetect
|
ebba783dac
|
moench gui stuff
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@539 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-06 13:08:24 +00:00 |
|
l_maliakal_d
|
60f7fc9f84
|
moench receiver with packet index for each frame
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@534 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-26 15:43:09 +00:00 |
|
l_maliakal_d
|
ded2a4de5c
|
moench receiver orders packets to frames
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@533 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-26 15:23:45 +00:00 |
|
l_maliakal_d
|
8c3e7f6160
|
giving priority to command line than config files for receivers, introducing variable to check moench receiver with gotthard detector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@532 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-26 12:43:07 +00:00 |
|
l_maliakal_d
|
6ca969e08f
|
basic moench receiver runs with gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@521 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-25 09:36:00 +00:00 |
|
l_maliakal_d
|
82ce92e990
|
edited moench receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@520 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-19 14:42:33 +00:00 |
|
l_maliakal_d
|
5ab6d9076d
|
the memcpy wasnt incremementing in receiver.
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@519 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-18 13:38:21 +00:00 |
|
l_maliakal_d
|
cec069f0e9
|
moench receiver works well now since we increased the memory allocation
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@513 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-15 13:07:53 +00:00 |
|
l_maliakal_d
|
c9cef8c12f
|
moench receiver works most of the time
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@512 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-12 15:51:33 +00:00 |
|
l_maliakal_d
|
27c91c36ff
|
moench client and receiver works with gotthard module, without gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@511 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-12 12:54:36 +00:00 |
|
l_maliakal_d
|
778cd97317
|
started the basics for sending every nth frame from receiver to gui.incomplete and will be implemented later
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@506 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-11 12:00:44 +00:00 |
|
l_maliakal_d
|
02376bbc62
|
reducing changes of segmentation for null string, syntax of receiver call backs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@505 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-04-10 13:34:10 +00:00 |
|
l_maliakal_d
|
1882454cf3
|
udpip and hostname order for write config,receiver returns quicker when no data or mismatched indices
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@491 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-13 15:34:53 +00:00 |
|
l_maliakal_d
|
bb5ae3d2ab
|
guiDataReady introduced so that both tcp and writing thread handshakes properly with their own variables
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@486 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-07 16:49:47 +00:00 |
|
l_maliakal_d
|
91e5e35c73
|
got rid of short file name
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@485 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-07 10:45:33 +00:00 |
|
bergamaschi
|
b44cc16cff
|
Added startAcquisition, acquisitionFinished and rawDataReady callbacks to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@480 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-05 15:34:19 +00:00 |
|
l_maliakal_d
|
7a55ed9a74
|
frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-05 11:23:46 +00:00 |
|
bergamaschi
|
247e84ba7b
|
Modifications for circular FIFO and memory leak corrected done during beamtime - to be tested
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@447 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-04 10:13:48 +00:00 |
|
l_maliakal_d
|
341e026f4e
|
shortframes work with gui enabled
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@445 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-31 11:13:21 +00:00 |
|
l_maliakal_d
|
22bd638f64
|
the gotthard receiver works for short frames, gui commented out for now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@444 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-30 16:41:36 +00:00 |
|
l_maliakal_d
|
a2ae2eea95
|
changed receiver config to be rx_tcpport and not dataport, also -f
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@428 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-15 18:05:56 +00:00 |
|
l_maliakal_d
|
16f74ebdf2
|
receiver +4 and +10 to get only data out of the whole data with frame index etc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@418 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-08 14:04:50 +00:00 |
|
l_maliakal_d
|
b62f3dc1dd
|
get version number for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@414 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-18 14:34:29 +00:00 |
|
l_maliakal_d
|
97442cf91a
|
included enable write option in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@386 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-17 08:14:38 +00:00 |
|
l_maliakal_d
|
9c6886d030
|
included mismatched indices error shouldnt return fail, but client should try to read again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@375 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-13 08:33:22 +00:00 |
|
l_maliakal_d
|
f74ea5191d
|
included detector ip and detector mac defaults in client, which can be specified in config file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@374 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-10 13:58:47 +00:00 |
|
l_maliakal_d
|
9341a2875a
|
now u can use receiver hostname instead of only ip, got rid of acqtest, separated udpip and port from setudpconnection
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@372 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-07 15:51:03 +00:00 |
|
l_maliakal_d
|
e4d477b53e
|
included settting up of udpport from client and getting receiver mac from receiver and also listening to only one ethernet interface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@370 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-06 14:22:08 +00:00 |
|
l_maliakal_d
|
3b2a8ea13a
|
max frames per file, getting config filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@368 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-05 16:40:51 +00:00 |
|
l_maliakal_d
|
8df3541e47
|
some insignificant tuning in slsReceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@364 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-03 09:45:50 +00:00 |
|
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 |
|
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
|
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 |
|