507 Commits

Author SHA1 Message Date
bergamaschi
7392497b52 manual added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@407 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 11:34:44 +00:00
bergamaschi
411b38d716 makefile again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@406 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-22 08:29:39 +00:00
bergamaschi
82f672299b makefile fixed for asm includes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@405 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-14 11:36:30 +00:00
l_maliakal_d
11e2fafac3 separated slsReceiverInterface from slsDetector and edited Makefile to have nonstatic
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@404 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-26 08:59:46 +00:00
root
a3ab644636 makefile adjusted
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@403 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-15 08:02:48 +00:00
bergamaschi
62a71ba2fe make install implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@402 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-15 07:17:39 +00:00
x04sa
f0057c71ce changes in makefile for the beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@401 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-01 07:25:25 +00:00
bergamaschi
e19ca7f777 Based on the multiSlsDetectorClient class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@400 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-22 12:25:51 +00:00
l_maliakal_d
2448d4ee45 added the slsDetectorAnalysis folder in include for Makefile for slsDetectorClient
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@399 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-04 09:34:19 +00:00
bergamaschi
0ee0cdb717 debugged
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@398 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-26 08:47:01 +00:00
bergamaschi
a7fd2b70a1 help line is not static any longer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@397 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 15:07:38 +00:00
x04sa
e66ab33ebd returns parameter and answer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@396 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-09 14:40:38 +00:00
bergamaschi
d859736838 version at the beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@395 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-08 08:24:38 +00:00
bergamaschi
25dc6f1b63 instatiates slsDetectorCmd
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@394 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-24 15:33:13 +00:00
bergamaschi
e2c0181d92 Universal client for both slsDetector and multiSlsDetector, depending on the syntax
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@393 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-23 14:28:09 +00:00
bergamaschi
aebb60c5ae works with slsDetectorUtils and slsDetectorCommand
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@392 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-17 10:38:17 +00:00
bergamaschi
590e611afc using only the slsDetector class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@391 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-17 13:47:20 +00:00
bergamaschi
58d4673087 Text client for all SLS detectors
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@390 951219d9-93cf-4727-9268-0efd64621fa3
2011-10-13 11:47:34 +00:00
l_maliakal_d
e2745581b5 adding client to software
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@389 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 10:33:52 +00:00
l_maliakal_d
9a909ecea7 no change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@388 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 08:22:20 +00:00
l_maliakal_d
a99222cc02 included enable write to file in receiver, changed the enablewritetofie function in postprocessing to be modified by slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@387 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 08:16: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
09a13bc3cc moved svnInfo header to commonfiles so that its accessible by all the folders needing it
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@385 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-14 13:12:56 +00:00
l_maliakal_d
c43fe9b10e included svninfo header file which gets populated when exportSoftware from newMythenSoftware is executed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@384 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-14 12:55:34 +00:00
bergamaschi
3422686e51 rev test
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@383 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 10:46:37 +00:00
l_maliakal_d
08b01d6edf checking rev change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@382 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 10:42:26 +00:00
l_maliakal_d
09bfd59e69 checking change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@381 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 10:41:11 +00:00
bergamaschi
739cd7e1d0 revision added to mythen Server works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@380 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 10:01:50 +00:00
bergamaschi
68e06a5203 revision added to mythen Server
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@379 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 09:57:40 +00:00
bergamaschi
806df32efb revision in version number in getId
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@378 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 09:28:06 +00:00
bergamaschi
00e9c69bed revision in version number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@377 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 09:23:04 +00:00
bergamaschi
8ae3f8d422 Added revision keyword
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@376 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 09:14:11 +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_cartier
9d9d00cdc7 added adcprepare in server and updaed TOKEN_RESTART_DELAY and TOKEN_TIMING_REV
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@373 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-10 11:22:37 +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
ac2c4211e2 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@371 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-06 14:27:52 +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
f20e40025b got rid of fifo full message in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@369 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-06 09:53:49 +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
452812aaf8 changed cleanfifo and setdaq
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@367 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-05 16:39:35 +00:00
l_maliakal_d
788bc9cfd7 made change to avoid compiltime errors with new gcc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@366 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-05 08:49:26 +00:00
bergamaschi
b00d3c446c slsDetectorUSers doxygen docs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@365 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-04 15:37:27 +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
e490f437a2 get progress when acquisition is over to show 100 percent
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@363 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-30 09:51:05 +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