9080 Commits

Author SHA1 Message Date
l_maliakal_d
cdddd92a9e some basic changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@582 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 08:24:33 +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
b915844822 2d pedestal implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@193 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-28 07:04:53 +00:00
l_maliakal_d
4f1dfe8b87 2d pedestal implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@192 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-28 06:45:56 +00:00
l_maliakal_d
1129702738 changed the receiver to be te one deicing frame factor, not gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@191 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-27 09:34:39 +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
141a982878 update svn rev
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@190 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-27 09:11:45 +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
74bcbf0d9a break statenets
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@576 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-23 12:26:49 +00:00
l_maliakal_d
6aeacf7b13 ordered the makefile a bit, needs more revising
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@189 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-23 12:26:08 +00:00
l_maliakal_d
19101fd2ec basic layout
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@575 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-23 11:35:47 +00:00
l_maliakal_d
385a67e017 basic layout
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@574 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-23 11:35:38 +00:00
l_maliakal_d
e4baab9f4d reverted eiger detector server to its basic form
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@573 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 16:36:28 +00:00
l_maliakal_d
cdc2c15f7e added a comment saying do not update roi
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@572 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 16:27:54 +00:00
l_maliakal_d
bc1514edbb removed eiger detector server to revert to a basic format
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@571 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 15:30:02 +00:00
l_maliakal_d
fa0ae04eb0 reverted the generic slsdetectorserver to Annas' format
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@570 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 15:27:17 +00:00
l_maliakal_d
05a57ad3b0 removed slsdetectoserver to revert to Annas basic form
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@569 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 15:09:35 +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
014dfd7eed receiver read frequency from gui can be set now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@188 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-21 13:43:30 +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
3afbf35e0f some couts commened
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@566 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-17 15:25:40 +00:00
l_maliakal_d
b0d8739439 update svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@187 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-17 10:20:45 +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
bf77cc10b2 small change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@186 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-17 10:20:19 +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
a4d99004f7 adc sync val if used with gotthard module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@563 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-17 09:06:35 +00:00
l_maliakal_d
95b76ffa9a changed the adc sync val
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@562 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-17 07:37:06 +00:00
l_maliakal_d
708bc0134e removed settings and trimdir directories and only settingsdir for all detectors
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@55 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-05-16 14:35:45 +00:00
l_maliakal_d
b86475a672 removed settings and trimdir directories and only settingsdir for all detectors
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@54 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-05-16 14:34:04 +00:00
l_maliakal_d
9693169bcd changed the receiver back to using fwrite instead of mmap
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@561 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-16 14:17:51 +00:00
l_maliakal_d
7624d301a4 changed dac names for monech
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@185 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-16 12:12:51 +00:00
l_maliakal_d
3754d61fa1 previous version moench added dacs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@560 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-16 12:12:33 +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
3e32d977b4 added registers_m.h
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@558 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-16 12:05:20 +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
0e22e9c03c updated version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@184 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 15:09:02 +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
acbb4774fc updated svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@183 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 13:28:01 +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
a843661d1b updated svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@182 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 13:27:00 +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
l_maliakal_d
4214ef6be0 changed the tab order for the forms
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@181 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 13:07:07 +00:00
l_maliakal_d
287a451904 optimized the plot a bit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@180 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 12:50:11 +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