307 Commits

Author SHA1 Message Date
bergamaschi
1673da0854 fixed mismatch between slsDetectorCommand and slsDetectorUsers when setting the timing mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@684 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-13 11:59:35 +00:00
l_maliakal_d
9e08196677 huge change in receiver in previous version, sortingand padding frames before movign into fifo; users small change in previous revision typecasting
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@676 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-02 14:28:37 +00:00
l_maliakal_d
eba9bcf9ac gotthard server fix: problem for new board due to component version change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@675 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-02 14:20:44 +00:00
bergamaschi
65748059cc Added some commands for moench and modified the moenchServer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@673 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-18 10:56:03 +00:00
l_maliakal_d
57d65fd59c semaphores , no usleep in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@660 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-04 13:10:14 +00:00
l_maliakal_d
594c6895f8 fixed the zooming problems for 2d
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@659 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-29 15:15:19 +00:00
l_maliakal_d
6c11ac1d66 working version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@658 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-27 15:45:27 +00:00
l_maliakal_d
0441c91557 included detailed error of settings file could not find
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@656 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-16 13:55:05 +00:00
l_maliakal_d
13189b6414 included detailed error of settings file could not find
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@655 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-16 13:48:27 +00:00
l_maliakal_d
3098664c8f fixed some probelems wuth scans for receiver and also scans for allframes/frameindex
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@654 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-16 12:59:42 +00:00
l_maliakal_d
557f2f90ec update svn rev
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@652 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-13 10:30:27 +00:00
l_maliakal_d
e7a5512e29 update rev
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@649 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-08 09:52:23 +00:00
l_maliakal_d
05f54e996c changed the start and stop receiver error messages to be displayed to the client and not jsus recever
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@640 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-30 14:49:53 +00:00
l_maliakal_d
b5b031a33e changed default output dir to root directory
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@637 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-19 10:09:42 +00:00
l_maliakal_d
7a40b12108 setting buffer for fwrite in slsreceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@636 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-19 09:15:41 +00:00
l_maliakal_d
b5fb6be6df updated rxr to use 10 times less memory for moench and plugged possible memory leaks
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@634 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-12 09:24:55 +00:00
l_maliakal_d
831baa70c7 svn updated
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@632 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-11 09:07:01 +00:00
l_maliakal_d
036d72fec8 eiger server edited to include set timer, settingsand stop server for the time being
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@631 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-11 09:06:37 +00:00
l_maliakal_d
8720f960e7 implemented getting ids for eiger. also id ret should be int64_t
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@630 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-10 15:58:43 +00:00
l_maliakal_d
e8e2c7b3e4 fixed moench settings problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@628 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-25 11:30:29 +00:00
l_maliakal_d
47377a02e9 set settings for eiger, fixd big bug in slsusers for exposures, period etc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@623 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:24:02 +00:00
l_maliakal_d
e8f3a5aad4 added eiger dacs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@619 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-20 08:46:13 +00:00
l_maliakal_d
8081580441 update svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@617 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:34:51 +00:00
l_maliakal_d
b661b37b03 changed number of adcs to be 0 for eiger and a temporary chan chip trimbit for setsettings
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@614 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:33:10 +00:00
l_maliakal_d
3d4748e918 users exp time problem fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@611 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-18 12:52:29 +00:00
l_maliakal_d
a17e6f616d settings file shud read and write according ot dac names and can be in any order, included eiger definitions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@609 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-17 13:40:38 +00:00
l_maliakal_d
94d5b30707 revision stuff
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@603 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-13 13:32:54 +00:00
l_maliakal_d
58824d6d72 some swapping functions for big and little endian for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@602 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-13 13:28:12 +00:00
l_maliakal_d
d4bedf5ce6 fixed the receiver index turning negative for moench problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@594 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-12 10:10:58 +00:00
l_maliakal_d
6e6e02e3c9 update svn number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@590 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-03 08:18:29 +00:00
wang_x1
43322a6c80 remove obsolete implementations
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@581 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-28 15:02:27 +00:00
l_maliakal_d
19a14c5861 eigerServerMakefile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@580 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-28 10:07:30 +00:00
l_maliakal_d
b19fdaa0a5 changed the receiver to be the one deciding the frame factor, not gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@579 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-27 09:34:24 +00:00
l_maliakal_d
45c690084b update svn rev
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@578 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-27 09:11:55 +00:00
l_maliakal_d
666c73c988 edited call backs in receiver, got rid of uhrix callback, expose receiver read freq to user, got rid of wait for receiver t finish
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@577 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-27 09:11:26 +00:00
l_maliakal_d
d8a1e20d80 minor changes needed for receiver nthr frame
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@568 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 14:50:50 +00:00
l_maliakal_d
0e73372cf8 receiver read frequency from gui can be set now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@567 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 13:43:25 +00:00
l_maliakal_d
19179e1eb7 update svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@565 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-17 10:20:40 +00:00
l_maliakal_d
df6774e2c6 users:double for time in ns, bugfix:readframe wen no gui, return ok for config
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@564 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-17 09:51:31 +00:00
l_maliakal_d
05f290bcff added moench dacs, names will be named later on
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@559 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-16 12:11:29 +00:00
l_maliakal_d
5b30a98b47 update svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@557 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-16 07:37:26 +00:00
l_maliakal_d
40c0772dda bug fix wasnt locked before setframeindex and unlocked after
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@556 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-16 07:36:55 +00:00
l_maliakal_d
d4a4786670 updated version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@555 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 15:08:53 +00:00
l_maliakal_d
bccffa5c3d if file write not enabled, writing out packet loss and file name removed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@554 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 15:08:21 +00:00
l_maliakal_d
de03868f9f got rid of some useless comments
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@553 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 14:16:41 +00:00
l_maliakal_d
f36752028b got rid of some useless comments
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@552 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 14:14:36 +00:00
l_maliakal_d
91661c3e5f updated svn without the callback defaults
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@551 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 13:27:54 +00:00
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
x04sa
b660c0aebf some debugging at the beamline (fnames)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@549 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-14 10:26:28 +00:00
l_maliakal_d
1e7dfcb6ad error when file path doesnt exist
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@547 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-08 17:31:37 +00:00