|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4fdacefdbe
|
getting rid of undefined state in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@179 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-05-13 13:47:05 +00:00 |
|
|
|
21b511fe29
|
fileenablewrite shoudlnt decide if the datareadycallback is called
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@548 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-13 13:46:36 +00:00 |
|
|
|
e153c6fd58
|
fixed zmin zmax bug, automatically online when refreshing advanced tab bug, outdir not checking properly
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@178 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-05-08 17:32:38 +00:00 |
|
|
|
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 |
|
|
|
5e7d22357e
|
solved bug for real: undefined state when stoppping receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@546 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-08 15:18:05 +00:00 |
|
|
|
7701531ff3
|
fixed the undefined state of gui when acquisition stopped
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@177 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-05-07 14:20:43 +00:00 |
|
|
|
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 |
|
|
|
f29358992d
|
changed adc_sync to be read first before editing to clean fifo
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@544 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-07 07:34:36 +00:00 |
|
|
|
3ac133db98
|
updated nchip to be defined in x and y directions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@543 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-05-06 16:45:50 +00:00 |
|
