5ededf9be4
Merge branch 'main-rc' into b2.1.1
2020-11-30 15:16:57 +01:00
3e8774798a
Merge branch 'main-rc' into b2.1.0
2020-11-30 15:13:43 +01:00
a2986784d3
Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1
2017-12-12 11:13:34 +01:00
975cbb576e
Merge remote branch 'slsDetectorCalibration/2.1' into 2.1
2017-12-12 11:06:15 +01:00
e48a92d9cd
Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5
2017-12-12 11:02:57 +01:00
308d44e452
Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1
2017-12-04 16:47:22 +01:00
69da61b1fb
Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1
2017-12-04 16:47:22 +01:00
460168ce04
Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1
2017-12-04 16:47:21 +01:00
4e429c0d77
Merge remote branch 'slsDetectorGui/2.1' into 2.1
2017-12-04 16:45:34 +01:00
bf4fab549d
Merge remote branch 'slsReceiverSoftware/2.1' into 2.1
2017-12-04 16:45:34 +01:00
f7705eb1da
Merge remote branch 'slsDetectorSoftware/2.1' into 2.1
2017-12-04 16:45:32 +01:00
a2217e2066
Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5
2017-12-04 15:33:33 +01:00
aaa02706fc
Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5
2017-12-04 15:31:52 +01:00
839896c7e6
fixed the print file packet loss progress bug
2016-10-19 15:53:26 +02:00
44a69e2aee
improved locking a bit
2016-10-19 10:46:03 +02:00
121e9faf56
trying with the actual 1 getframescaught
2016-10-19 10:32:11 +02:00
673e7c8f20
removed asking only 1 for framescaugh
2016-10-19 10:22:35 +02:00
4a7e246604
removed asking only 1 for framescaugh
2016-10-19 10:21:29 +02:00
749c64204e
done showing error when detectors not added in sharedmemory due to connect failure
2016-10-19 08:15:52 +02:00
7f293115c4
moved f_activate to receiver funcs from detectors funcs
2016-10-10 08:43:18 +02:00
f59f40a659
ask only 1 for frames caught for 9m
2016-10-10 08:41:03 +02:00
64fd82f92c
fixed bug in gui that overwrites the individual sls file path values with the multi value, included a febl and febr temp read
2016-10-10 08:39:46 +02:00
cd232fd732
fixed bug in gui that overwrites the individual sls file path values with the multi value
2016-10-10 08:17:34 +02:00
03cdda99ae
fixed bug in temp front fpga
2016-10-07 15:54:46 +02:00
28f96f4b51
included a febl and febr temp read
2016-10-07 15:44:13 +02:00
dce9911164
ask only 1 for frames caught for 9m
2016-10-07 13:48:45 +02:00
2fdc4389e2
Merge branch '2.1' into 2.1.1-rc
2016-10-06 08:51:06 +02:00
5082435501
fixed bug in gui that overwrites the individual sls file path values with the multi value
2016-10-06 08:50:08 +02:00
0979d04693
works for deactivated server and receiver
2016-10-04 07:35:52 +02:00
4b7743b8ad
update manual
2016-09-28 14:25:24 +02:00
953e513a2d
updatereveiger
2016-09-22 17:18:35 +02:00
a7c180eb1c
settings initially at UNINITIALIZED in eiger server
2016-09-22 17:16:49 +02:00
7745bf5e0c
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer
2016-09-20 10:44:11 +02:00
8c88de899a
added in gitignore to ignore build and tests
2016-09-20 10:43:59 +02:00
7a55866966
manual
2016-09-14 17:41:07 +02:00
1044fc68ab
Merge branch 'cmake' of git.psi.ch:sls_detectors_software/sls_detectors_package into cmake
2016-09-02 16:28:28 +02:00
36904db3ca
now GUI is compatible with qwt 6.1
2016-09-02 16:28:01 +02:00
4a7d7ec9e1
Merge branch 'developer' into cmake
2016-09-02 16:00:04 +02:00
c940607088
Merge branch '2.1-rc' into developer
2016-09-01 18:12:59 +02:00
d2240884b4
settings dir for eiger
2016-09-01 18:10:49 +02:00
90d2e6b82a
eiger manual
2016-09-01 15:50:36 +02:00
61d347b45d
FindQwt returns qwt verison
...
This can be used to check compatibility
2016-09-01 14:42:47 +02:00
13aa0599af
add variable for GUI libraries
2016-09-01 12:05:59 +02:00
59d8584a9e
README for compilation
2016-09-01 11:16:17 +02:00
0807e130e4
optionally build calibrationWizards
2016-09-01 11:14:29 +02:00
1a0550301b
cmake config file from ROOT with compatibility fixes
2016-09-01 11:13:27 +02:00
316ed783a8
add cmake configuration
2016-08-31 20:49:58 +02:00
6adc373e18
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
2016-08-30 16:14:13 +02:00
aad1885bf5
updaterev
2016-08-30 16:13:18 +02:00
020e1b43f9
updaterev
2016-08-30 16:12:47 +02:00
13aa48e3ec
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
2016-08-30 09:30:53 +02:00
d5f80831dd
Changes to jctb server to correctly change the power supplies
2016-08-30 09:30:31 +02:00
5d52e41e37
adcs refresh only in developer tab
2016-08-24 17:10:07 +02:00
cf34103d1f
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
2016-08-24 16:47:14 +02:00
079c7dc169
removed setup_beb.txt not required
2016-08-24 16:47:05 +02:00
1f7fbcfae2
adding the git ignore change for the .log, .aux etc and for the jctbgui
2016-08-24 12:02:01 +02:00
511d3e3970
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
2016-08-22 14:33:09 +02:00
c6c11f6740
Added v_a command for chiptestboard
2016-08-22 14:32:42 +02:00
172fa66b1f
hotfix for memory leak in server
2016-08-18 11:57:36 +02:00
3703d06684
Added section on GOTTHARD data format to the manual
2016-08-18 11:53:37 +02:00
08fd848504
updatereveiger
2016-08-18 10:31:10 +02:00
4ac7df5b90
Added section on GOTTHARD data format to the manual
2016-08-18 09:09:35 +02:00
d13a76af25
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
2016-08-17 10:30:15 +02:00
e0c45f4afd
solved paralel start bug. due to handshaking deficit in thread start
2016-08-17 10:29:47 +02:00
b90ca7b864
Added DACs for ne chiptestboard; fixed problem on dac14/highvoltage for moench
2016-08-16 15:15:24 +02:00
de8f04a058
removed jctb, use repository instead
2016-08-16 14:34:56 +02:00
fb8f49985b
changes to test
2016-08-15 15:14:15 +02:00
597f5e5d2a
got rid of unnecesaary handshaking for -1 in dynamic range in receiver
2016-08-15 11:15:52 +02:00
1f9dc775f6
ensure receiver is updated when detector timer values are updated (force_update)
2016-08-12 17:44:28 +02:00
332b0d221b
removed unnecessary logs
2016-08-12 12:13:43 +02:00
7239ce083b
updaterev
2016-08-12 11:17:39 +02:00
5b5e1e32b3
updaterev
2016-08-12 11:14:57 +02:00
b9d42d274c
updated eiger server executable
2016-08-12 11:09:52 +02:00
0ec83b90e2
updated eiger server executable
2016-08-12 11:09:11 +02:00
6f5e15f60a
changed executable name
2016-08-12 11:08:03 +02:00
04f2a5c5ed
temporarily removed parallel start to debug bug, fixed flat channel bug, fixed bad channel bug
2016-08-12 10:53:26 +02:00
4c2d28943f
rate correction fixed for gui, removed auto made it defalt
2016-08-11 13:59:36 +02:00
56a559090d
ratecorrection error def fixed
2016-08-11 13:59:05 +02:00
1e79aaf8c7
manual
2016-08-11 11:59:13 +02:00
509c4845c2
got rid of annoying get status message
2016-08-08 17:11:30 +02:00
56aaaaf182
fixed rate correction to not include 16 bit dr
2016-08-08 15:52:09 +02:00
cf74f9b138
fixed rate correction to not include 16 bit dr
2016-08-08 15:50:37 +02:00
3c35a08ae8
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer
2016-08-08 15:50:15 +02:00
fd35e56c2e
to include lib path into the run path
2016-08-08 15:50:07 +02:00
60d5c8dd21
manual
2016-08-05 13:54:04 +02:00
9bee1a5aae
update manual
2016-08-04 17:58:36 +02:00
6a87d9e40a
forgot to add server executable
2016-08-04 17:28:55 +02:00
ef9d64de64
got rid of <0.00015 rate correction error check
2016-08-04 17:27:45 +02:00
29ba1f4042
changed transmission delay commands to go through network parameters and included 10g flow control
2016-08-04 17:21:16 +02:00
1e30a6a16a
add server to previous change
2016-08-04 09:31:11 +02:00
dd2a0c50e0
rate corr atble changes
2016-08-03 18:07:21 +02:00
5d3e925ed4
compatible with gcc 5.3.1 amd 6.1.1
2016-08-03 17:50:54 +02:00
d28d737fb9
transmission delay added
2016-08-03 17:03:37 +02:00
1db5ef4fd4
added 2 gain settings to eigeR
2016-08-03 10:35:11 +02:00
9139451127
added 2 gain settings to eigeR
2016-08-03 10:34:10 +02:00
cbf136994b
added 2 gain settings to eigeR
2016-08-03 10:33:51 +02:00
e1d54b72f8
created the function to set transmission delay
2016-08-03 09:26:52 +02:00
a4e5db038d
updaterev
2016-08-02 10:35:08 +02:00
89966ae4fe
forgot deactivate server for prev commit, added
2016-08-02 10:34:34 +02:00
c0db1a89a8
deactivate for eiger
2016-08-02 10:32:37 +02:00
4181ae09ff
noise with eiger writings
2016-07-29 17:50:09 +02:00
023dbfc281
typo
2016-07-28 11:09:56 +02:00
ffaf62176f
updaterev
2016-07-22 15:30:34 +02:00
183563ca0c
check firmware version and api version upon server startup
2016-07-22 15:27:46 +02:00
ac7063a1a5
check firmware version and api version upon server startup
2016-07-22 15:26:26 +02:00
f4a7a5a032
updaterev
2016-07-22 10:42:34 +02:00
180038e485
updaterev
2016-07-22 10:41:54 +02:00
86308352cb
added more accurate temperature sensors for eiger, and to gui
2016-07-22 10:41:35 +02:00
ee26339fd7
added more accurate temperature sensors for eiger, and to gui
2016-07-22 10:40:58 +02:00
4946caedd1
manual
2016-07-21 13:37:24 +02:00
cef6dcd969
fake
2016-07-20 16:25:09 +02:00
ae3c51d2e1
fake
2016-07-20 16:18:45 +02:00
7ca8fc052a
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer
2016-07-20 16:17:00 +02:00
6a245d2a98
updatereveiger
2016-07-20 16:05:55 +02:00
aa4e35f5d5
update git versioning
2016-07-20 16:01:12 +02:00
3f157b8f62
fixed bug where settings complain if tau not in file even if its is not activated
2016-07-20 14:39:43 +02:00
23a5acccf5
manual
2016-07-20 11:43:43 +02:00
56a6dfb617
manual
2016-07-20 09:25:26 +02:00
86f1a5d082
updated versioning
2016-07-18 18:19:44 +02:00
b693279388
updaterev
2016-07-18 18:16:52 +02:00
ed7d6b2995
bug fix: 16 bit returning overflow value instead of -1 for msising packet
2016-07-18 17:38:42 +02:00
843dbffcd8
updaterev
2016-07-18 17:19:18 +02:00
9c9d946d70
fixed bug subexptime >=2.2 was set to weird value, was a int to int64_t error in server
2016-07-18 13:37:13 +02:00
2e894f33ce
fixed bug of pointing to wrong missing packet header fo 10g and 1g32 bit
2016-07-18 11:06:29 +02:00
157d8cff5e
added a script to clean shared memory
2016-07-15 18:51:04 +02:00
cb3f8b05a6
fixed 10g bug for 32 bit image reconstruction
2016-07-15 18:50:01 +02:00
bdf725be48
fixed the update on detector udpating acq period with subexptime
2016-07-15 15:45:40 +02:00
4939e47305
fixed dimensions, fixed rate corr bug, moved rate corr to server because config resets memory and ratecorr depends on client variables
2016-07-14 16:23:03 +02:00
fd1f6d1ec6
update manual
2016-07-14 13:17:22 +02:00
3f0f1c6f64
update manuals
2016-07-13 13:56:22 +02:00
342d4f8c30
solved problem of configuring twice to make receiver none
2016-07-12 16:45:00 +02:00
74dfe04a18
parallelized calibration
2016-07-07 16:24:58 +02:00
09d0d3ba22
parallized setup receiver
2016-07-07 15:55:22 +02:00
3019f4e6ff
made parallel status start, receiver start and receiver stop
2016-07-06 16:53:05 +02:00
b06a1e5a3c
print correctly the software versiondate
2016-07-06 11:29:26 +02:00
322ed68b23
commit versions updated
2016-07-06 10:33:17 +02:00
9c8137d892
updating versions
2016-07-06 10:32:57 +02:00
6e4d4eed0e
updating versions
2016-07-06 10:32:55 +02:00
418ff63999
updating versions
2016-07-05 17:24:44 +02:00
be516e34b2
updating versions
2016-07-05 17:24:43 +02:00
e5fe5eab0d
updating versions
2016-07-05 17:23:04 +02:00
cc896bd99c
updating versions
2016-07-05 17:23:00 +02:00
a7a3422ed2
feature with header in file
2016-07-05 16:53:21 +02:00
d9330fc345
feature: tau is now read from calib file. if not there, it is set to defalt in server value, but switched off. load trimbits will not touch rate correction
2016-07-05 12:03:05 +02:00
1423c87275
feature: tau is now read from calib file. if not there, it is set to defalt in server value, but switched off. load trimbits will not touch rate correction
2016-07-05 12:02:34 +02:00
6823e3065b
feature: tau is now read from calib file. if not there, it is set to defalt in server value, but switched off. load trimbits will not touch rate correction
2016-07-05 12:01:41 +02:00
66a55ab15f
updating versions
2016-07-04 15:50:58 +02:00
6b0814c907
updating versions
2016-07-04 15:49:43 +02:00
35b02c9cf0
added burst_trigger mode for eiger to replace trigger_readout mode
2016-07-04 15:47:32 +02:00
d4dd7b5d8c
added burst_trigger mode for eiger to replace trigger_readout mode
2016-07-04 15:44:59 +02:00
9574e09033
change vcp when changing vthreshold/threshold. Limit individual vcmps
2016-06-30 08:24:18 +02:00
7db1136e65
versions update
2016-06-13 19:10:38 +02:00
7ee62fcb6f
forgot to add eiger server executable
2016-06-13 19:08:10 +02:00
cce41969f9
made only master set high voltage, others dont complain. also updated version file
2016-06-13 19:05:53 +02:00
86ab51ec41
solved bug of offsets
2016-06-13 19:00:34 +02:00
94d748a411
start receiver lets detectr prepare for acquistion only if receiver worked, removed to allow other receivers to work using receiver start, status start
2016-06-10 11:03:36 +02:00
328139434d
fixed the zooming in plot tab. if x andy axis zoom set, it didnt take it for next measurement
2016-05-11 17:21:27 +02:00
ae4eb88553
status start acqisition also has detector index now, eiger always has detector index
2016-05-11 11:29:27 +02:00
7440ee2255
receiver udp parameters should be sent to receiver everytime if rx_hostname is set
2016-05-10 17:06:46 +02:00
0511242846
insignificant details
2016-05-09 11:06:32 +02:00
14c78dc500
Changed make to $(MAKE) in Makefile for parallel compiling
2016-05-04 14:15:00 +02:00
b8c86f7e83
Rate corrections are now passed in (ns) units. Improvement to the manual.
2016-04-27 15:42:50 +02:00
2f2e73a66e
Rate corrections are now passed in (ns) units. Improvement to the manual.
2016-04-27 15:41:44 +02:00
55a8c13b75
add Eiger short how-to manual. Still to be finished
2016-04-27 10:16:47 +02:00
5ca4b665c9
new default files
2016-04-13 16:16:20 +02:00
a8b21282ec
Merge branch 'developer' into parallel
2016-04-12 14:56:20 +02:00
5e337debd1
Merge branch 'master' into parallel
2016-03-21 15:00:51 +01:00
71129714e4
usability for eiger dr32 sets clk to 2 and dr 16 sets clk to 1
2016-03-21 15:00:15 +01:00
038f45edfd
threadpool is initialized
2016-03-21 14:38:38 +01:00
be93613ac8
Merge branch 'master' into parallel
2016-03-21 11:41:44 +01:00
6ce87e69a0
Merge branch 'master' into parallel
2016-03-21 11:40:17 +01:00
f40691dcaf
Merge branch 'master' into release
2016-03-21 11:21:59 +01:00
da960706dc
renamed server exe
2016-03-21 11:21:44 +01:00
451a2b5d11
renamed server executables
2016-03-21 11:16:07 +01:00
3abd28c468
Merge branch 'master' into release
2016-03-21 10:53:14 +01:00
7fd02d814a
added server executables
2016-03-21 10:52:38 +01:00
7707a6f9a7
eiger server corrected
2016-03-21 10:48:36 +01:00
5b97ae104f
undefined enum changed, added binary file
2016-03-21 10:43:27 +01:00
440d67ea85
added ansi to mythendetectorserver, undefed enum changed, recompiled mythen server
2016-03-21 10:16:23 +01:00
4395aca607
aaded ansi and merged release to have changing dynamicrange and clock with eiger
2016-03-18 14:54:51 +01:00
e5ccd18283
Merge branch 'release' into hotfix
2016-03-18 14:53:47 +01:00
3bf899a3ca
recompiled server with undefned enum changed
2016-03-18 11:12:20 +01:00
fcf9b4aafb
recompiled server with undefned enum changed
2016-03-18 11:05:43 +01:00
7e4ebd3a5d
included execute trimming execution of pulseandmove
2016-03-16 18:26:53 +01:00
a2c41b58d9
included parallelization for setsettings, setalltrimbits, pulsechip, pulsepixel, pulsepixelnmove
2016-03-16 11:18:35 +01:00
e7dbbf4c1f
undefined enum fixed
2016-03-15 17:33:40 +01:00
08e64aa8a2
undefined enum fix
2016-03-15 17:18:07 +01:00
db26135e89
undefined enum changed
2016-03-15 17:13:37 +01:00
26933bd8bd
fixed undefined gain enum to a large number
2016-03-15 16:50:44 +01:00
6ad6c9e8bb
fixed undefined gain enum to a large number
2016-03-15 16:10:10 +01:00
6261f5b47d
corrected trimbit files
2016-03-14 16:21:39 +01:00
9cd9d17d68
Merge branch 'hotfix' into release
2016-03-14 16:17:35 +01:00
7b7d42f253
fixed the 8 byte iodelay trimfile bug, now writes as 4 bytes
2016-03-14 14:39:40 +01:00
2cf34999a9
added threadfiles dir to library for compile
2016-03-14 09:51:42 +01:00
5a77d9e61b
added new calibration files
2016-03-14 09:48:13 +01:00
4c5736db5e
works for get setttings and for loadsettingsfile
2016-03-10 18:18:50 +01:00
f8a850ccb2
sd
2016-03-10 17:28:23 +01:00
d3a7d3bad3
something
2016-03-10 17:25:47 +01:00
4bb97fcfbf
included calibration wizards in checkout script
2016-03-09 12:36:59 +01:00
c36db579b1
Merge branch 'master' into release
2016-03-09 11:29:41 +01:00
b9e2a11adf
fixed high voltage index and bottom high voltage problem in server
2016-03-09 11:24:36 +01:00
6e52c72307
eiger user: setting clk to 2 for 32 dr, and 1 for 16 dr
2016-02-25 16:35:22 +01:00
e0f645ed4b
some change
2016-02-25 16:25:27 +01:00
a563b82001
Merge branch 'master' into release
2016-02-25 14:34:07 +01:00
7ace569daf
resolved conflicts in merging with release
2016-02-25 14:32:56 +01:00
5b3aa45439
resolved conflicts in merging with release
2016-02-25 14:31:50 +01:00
548ecba6dc
Merge branch 'release'
2016-02-25 14:24:45 +01:00
0fa33dc74c
added gotthard server version executable
2016-02-25 12:12:39 +01:00
ebdb21ccfe
added iodelay with setttings
2016-02-24 18:10:59 +01:00
7eda239e45
Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detectors_package into release
2016-02-24 18:09:28 +01:00
59262c28c2
added iodelay with setttings
2016-02-24 18:09:16 +01:00
98ef40b1b6
Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detector_software into release
2016-02-24 18:05:39 +01:00
5af05c24c1
added iodelay with setttings
2016-02-24 18:05:17 +01:00
d8007477b5
High Voltage index changed for jungfrau
2016-02-22 15:11:30 +01:00
e7a7dd8c6b
Merging with anna's jungfrau detector server version
2016-02-22 15:02:42 +01:00
13db6a7df5
New interface for PLL reconfig of Junfraus server; moved some_fifo_full_bit and added stopped status
2016-02-22 13:59:53 +01:00
1633cc3f01
incorporated rate correction of eiger into gui
2016-02-17 18:04:24 +01:00
0b1710c267
updated server bianry
2016-02-17 18:03:32 +01:00
4eba07ca90
added error message tau/subexptime to error list
2016-02-17 18:01:58 +01:00
cb1a30c450
added the script to change and add server with the version numbering
2016-02-17 15:18:39 +01:00
8d2f54838a
fixed corrections for rate correction, needed to reset daq completely
2016-02-17 15:17:40 +01:00
764078d465
something
2016-02-16 11:07:12 +01:00
db2e75460e
fixed bug of wrong number of frames in receiver when server starts
2016-02-12 17:26:14 +01:00
a0c6aad7c6
renamed eiger server final to reflect the revision
2016-02-12 15:26:37 +01:00
e2133317f5
add missing commands and cleanup
2016-02-12 14:32:03 +01:00
3225427043
spell check client manual
2016-02-12 14:04:54 +01:00
a3e2a6c37c
removed unnecessary eiger server executables
2016-02-11 14:24:21 +01:00
5d3c427f11
changed setctrbit command to resmat
2016-02-11 10:48:58 +01:00
1e3f9e8ead
fixed receiver toalso get frames*cycles as number of frames
2016-02-10 17:03:10 +01:00
dbedc9b7df
rate correction for eiger implemented
2016-02-10 11:25:58 +01:00
3c4b0c24c8
rate correction for eiger implemented
2016-02-10 11:24:49 +01:00
9067da5e88
rate correction for eiger implemented
2016-02-10 11:22:59 +01:00
5029eb0c86
bug fixed maximum sub exposure time is in 10 ns and not ns
2016-02-08 15:25:28 +01:00
f0c4a4a7e4
almost done
2016-02-08 15:20:19 +01:00
cf3e736d7e
fixed bug that still reads hostname and expects a 0XX format, also prints revision number in decimal and not hex
2016-02-08 11:25:10 +01:00
23058987a4
mid way, had to change to fix bug
2016-02-08 11:11:36 +01:00
07f1bd5c82
mid way, had to change to fix bug
2016-02-08 10:40:54 +01:00
fed40b02c4
fixed measurement progress bar bug that kepts getting reset for each measurement
2016-02-05 11:29:02 +01:00
03fc676b7e
removed JUNGFRAU_DHANYA completely from Makefile, used N_CHAN instead of NCHAN macro since it isnot constant, and corrected registerdefs
2016-02-04 17:26:05 +01:00
1fae912cb2
jungfrau server making it uniform, left to do: register confirmation and server_defs
2016-02-04 16:18:01 +01:00
35631c0abb
some changes with anna. more to come
2016-02-04 12:57:07 +01:00
6cc22a350d
Merge branch 'release' into jungfrauv1.0
2016-02-03 15:05:50 +01:00
615909f178
Merge branch 'release' into jungfrauv1.0
2016-02-03 15:00:53 +01:00
e3d9fd1c02
Merge branch 'release' into jungfrauv1.0
2016-02-03 14:59:22 +01:00
8ca9157882
corrected checkout script
2016-02-02 11:37:40 +01:00
1230b63b29
Merge branch 'release', remote branch 'origin' into release
2016-02-02 11:21:07 +01:00
316ecf1b50
no change check
2016-02-02 11:10:49 +01:00
d0a38d203d
Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detectors_package into release
2016-02-02 10:50:25 +01:00
d489b34824
Test commit, added a space in makefile
2016-02-02 10:49:40 +01:00
b27e42f193
Merge branch 'release', remote branch 'origin' into release
2016-02-02 10:48:15 +01:00
0ce03226ee
changed the checkout script to point to new remote repo
2016-02-02 10:42:59 +01:00
bef8d413d6
jungfrau done but not merged
2016-01-21 14:43:44 +01:00
f477b7a5ac
not much changes
2016-01-19 16:25:48 +01:00
1477f67c4c
eiger documentation
2016-01-15 14:39:02 +01:00
a785eb7d5e
newline after wrong command
2016-01-08 17:18:50 +01:00
22cb739c7f
start to update manuals for Eiger
2016-01-08 17:13:48 +01:00
09807aae49
Added slsReceiverScript and xterms
2015-12-16 16:14:18 +01:00
5c239ad45f
data call back form receiver includes both x and y dimensions
2015-12-16 15:01:00 +01:00
ff7a2d5185
Added slsReceiverScript and xterms
2015-12-15 16:31:18 +01:00
06e810169d
Revert "trying to fix for 2D detector(eiger)"
...
This reverts commit 0a471f54edffb54a9871bbc8ebb241c22775451c.
2015-12-15 16:29:47 +01:00
54c1765f34
Revert "Revert "pulse chip fixed""
...
This reverts commit 356e6cb8cacec52ec6883e625a6b3639633f3b0e.
2015-12-15 16:29:35 +01:00
ca6f2b8588
Revert "pulse chip fixed"
...
This reverts commit f85739e8b64a3b0c7af02d068a2cc429064ad103.
2015-12-15 16:26:44 +01:00
7848b79cf2
2d noop for setdetectorsize
2015-12-15 16:24:43 +01:00
cd80160e7d
getdetectorsize in users reflects 2d addon
2015-12-15 15:40:39 +01:00
2dd2b577fd
getdetectorsize in users reflects 2d
2015-12-15 15:36:49 +01:00
d6c4ec184a
should show progress for each measurement, not collectively
2015-12-15 14:25:53 +01:00
921154e43a
detsizechan or maximum detecto size for users incorrectly implemented for only 1d
2015-12-15 12:07:28 +01:00
50d76f5537
iodelay set to 650, rxb_lb and rb set to 1100, 10g detectormac set to +1 of 1g
2015-12-14 15:15:27 +01:00
532ac38ad5
dont know
2015-12-09 16:15:23 +01:00
4fc8065ef5
trying to fix for 2D detector(eiger)
2015-12-08 13:26:17 +01:00
0c28dcec4f
added data structure file for m03 T mounting and data structure for m02
2015-12-03 10:17:26 +01:00
0f6fa37ca1
new default files
2015-12-02 16:50:03 +01:00
700346fbbe
some changes for gui for settings for jungfrau
2015-12-01 17:15:41 +01:00
4dc8213cf6
added jungfrau settings directories
2015-12-01 16:46:07 +01:00
b05207221c
ansi and test server for jungfrau server
2015-12-01 16:45:18 +01:00
61f0506c2c
settings for jungfrau
2015-12-01 16:43:23 +01:00
58dbc59af2
masking vvalues for jungfrau
2015-11-27 17:32:46 +01:00
b803f3a32a
works for jungfrau
2015-11-27 17:30:45 +01:00
0958a4544e
jungfrau works
2015-11-27 15:56:29 +01:00
ac53cb2ae4
resetting the acquiringflag whenever acquisition stop is called
2015-11-24 15:25:42 +01:00
5012ea0c6c
unnecessary lock in acquire
2015-11-24 13:50:42 +01:00
a00df5da35
dummy value changed
2015-11-24 12:09:10 +01:00
a65ebbea99
merge to master
2015-11-23 12:40:24 +01:00
8ae1e812e6
pulse chip fixed
2015-11-20 16:41:27 +01:00
c097dfc8b3
two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc
2015-11-20 16:28:48 +01:00
a1bd54b16b
pulsing in client and server
2015-11-19 17:43:46 +01:00
e0464ef782
pulsing client side, and bug fix server side for reset partially
2015-11-19 16:15:59 +01:00
291fe8bc22
socket disconnecting in receiver
2015-11-19 11:10:59 +01:00
8b0895add0
reset counter bit in eiger detector partially or completely
2015-11-17 16:39:36 +01:00
11dafc6ebf
resetting frame number done after resetting detector (prepareforacquisition) eiger server
2015-11-17 15:28:47 +01:00
bc55f9d1e4
edited getdatafromdetector to not stop detector for eiger
2015-11-17 12:00:42 +01:00
66db11421f
implemented fifo depth configurable from client
2015-11-17 10:30:53 +01:00
f68d6d0ab6
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-11-13 17:49:36 +01:00
c43af96487
some changes refactoring and reducing time spent
2015-11-13 17:47:44 +01:00
c73d9f4103
merged and gotthard 2 det example
2015-11-13 17:44:24 +01:00
041bfc8992
remove cout
2015-11-13 15:46:42 +01:00
8ecc795574
corrected settings for eiger;removed loqwnoise to lowgain
2015-11-13 13:48:30 +01:00
a6294a7737
default files
2015-11-13 12:12:40 +01:00
c2c428254e
change eiger settings
2015-11-13 12:04:52 +01:00
4cf263027a
change eiger setting dir
2015-11-13 11:51:17 +01:00
fa80d6a205
change settings for eiger
2015-11-13 11:43:19 +01:00
ab9e01f212
usleep in detector taken off
2015-11-12 15:30:56 +01:00
62c92dd364
changing to random read when no gui at beginnning of acquire
2015-11-12 15:05:56 +01:00
816543f358
detector ip for eiger is replaced by hardware ip for 1g
2015-11-06 11:10:51 +01:00
0841467dc9
added xmap and ymap in moench02Ctb.h
2015-11-04 12:26:00 +01:00
bc6dfca552
ensuring vthreshold returns the right value
2015-11-03 15:22:57 +01:00
2e701168b9
forgot to add eiger server
2015-11-02 12:32:56 +01:00
2152eb1d28
detector id returns a number form a file or 0 if no file: eiger
2015-11-02 12:31:19 +01:00
eee739625f
Modified config_gen script
2015-10-28 11:08:19 +01:00
da809171e9
output dir multi for all
2015-10-26 11:31:56 +01:00
dd1233bc7c
outdir for multi is for all
2015-10-26 11:26:16 +01:00
73ebb2750c
Better commandline parsing
2015-10-23 12:03:19 +02:00
feb6f0d0e2
THE REAL CHANGE: previous ones dont work:fixed bug gotthard server: dynamic gain and confgain values
2015-10-23 11:41:05 +02:00
64c0fdfaef
fixed bug gotthard server: dynamic gain and confgain values
2015-10-23 11:30:37 +02:00
0ea9cc34b0
changed gotthard dynamic gain value and fixed bug of writing settings enum with more offset to not mixup with conf gain value in firmware
2015-10-23 10:57:45 +02:00
8f66d63b08
Added config file generation tool
2015-10-20 16:16:49 +02:00
8ffdcb08c9
fixed the set trimbit getting stuck bug. was due to gain and offset not sent properly for eiger
2015-10-15 16:00:09 +02:00
4fce397d20
eiger calibration files
2015-10-15 12:13:35 +02:00
6ab7947b97
fixed the gain and offset default values uploaded for eiger
2015-10-14 10:47:43 +02:00
25dbaa4e09
fixed the gain and offset default values uploaded for eiger
2015-10-14 10:38:39 +02:00
8972fa1143
EigerDetectorServer for firmware version 11, changes: direct write into udp block ram
2015-10-08 17:29:13 +02:00
5057fd4eef
changed energyConversion.h to compile the calibration wizards
2015-09-24 11:10:12 +02:00
11de59d87c
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-09-24 10:54:48 +02:00
33cf26648b
no real changes
2015-09-24 10:54:43 +02:00
cf787c9e7d
minor warnings removed
2015-09-23 17:01:44 +02:00
a4dfa6165a
4 bitand 32 bit mode for partial_frames offline analysis should work now
2015-09-23 17:01:06 +02:00
2ed8b46ad0
displaying subframe index in gui
2015-09-23 11:50:47 +02:00
a770389c90
including subframe index from receiver to client and also sending this to gui
2015-09-23 11:50:02 +02:00
2f8a036b5e
works for 16 and 8bit offline
2015-09-23 11:35:40 +02:00
22ba839ad5
commenting out unnecessary lines
2015-09-22 11:39:33 +02:00
754d0b7911
included set all trimbits
2015-09-10 12:53:18 +02:00
271838b2b5
changes to includes clkdivider and flags in gui and modify the server for proper checks
2015-09-10 11:29:15 +02:00
1c41ea8898
changes to includes clkdivider and flags in gui
2015-09-10 11:28:39 +02:00
03c41a759f
should work for 10g now
2015-09-04 17:40:13 +02:00
2ff8364aa8
some default calibration files for eiger
2015-09-04 15:57:17 +02:00
584b9e6036
added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger
2015-09-04 15:54:12 +02:00
7f168e3a70
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-09-03 15:40:11 +02:00
681ed0f34f
added function to read 4 energy calibration coefficients for eiger, comments on how to add them to the software
2015-09-03 15:39:54 +02:00
cae286941a
added subframe exposure time settable
2015-09-03 15:16:48 +02:00
9dee6d41bd
should work for 8 and 16 bit eiger
2015-09-03 12:05:25 +02:00
95324fc929
resets footer frame numbers
2015-09-02 11:06:07 +02:00
34a1dac0fe
sls_detector_acquire [id-] should finally work
2015-08-31 14:44:40 +02:00
d19b051860
reverting multiSlsDetectorClient to previous version otherwise the index of the detector does not work with default multidetector index. Use sls_detector_get 1-acquire for acquiring with multiple multi-detectors
2015-08-28 12:58:26 +02:00
b073ecacb9
multiple detector on one PC should now work
2015-08-28 12:14:55 +02:00
84ad2912c6
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-08-28 10:55:22 +02:00
dc05e58a57
may be changes to jungfrau detector server
2015-08-28 10:54:59 +02:00
8ebb34dd42
fixed long file names in guireducing redundancy in name
2015-08-28 10:23:21 +02:00
f546814d39
reduced size of file names in gui
2015-08-27 10:44:24 +02:00
2f160a7c28
reordered file name positions for gemma
2015-08-26 16:47:18 +02:00
df1453568c
reverted the file name indices positioning as it doesnt work for gui
2015-08-26 12:50:45 +02:00
b2c443af42
bug with 8 bit and 16 bt mode
2015-08-26 10:28:10 +02:00
e732dbbeab
should work properly
2015-08-21 10:05:29 +02:00
704c0f796a
reset acquiringDone before acquistion
2015-08-19 16:56:17 +02:00
79e13c6db7
using framescaught instead of frameindex in gui to get data
2015-08-19 15:48:14 +02:00
225b67f5e5
some bug fix with file naming from previous change
2015-08-19 11:46:41 +02:00
c9a952a748
changing file name prefix orders, reset frames caught command from command line
2015-08-19 11:38:09 +02:00
35cd736c4c
nothing much, made it more compatible
2015-08-10 15:12:32 +02:00
0800e07315
partial frames shows missing packet when you map values
2015-08-10 15:11:45 +02:00
1e817c138f
nothing much
2015-08-10 14:57:24 +02:00
e3d61d7020
do not push, debug commands involved
2015-08-10 13:42:58 +02:00
5c5e9d349a
zmin zmax change finish
2015-07-27 19:18:32 +02:00
b1a9689caf
solved some zmax zmin problems with gui
2015-07-27 18:53:16 +02:00
24dcc45f5b
receiver crash solved
2015-07-24 10:45:11 +02:00
0d83346943
continuous and storeinram variable
2015-07-24 09:21:38 +02:00
2d8ee637dc
adc update not stopped between acquisition
2015-07-22 10:35:26 +02:00
db5412e599
propix integrated into gui
2015-07-22 10:06:38 +02:00
b4a540b6c2
propix settigns file added
2015-07-21 16:34:11 +02:00
a8fc34c92b
included propix for client
2015-07-21 16:26:50 +02:00
74fc443db5
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-07-17 13:56:04 +02:00
29c62b1721
offsets corrected for 1.5m
2015-07-17 13:55:02 +02:00
2ef27b718c
updated gotthardserver to reflect v1.0
2015-07-09 16:59:13 +02:00
5f0741d882
trimbits flipped and works correctly for top and bottom
2015-07-01 15:00:17 +02:00
a3a2db1f73
fixed 32 progress problem, and increased debugging
2015-06-30 17:20:23 +02:00
f29f9b701d
check detector mac matches hardware mac only for 1Gbe
2015-06-30 12:28:44 +02:00
c4e0f2967f
solved detector organisation in client side
2015-06-30 11:54:13 +02:00
8202e4aa0a
git rev in
2015-06-29 16:56:34 +02:00
a5e18833de
git rev in
2015-06-29 16:55:51 +02:00
4ebc9dffac
git rev in
2015-06-29 16:55:26 +02:00
ceba5b8331
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration
2015-06-29 16:53:37 +02:00
51bd146178
flip bytes incorporated
2015-06-29 16:52:52 +02:00
90340d76b4
lookup table for the IR intensity
2015-06-26 16:55:38 +02:00
2a719390cb
adding script for gifs
2015-06-26 16:32:10 +02:00
47d51674b4
resolved flip bytes in eiger
2015-06-26 15:57:10 +02:00
49ef6659d4
eiger dynamic range offline header, moved eiger specific stuff from slsDetectorData to eigerHalfmodule
2015-06-26 15:45:38 +02:00
1f9f474670
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration
2015-06-26 11:53:01 +02:00
9041c48bbf
offline headers for dynamic range, fixed port to be same 1 bit always
2015-06-26 11:52:17 +02:00
b820ae0cad
checkFrameNumber added to moench03 read data
2015-06-23 11:03:49 +02:00
92e1029fec
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration
2015-06-23 09:15:46 +02:00
1941ecb3c3
Adedde sturctures for moench03 10Gb data
2015-06-23 09:15:23 +02:00
f3d5de70bf
firmware version for eiger added
2015-06-22 17:09:47 +02:00
23a21b373e
modified readMoench03 by Marco
2015-06-18 14:16:43 +02:00
e16cda9509
fix a typo and makefile
2015-06-17 17:30:41 +02:00
aa94f2f7be
write headers is compulsory for eiger and shouldnt be in makefile
2015-06-16 16:28:53 +02:00
861753a5d1
formatted changes made by Martin, which inclded resolving fifo full problem, first frame problem; 32 bit mode sub frame and 16 byte ignore
2015-06-16 11:59:07 +02:00
7b2934fb73
git version update
2015-06-16 11:56:58 +02:00
8323f81e8a
beb includes read, write functions, so that it doesnt have to go to locallink interface
2015-06-15 17:41:48 +02:00
b11b7c1c09
beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable
2015-06-12 17:45:43 +02:00
e035eeaf08
not compulsory anymore for every frame for eiger
2015-06-12 17:44:30 +02:00
2b05ceb281
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-06-12 13:00:21 +02:00
de0f35afb3
some jctb changes
2015-06-12 13:00:13 +02:00
d69c6df9ce
32 bit mode image reconstuction should work for frame numbers as well
2015-06-11 13:33:18 +02:00
67628c74e1
removed all the scripts for just gitall
2015-06-11 12:35:53 +02:00
aa29f12bb8
removed all the scripts for just gitall
2015-06-11 12:34:44 +02:00
13b35b319c
removed all the scripts for just gitall
2015-06-11 12:34:15 +02:00
aca95703a9
tiny changes
2015-06-11 11:42:44 +02:00
a4de9a914a
added a function to give frame number while reading next frame
2015-06-11 11:38:10 +02:00
b193237df3
Making eigerDetectorServer running with the new firmware (request frames/packets is now done in HW)
2015-06-11 11:19:51 +02:00
7046d2ad6e
fixed merge
2015-05-28 14:46:46 +02:00
88ec090ee6
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration
...
Conflicts:
slsDetectorData.h
2015-05-28 14:29:45 +02:00
7e8cf810fb
main in moenchReadDataMT [multi threading]
2015-05-28 14:28:17 +02:00
c0dac6fd27
receiver can return fail for a get and a message
2015-05-26 17:00:07 +02:00
ee4fa791be
interleaving request messages to different ports of eiger detector
2015-05-26 12:07:43 +02:00
ee8b0b2ee7
knowing which repo
2015-05-22 10:22:53 +02:00
2cd2dbadc0
included scripts for diff and status
2015-05-21 11:18:04 +02:00
9c66e96770
receiver stop command line should not have receiver readout, acquire doesnt hacve it anymore
2015-05-21 11:11:17 +02:00
302d9ca0ed
added the code for toggle bit to know when acquisition started in febcontrol and list, indentation as well
2015-05-20 12:01:49 +02:00
bbcd984df0
mapping of bottom and top for all bit modes work
2015-05-19 10:12:57 +02:00
1f1581a1fa
no_serial was merged to master
2015-05-13 14:41:25 +02:00
bd3466b04f
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-05-04 13:49:10 +02:00
ba377ec273
Command adcreg added to write to adc registers
2015-05-04 13:48:46 +02:00
9f8ed3a4b5
Added more debug messages for DMARTIN flag
2015-04-28 17:19:04 +02:00
7f7e7ca727
Fixed serial assignment. If top=1, serial=0 and vice versa.
2015-04-21 11:57:31 +02:00
8a8e1b7130
Remove -DMARTIN as default flag
2015-04-21 11:11:32 +02:00
399ae4e669
Added colors for MARTIN debug prints
2015-04-20 18:22:29 +02:00
39cd82f0b8
Added Backend board FPGA temperature support
2015-04-20 18:20:02 +02:00
0c2bd83e96
moved getchannel back to slsdetectordata as it doesnt work for eiger
2015-04-15 15:49:52 +02:00
e483141a15
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-04-15 14:49:32 +02:00
8f4c2001ae
warning fixed
2015-04-15 14:49:06 +02:00
83a766914f
not necessary merge
2015-04-15 14:48:27 +02:00
6b38ad10d1
eiger mapping of top
2015-04-15 14:43:37 +02:00
5731ead4cb
eiger top mapping done. bottom doesnt work
2015-04-15 14:38:32 +02:00
1f6c5c26b4
eiger mapping for 32 bit done
2015-04-14 17:13:09 +02:00
31f06fb567
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-04-10 10:08:34 +02:00
0c7f2bdceb
Changes to pattern generator and jungfrau server
2015-04-10 10:08:12 +02:00
904462b582
xmap, ymap added again to slsDetectorData
2015-04-01 13:04:27 +02:00
e0de23dd45
threshold to set all vcmp dacs for eiger
2015-04-01 12:17:55 +02:00
85416acbea
indiviual dac control for each detector enabled in gui
2015-04-01 12:05:09 +02:00
48d672b918
Moved eiger related stuff from slsDetectorData to eigerHalfModule data, added xmap and ymap to slsDetectorData calss
2015-03-31 15:07:53 +02:00
ee0c6c4a05
1 sec usleep to stop receiver for eiger
2015-03-31 15:00:57 +02:00
b4f995084c
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-03-31 14:59:49 +02:00
9d3a171a28
1 sec usleep to stop receiver for eiger
2015-03-31 14:59:26 +02:00
db4e6ea678
still messing up
2015-03-31 14:50:45 +02:00
3c363d82e8
messing up while updating and merging
2015-03-31 14:45:45 +02:00
5e59c86d72
Jungfrau10ModuleData modified
2015-03-31 14:41:06 +02:00
714e1a7f72
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-03-31 13:55:21 +02:00
1edcdff936
Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1
2015-03-31 13:54:59 +02:00
031ccdf070
change to server for no serial to work
2015-03-30 15:36:55 +02:00
70c98a663d
eiger mapping done
2015-03-27 17:42:23 +01:00
ea4f596077
removed conflicts
2015-03-26 11:29:29 +01:00
1611dde9d4
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detectors_package
2015-03-25 15:37:31 +01:00
24bcb04372
included flag for eiger fifo debug
2015-03-25 15:37:07 +01:00
1ad0bc56e7
included slsDetectorUsers
2015-03-25 15:26:38 +01:00
7924989fb1
some more changes for eiger mapping
2015-03-25 15:14:03 +01:00
9b11df1c31
a trial version of eiger mapping data
2015-03-24 10:42:22 +01:00
f461ddf2b7
slsDetectorUSers re-added to Makefile - don't remove it again
2015-03-23 15:42:12 +01:00
c9269d0f21
included a cstring include for compilation in slsReceiverData.h
2015-03-16 17:53:54 +01:00
36191396b2
added pull.sh and fetch.sh
2015-03-13 13:35:40 +01:00
5c14453c5d
fixed histogram issues
2015-03-13 11:20:00 +01:00
477b2fb467
acquire works properly now
2015-03-12 16:47:20 +01:00
2c6f0c49a7
lets gui know if old plot
2015-03-12 13:45:45 +01:00
7e44648da9
different between acquisition index and frame index
2015-03-12 12:22:19 +01:00
6232c6584a
put executables into git
2015-03-10 16:06:19 +01:00
7a2e42d59a
changed the way gui polls receiver for data for nth frame and otherwise
2015-03-10 15:03:08 +01:00
a37eb65dbc
new argv set merged
2015-03-06 10:57:06 +01:00
b091b7e1a9
Smallish changes?
2015-03-06 10:44:07 +01:00
71ad7ae2f0
some pointers deleted equalled to null
2015-03-05 15:30:21 +01:00
985b4d71b4
Added jungfrau1.0 data structure (bad) and added xmap, ymap and getPixel method to the slsDetectorData base class
2015-03-05 13:04:31 +01:00
cdd18182a8
resolved client side memory leak caused from gui
2015-03-04 16:24:03 +01:00
24b9402e52
eiger ensures the mac address is the same as the software mac address
2015-03-03 16:35:52 +01:00
7cca11637a
include gemmas 1 module testing as well as multi module testing for serial
2015-03-03 14:23:05 +01:00
848569b216
print receiver configurations and some error messages upon exit
2015-03-02 14:04:27 +01:00
2c69e45348
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-03-02 13:56:52 +01:00
85ccf64175
print receiver configurations for all detectors added
2015-03-02 13:56:23 +01:00
ed50f83fe6
Added extra debug messages (-DMARTIN)
2015-03-02 12:12:23 +01:00
875ee02038
got ridf of warnings for eiger server
2015-02-25 10:34:18 +01:00
2c2d2171d2
get the last frame in eiger with acquiringdone
2015-02-24 16:10:31 +01:00
3fa5191705
so that the dacs dont go negative in the gui, default timer reduced to 200ms so more frames can be shown
2015-02-23 15:26:14 +01:00
d658799b20
eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing
2015-02-23 15:18:02 +01:00
8a79e94fa8
Added draft of moench02 JCTB data
2015-02-20 11:39:35 +01:00
59c3d26c96
added script ot checkout
2015-02-18 13:48:08 +01:00
e3e7b3a885
eiger settings files
2015-02-13 15:29:11 +01:00
b2c7944014
type change in eiger server
2015-02-13 11:57:44 +01:00
81bcb29f75
no hardcoded beb numbers
2015-02-12 12:08:21 +01:00
8863a9f880
no change
2015-02-11 11:22:54 +01:00
b54f3628ae
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-02-10 16:00:09 +01:00
5c34db9cb1
Merge branch 'dhanya_devel'
2015-02-10 14:43:17 +01:00
c69ddad821
jungfrau detector server starts in CPU_NOT_10GB mode; ADC VREF put to 1V
2015-02-10 10:16:43 +01:00
5735aff30c
Added Moench03 common mode and photon finder/pedestal funcs
2015-02-10 10:15:16 +01:00
4f84bb19da
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2015-02-04 09:28:09 +01:00
aeffb4b93f
get detector and receiver status bug fixed
2015-02-02 16:31:28 +01:00
9ac08e5e76
supports frames with many samples for jctb - obtained by faking number of chips in case of many samples
2015-01-30 12:58:53 +01:00
058f988586
Merge branch 'master' into dhanya_devel
2015-01-29 15:15:16 +01:00
05755617f4
possibility of reading images, pedestal etc. for moench03 implemented
2015-01-29 11:20:24 +01:00
02a69a0a6c
moench03Ctb data structure and readout funcs added
2015-01-27 17:34:20 +01:00
36d6538104
got rid of segmentation fault in update offfsets
2015-01-26 16:57:03 +01:00
4a755d96ce
revision update
2015-01-14 10:43:41 +01:00
d1aa3021fb
includes handling dynamic range for multiple receivers for eiger
2015-01-14 10:18:54 +01:00
a149d7fb2e
usleep adeed to reduce CPU consumption
2015-01-08 10:29:30 +01:00
faca56f2e3
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-12-19 14:29:06 +01:00
785f025d1b
Jungfrau server with changed ADC phase
2014-12-19 14:28:41 +01:00
f88cc1c47d
merged branch devel
2014-12-11 14:31:53 +01:00
255f9e3fee
eiger: trimbits changed such that it works for multi modules, ;general: loading multislsdetectr list with y dir first, updating the readframefromreceiver to load all the data interswapped for 16 bit; nthframe works better
2014-12-11 14:16:43 +01:00
193c62dc42
updating version numbers
2014-12-08 10:20:09 +01:00
08a1034f63
back to only top gettgn acquisition
2014-12-08 10:16:31 +01:00
0184970ef9
default dac values for eiger
2014-12-04 16:16:06 +01:00
294a8a3098
no change
2014-12-04 11:20:15 +01:00
d76200e68d
bottom allowed
2014-12-04 10:49:15 +01:00
94a73ecd45
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-12-03 10:23:25 +01:00
8eea6f1d83
Mofifications to jungfrau server and pattern generator
2014-12-03 10:23:05 +01:00
8dd7772bfe
stop server automatic for gemma
2014-12-02 16:12:45 +01:00
28b7a73b13
working version for eiger detector before branching to gemma
2014-12-01 17:15:31 +01:00
8dc41efad2
changed to linux argument type with --
2014-12-01 10:54:31 +01:00
f79f8558f0
mostly to do with better testing methods in eiger server and separating acquisition, inclding start receiver etc
2014-11-28 14:26:47 +01:00
4649de2742
some changes for better testing in eiger server, including using set receiver, and changed to top/bottom instead of master slave
2014-11-28 14:26:19 +01:00
9ad65bc374
First commit
2014-11-27 09:30:14 +01:00
5fe8c6e457
multiSlsDetector merging fixed
2014-11-25 12:00:08 +01:00
91344f54d9
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
...
Conflicts:
multiSlsDetector/multiSlsDetector.cpp
2014-11-25 11:46:34 +01:00
d10335e4a9
pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency
2014-11-25 11:38:19 +01:00
3921dc2bf8
added DEBUG flags
...
added REST, DEBUG description in make help
2014-11-18 10:50:38 +01:00
ceb2d28281
symbolic link corrected to point ot correct location
2014-11-17 17:00:38 +01:00
3548ca5750
symbolic link corrected to point ot correct location
2014-11-17 16:57:54 +01:00
9a43fb4082
put REST=no as default
2014-11-17 15:59:11 +01:00
9b8325bd37
Merge branch 'master' into eiger_receiver
2014-11-17 15:04:42 +01:00
02ab7a4ed0
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-11-17 15:00:32 +01:00
769f9b7e76
Merge branch 'master' into eiger_receiver
2014-11-17 14:59:41 +01:00
cc6ee10e10
added a temp eiger setup file in settingsdir
2014-11-17 14:48:35 +01:00
194b41bfc5
changes to get index in eiger server
2014-11-17 14:46:28 +01:00
b24f374155
setting number of frames had a bug in eiger server, refactored code a bit
2014-10-20 17:33:22 +02:00
5acb1419af
the version given to esrf
2014-10-16 14:14:34 +02:00
dd8f48929c
the version given to esrf
2014-10-16 14:14:00 +02:00
5a5372350f
stop server incl in makefile, master chosen based on top or bottom module at the moment
2014-10-16 13:49:56 +02:00
327c2106df
Some fixes for the CTB
2014-10-14 17:43:25 +02:00
74ef04e726
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-10-14 17:03:50 +02:00
308b3aa9b1
Client and jungfrau server funcs added for pattern generator
2014-10-14 17:03:13 +02:00
0896fb137f
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-10-14 15:39:11 +02:00
bbf26927dd
full module server works now, slave and master yet to be done
2014-10-14 15:38:45 +02:00
347a36b7c1
module acquisition works, edit getrunstatus, added a small code for master incomplete, adjusted server to look for element in position 1 instead of zero
2014-10-06 11:01:51 +02:00
1679977cad
some eiger setup file changes
2014-10-06 10:56:01 +02:00
2d66e1f731
Added pattern generator - must still implement client-server commands
2014-10-03 10:43:12 +02:00
18188cd095
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-10-01 10:39:23 +02:00
fec9a30e6a
Added jungfrau detector server (not functional, though)
2014-10-01 10:38:47 +02:00
d8c7201749
module udpport2
2014-09-26 11:18:59 +02:00
fa6ab0b324
usleep added for 32 bit mode and debug statements for eiger server
2014-09-16 16:31:51 +02:00
4971e26d7b
modified Makefiles to support REST interface
2014-09-15 16:51:59 +02:00
3d4b2e9fee
Merge branch 'eiger_receiver_temp' into eiger_receiver
...
Conflicts:
client/Makefile
2014-09-12 16:22:59 +02:00
13a54224eb
updating makefiles
2014-09-12 16:22:22 +02:00
03b04bca74
Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_detectors_package into eiger_receiver
...
Conflicts:
Makefile
2014-09-12 16:18:34 +02:00
388f96c046
Makefile updates
2014-09-12 16:16:10 +02:00
056fb4e119
updating Makefile
2014-09-12 13:47:19 +02:00
81132f4d78
updating Makefile
2014-09-12 13:47:05 +02:00
102f9a2d05
updating Makefile
2014-09-12 13:46:48 +02:00
baf65e8318
some clone changes and setting the gui image read frequency to be one for eiger in gui
2014-09-10 14:39:02 +02:00
92c56739d9
version
2014-09-09 17:01:25 +02:00
62464441ee
vtrimbit size and vthreshold common for eiger
2014-09-09 17:00:26 +02:00
0d66e62d10
fixed histogram for trimbits and threshold
2014-09-09 15:46:36 +02:00
205fc06200
trimbits work.
2014-09-09 15:43:18 +02:00
7faac70c3f
trimbits work.
2014-09-09 15:42:16 +02:00
705a25c9e0
fixed moench dac error
2014-08-29 16:42:26 +02:00
c5a4f357bf
got rid of extra servers for eiger, converted to c and it works
2014-08-29 16:41:19 +02:00
10ca7c10e8
got rid of extra servers for eiger, converted to c and it works
2014-08-29 16:40:27 +02:00
367bdd9c2f
no change
2014-08-08 14:03:30 +02:00
c33657f04d
histogram for 2d and s curves
2014-08-05 11:30:36 +02:00
b50da5b198
updated makefile for eiger receiver
2014-08-05 11:05:24 +02:00
8a26eef0bf
scans for 2d detectors should read every frame
2014-07-31 12:14:09 +02:00
56da3f42cc
trimbits not working yet, nth frame works for eiger, scans work for eiger
2014-07-31 12:11:33 +02:00
7e46a407c6
added trimval function, but sending trimbits from char to int bug
2014-07-21 16:39:36 +02:00
e15d6077df
small changes with trimbits
2014-07-18 17:38:39 +02:00
c4f8c4a2aa
set_dac function updated for mythen and gotthard as well
2014-07-18 10:29:27 +02:00
e53058640b
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-07-18 09:40:11 +02:00
8cee0a7332
implemented setModule, setTrimbits function
2014-07-18 09:39:27 +02:00
95947778c5
tried some stuff with ifg
2014-07-16 15:09:26 +02:00
024e386f50
gotthard executable has mv in server
2014-07-16 10:48:07 +02:00
5e6153af9e
fixed bug mv in dacs for command line
2014-07-16 10:45:35 +02:00
fd6bf1d34b
added slsdetectorcalibration to gitignore
2014-07-16 10:44:53 +02:00
8b119f58ee
switching master branch with separate_receiver branch
...
Merge branch 'master' into separate_receiver
2014-07-14 14:28:36 +02:00
b388d08dbe
eiger dac settings
2014-07-11 16:59:09 +02:00
828a2dbd17
10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file
2014-07-11 13:06:48 +02:00
7c58d3db46
enabling 10Gbe for eiger, advanced settings and also mV for dacs for all detectors
2014-07-11 12:56:11 +02:00
e11da6fd5b
eiger dac files updated with dac units instead of mV
2014-07-11 12:51:42 +02:00
baac5df54e
Julia's first test :)
2014-07-03 14:47:30 +02:00
b5193b9bc3
no change
2014-07-03 14:03:31 +02:00
34f3ba80f5
git ignore added
2014-07-03 13:59:11 +02:00
4d9bbeecc3
eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working
2014-07-02 10:57:03 +02:00
018b800117
eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working
2014-07-02 10:55:32 +02:00
b256e0b9e3
included eiger dacs to gui
2014-06-18 16:39:11 +02:00
b29879511b
get status works in eiger server
2014-06-18 16:37:35 +02:00
cf52d85f73
getdata from commandline was getting stuck:fixed,eiger server remembers frame and exptime period cuz getstatus doesn work for now, request images, added setting image number in eigerserver, packetsize fixed in eigerserver
2014-06-16 17:00:21 +02:00
0eaecc0e12
git version history
2014-06-03 13:56:39 +02:00
73ba765647
git version history
2014-06-03 13:55:41 +02:00
35035405a0
git version history
2014-06-03 12:26:45 +02:00
c985124b51
git version history
2014-06-03 12:07:35 +02:00
3d9071a0bb
git version history
2014-06-03 12:03:37 +02:00
8538e00f9e
checking rev numbers
2014-06-02 11:46:01 +02:00
4a97b38329
included back end functions ot the server
2014-06-02 11:11:33 +02:00
3b83d8183d
reaf frame should not include start acquisition: eiger server
2014-06-02 11:03:55 +02:00
0ee11cffb3
merged Ians section of the code and added a few functionalities
2014-05-28 18:04:26 +02:00
de319249cd
latest update from Ian in eiger server
2014-05-27 15:03:08 +02:00
5fcec01a31
included configuremac in eigerserver
2014-05-26 18:01:52 +02:00
28a8a3c79f
opened the eiger detector server to configuremac commands
2014-05-26 17:09:26 +02:00
4677f19437
separate receiver, and updated docs
2014-05-26 17:07:55 +02:00
1f2c98b0fa
included the stop for receiver users, and the start returns
2014-05-23 18:24:52 +02:00
891c67f3d0
added gitignore for gui
2014-05-23 14:52:12 +02:00
1bd69fa18f
opened client command interface to the users class
2014-05-23 14:48:34 +02:00
75db3914f2
included more options in user client example, included these in the Makefile
2014-05-23 14:46:54 +02:00
188697b6da
included more options in user client example, included these in the Makefile
2014-05-23 14:46:15 +02:00
6a3ee7fa77
receiverusers link corrected in manual
2014-05-22 14:03:08 +02:00
490830c94c
no change really
2014-05-22 11:13:22 +02:00
abab3e53ad
calibration wizards temp make solution
2014-05-21 15:16:31 +02:00
d2d5b23f7b
calibration wizards temp make solution
2014-05-21 15:14:17 +02:00
0720625360
to ignore binary files
2014-05-21 10:38:41 +02:00
a754b7928b
dded bin to gitignore
2014-05-21 10:35:17 +02:00
81d863110c
included exectuable folder and eclipse files in ignore
2014-05-21 10:30:05 +02:00
8788a060dd
creating a separate receiver
2014-05-21 09:44:35 +02:00
4958d198d1
post processing does not wait if more than one positions-Annas change
2014-05-20 17:36:24 +02:00
ea1878f848
changes in makefile to make a separate receiver
2014-05-20 17:17:20 +02:00
96481b2b25
changes to create the new receiver
2014-05-20 16:56:51 +02:00
34598e9ff2
empty commit
...
new file: .gitignore
modified: Makefile
2014-05-19 12:14:52 +02:00
c19bded2a5
test
2014-04-23 09:17:38 +02:00
2609e249ab
Solved problem with MYTHEN readout
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@820 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-17 14:23:42 +00:00
c352fbec21
reverted singlephotondetector and slreceiverdata
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@51 113b152e-814d-439b-b186-022a431db7b5
2014-04-10 12:48:55 +00:00
f8aeb91752
put in the myroot1 definition
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@50 113b152e-814d-439b-b186-022a431db7b5
2014-04-10 09:08:13 +00:00
2eb798840d
root sls
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@73 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2014-04-09 15:57:09 +00:00
9c5e2aa5b7
compiling with and without root defined in makefile.include
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@269 af1100a4-978c-4157-bff7-07162d2ba061
2014-04-09 10:29:11 +00:00
a79046162f
compiling with and without root defined in makefile.include
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@819 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-09 10:28:53 +00:00
9b05e59ebc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@49 113b152e-814d-439b-b186-022a431db7b5
2014-04-08 14:17:49 +00:00
9297b14500
Jungfrau stuff updated
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@48 113b152e-814d-439b-b186-022a431db7b5
2014-04-08 12:42:57 +00:00
02c4a5e18e
Makefile sala refined
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@268 af1100a4-978c-4157-bff7-07162d2ba061
2014-04-07 15:50:23 +00:00
49ea26abb2
Makefile sala refined
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@818 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-07 15:49:59 +00:00
61781748bb
Makefile sala refined
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@72 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2014-04-07 15:49:06 +00:00
1b2aba80a5
got rid of parameters such as compression and det type in receiver, theymust be sent from client to receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@817 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-07 14:08:07 +00:00
0f881677d2
quite moenchTree creator for first nanoscope beamtime
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@47 113b152e-814d-439b-b186-022a431db7b5
2014-04-05 09:39:32 +00:00
58d3de174f
fixed set dac problem for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@816 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-02 13:11:47 +00:00
73261a3071
eiger specific for settings to work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@815 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 14:24:53 +00:00
dd6b0a3470
sala Makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@814 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 10:01:51 +00:00
d364374892
sala Makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@71 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2014-04-01 10:01:46 +00:00
b4b69ade5f
set settings for eiger drafts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@813 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 08:48:06 +00:00
83064243e1
set settings for eiger drafts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@812 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 08:46:00 +00:00
5ab4a88ec5
set settings for eiger drafts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@811 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 08:43:39 +00:00
ac350640f3
getmoduleid etc does not apply to eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@810 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 08:43:04 +00:00
bf2d8937f4
got rid of trigger frame and trigger window to merge with other timing modes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@267 af1100a4-978c-4157-bff7-07162d2ba061
2014-03-26 14:06:59 +00:00
c45c417a0a
got rid of trigger frame and trigger window to merge with other timing modes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@809 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-26 14:06:48 +00:00
ef983c151f
small variation
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@266 af1100a4-978c-4157-bff7-07162d2ba061
2014-03-26 10:07:27 +00:00
327db21c59
small variation
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@808 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-26 10:07:15 +00:00
a1bd5cdae6
sala ifdef for now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@807 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-26 09:07:46 +00:00
4eb233cdf0
reverted Makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@806 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-25 16:05:31 +00:00
9229b06e75
reverted Makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@805 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-25 16:04:58 +00:00
5d5319caeb
included over write functions in eiger class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@804 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-25 16:00:27 +00:00
e1db8224c3
included over write functions in eiger class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@70 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2014-03-25 15:57:10 +00:00
8b833b0f7e
removed salas code for the time being, implemented overwrite, fixed prob of communciating between detector and receiver for settimer
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@803 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-25 15:32:12 +00:00
b743ab2d04
Added post_json methods
...
Added DoxyGen docs skeleton
Added Content-type
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@802 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-25 10:06:31 +00:00
7dccc4fc1a
enabled tests
...
code cleaned
added exceptions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@801 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-24 16:20:41 +00:00
87407b5529
not really sure about these changes... added timeout/exceptions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@800 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-24 16:20:41 +00:00
c44b8d34c7
first implementation of REST and JSON interfaces for eigerReceiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@799 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-24 14:03:44 +00:00
4d797fb3b1
returns implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@798 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-21 09:47:01 +00:00
1557cb1de8
set dynamic range implemented for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@797 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-20 16:10:25 +00:00
1607ddb096
start and stop receiver for eiger doesnt include transmitting stage. set timer sends to anz type of receiver the num frames and acq period
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@796 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-20 10:23:19 +00:00
fb40e2236e
changes from pcmoench01
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@46 113b152e-814d-439b-b186-022a431db7b5
2014-03-19 17:02:17 +00:00
b6d18131e8
got rid of sending to detector for sending via cpu flag . not needed for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@795 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-18 16:43:09 +00:00
ecab716f0a
calling eiger class functions, default filename run
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@794 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-18 16:28:13 +00:00
ec88d57127
the basic functions connected to eiger class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@793 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-18 16:10:41 +00:00
1191fe5674
got rid of egier_reciver ifdef and reorganized the slreceiverfunctionlist
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@792 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-18 15:51:58 +00:00
f25e016f64
removed eiger flag as this is default
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@791 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-18 10:34:50 +00:00
aba94872fa
give proper credits for DEBUG(x) macro, I got it from http://stackoverflow.com/a/14256296 ( http://stackoverflow.com/questions/14251038/debug-macros-in-c )
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@790 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-17 20:51:57 +00:00
3ec2a602c2
add getStatus() method to EigerReceiverImplementation.
...
implement basic configuration cache for EigerReceiverImplementation
adapt eigerReceiverTest to do more checks and make output more readable
improve error tests in EigerReceiverImplementation::initialize()
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@789 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-17 20:37:10 +00:00
540c3b1971
make all get*() member functions const member functions - looks natural, get*() methods shouldn't change state.
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@788 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-17 18:44:43 +00:00
d29660cad8
add DEBUG(x) macro, remove all those std::cout << .... for debugging.
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@787 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-17 18:35:56 +00:00
2edfb74bcd
commented out
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@786 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 11:31:10 +00:00
7dcf83ab28
gt server workign back in c for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@785 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 11:01:32 +00:00
f6b9f58721
few receiver functionalities implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@784 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 11:00:31 +00:00
91c59ce65e
setdethostname not required and get detect hostname should return null if uninitialized
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@783 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:58:26 +00:00
899d9d3a9c
some eiger rxr functionalities implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@782 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:57:24 +00:00
3a9e6a1f97
some eiger rxr functionalities implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@781 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:57:18 +00:00
6bb5493893
eiger sends #frames to rxr and gotthard send acp period to rxr. fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@780 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:56:27 +00:00
549bd32527
eiger basic functionalities implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@779 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:55:31 +00:00
7b51dc1d89
eiger basic functionalities implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@778 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:55:14 +00:00
a526dcd50c
eiger basic functionalities implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@777 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:55:01 +00:00
081cf468e1
eiger basic functionalities implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@776 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:54:42 +00:00
8a8ee59474
fixed bug in settings frmes for eiger and not for gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@775 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 10:08:52 +00:00
36171dc5a0
changed #triggers to #frames for trigger frame and trigger window for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@265 af1100a4-978c-4157-bff7-07162d2ba061
2014-03-13 14:19:43 +00:00
6d708e620a
changed #triggers to #frames for trigger frame and trigger window for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@264 af1100a4-978c-4157-bff7-07162d2ba061
2014-03-13 14:13:58 +00:00
4f4d8d4caf
eigerhighlevel unsigned dac
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@774 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-13 12:54:03 +00:00
1cd85e9e49
Added run status function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@773 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-13 12:10:32 +00:00
cc96928049
Add High lelel functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@772 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-13 12:04:55 +00:00
e9bbc390da
Add High lelel functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@771 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-13 11:30:34 +00:00
0837c6b0a6
swapping ret when sending and then checking it to to send mess doesnt work. fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@770 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-12 10:15:09 +00:00
833dd75927
set dac should also return get dac
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@769 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-12 10:14:08 +00:00
9e5ede1b38
pccompile for eiger server
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@768 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-12 10:13:43 +00:00
636fb54ec7
swapping ret when sending and then checking it to to send mess doesnt work. fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@767 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-12 10:12:47 +00:00
204a71c51a
rename class eigerReceiver to EigerReceiver - start class names with a capital letter.
...
make class EigerReceiver an abstract base class with pure virtual public member functions.
So class EigerReceiver defines the interface, but does not expose the implementation.
Add a preliminary dummy implementation for EigerReceiver.
Add a test program eigerReceiverTest to test the newly created EigerReceiver class.
Modify the Makefile accordingly.
Example:
$ make eigerReceiverTest
g++ -DSLS_RECEIVER_FUNCTION_LIST -O3 -DEIGER_RECEIVER -c -o eigerReceiverTest.o eigerReceiverTest.cpp
g++ -DSLS_RECEIVER_FUNCTION_LIST -O3 -DEIGER_RECEIVER -c -o eigerReceiver.o eigerReceiver.cpp
g++ eigerReceiverTest.o eigerReceiver.o -o eigerReceiverTest
$ ./eigerReceiverTest
main: start EigerReceiver tests
create(): Return new EigerReceiverImplementation instance.
initialize() with: detectorHostName= detectors_host_name.
getFileName(): Return some_file_name.
main: got file name some_file_name
getFilePath(): Return some_path.
main: got path name some_path
getDynamicRange(): Return 16.
main: got dynamic range 16.
getScanTag(): return 4711.
main: got scan tag 4711.
setFileName() called with some_other_name.
getFileName(): Return some_file_name.
main: got file name some_file_name after setting to <some_other_name>
setFilePath() called withsome_other_path.
getFilePath(): Return some_path.
main: got file path some_path after setting to <some_other_path>
setDynamicRange() called with 8.
getDynamicRange(): Return 16.
main: got dynamic range 16 after setting it to 8.
setNumberOfFrames() called with 11.
getNumberOfFrames(): return 42.
enableFileWrite() called with 1.
startReceiver(): return 0.
stopReceiver(): return 0.
abort(): return 0.
getEnableFileWrite() returns 1.
getDetectorHostname(): Return some_host_name.
HeinerBillich/2014-03-11
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@766 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 16:51:55 +00:00
65d78d017e
changed dac into mV
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@765 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 14:17:27 +00:00
f854477aae
implemented sending hostname to the receiver for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@764 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 10:49:35 +00:00
bba0f46b58
change in ifdef eigerreciver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@763 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:33:14 +00:00
c74f4787cf
changed to set timer in receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@762 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:25:24 +00:00
ad22460b42
changed to set timer in receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@761 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:25:15 +00:00
5ac7f927d9
enable file write in eiger receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@760 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:24:35 +00:00
a9e4ee3c55
frame number form receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@759 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:24:08 +00:00
f1729dda30
frame number form receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@758 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:24:01 +00:00
a62ba56d78
frame number form receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@757 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:23:47 +00:00
c77520b20a
frame number form receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@756 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:23:29 +00:00
9478a5279c
frame number form receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@755 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:23:19 +00:00
d46250a34d
frame number form receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@754 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:22:46 +00:00
d6184610bb
included number of frames function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@753 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-10 16:16:06 +00:00
b0a3f7d61e
added eiger specific files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@752 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-10 15:26:10 +00:00
79c94ad233
added eiger specific files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@751 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-10 15:15:46 +00:00
274f8ec5b2
incl eiger argument for reciver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@750 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-07 14:44:31 +00:00
98c0bd163e
included without root writing
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@45 113b152e-814d-439b-b186-022a431db7b5
2014-03-07 12:07:40 +00:00
583281b903
included without root writing
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@749 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-07 12:07:21 +00:00
c338de941d
bug fix changing prbes did not change other items as planned, signal lost
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@263 af1100a4-978c-4157-bff7-07162d2ba061
2014-03-04 14:18:07 +00:00
7f22b3ff99
changed number of files for compressed non root data to one
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@748 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-04 14:07:50 +00:00
f55aebc79b
minor changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@747 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-04 09:44:12 +00:00
dd1f4ca250
flag for saving both compressed and normal files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@746 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-04 09:34:04 +00:00
42cb3a02bb
compressionshould wait till files created
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@745 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-27 11:32:18 +00:00
8a5dd0a877
got rid of the time wait in creating files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@744 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-27 10:53:51 +00:00
e7d22b1b39
compression enabled in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@262 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-27 10:53:27 +00:00
7371aea454
compression files created in separate threads and nt in tcp
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@743 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-26 15:32:02 +00:00
a892a8854c
compression extended to client side with r_compression
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@742 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-24 14:58:36 +00:00
792e0f3845
create threads and destroy threads should work now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@741 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-20 14:16:06 +00:00
eee5f7f743
gotthard works for short frame
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@44 113b152e-814d-439b-b186-022a431db7b5
2014-02-20 13:24:52 +00:00
506ca8d6b0
gotthard works for short frame
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@740 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-20 13:24:40 +00:00
224f5cee90
incrmented precision of the precision on the angcallog
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@739 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-20 12:56:14 +00:00
400611f38a
gotthard compression bug fix with geteventtype iy going out of bounds
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@738 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-20 10:46:02 +00:00
44fb8230cf
gotthard compression works..without shortframe
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@43 113b152e-814d-439b-b186-022a431db7b5
2014-02-18 16:36:46 +00:00
1b88f322b3
gotthard compression works.. but no short frames
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@737 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-18 16:35:52 +00:00
26003dc867
added gotthard specific instructions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@42 113b152e-814d-439b-b186-022a431db7b5
2014-02-13 10:53:30 +00:00
45a93e827f
included compression for gotthard, but doesnt get data
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@736 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-13 10:51:21 +00:00
d0b12f4197
fixed a bug in measurement tab
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@261 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-12 09:23:56 +00:00
69524e61f4
does not refresh measurement tab upon clicking start
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@260 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-10 17:01:34 +00:00
7ebd1643ee
made measurement tab faster, not too many checks anymore
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@259 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-10 16:20:17 +00:00
c366c97023
tried to reduce the time to refresh measurement and settings tab
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@735 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-07 12:33:20 +00:00
f768886308
tried to reduce the time to refresh measurement and settings tab
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@258 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-07 12:33:07 +00:00
26c0520c10
semaphore just to check when it is over
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@734 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-06 17:25:18 +00:00
fcacc79f7b
reverted semaphore
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@733 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-06 17:05:09 +00:00
0a86011998
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@41 113b152e-814d-439b-b186-022a431db7b5
2014-02-06 15:45:08 +00:00
b90287e724
New: jungfrau02CommonMode.h. Some extra documentation for Jungfrau.
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@40 113b152e-814d-439b-b186-022a431db7b5
2014-02-06 15:38:26 +00:00
83405b70c8
replaced usleep which waits for queue to have data, with semaphores
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@732 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-06 14:54:01 +00:00
6b7d0d8c55
readJungfrauData works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@39 113b152e-814d-439b-b186-022a431db7b5
2014-02-06 10:46:11 +00:00
0e0ab98cd9
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@38 113b152e-814d-439b-b186-022a431db7b5
2014-02-06 10:43:38 +00:00
835fa04a30
added script to read jungfrau data
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@37 113b152e-814d-439b-b186-022a431db7b5
2014-02-06 10:27:50 +00:00
8c2ed9dcf4
jungfrau classes not work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@36 113b152e-814d-439b-b186-022a431db7b5
2014-02-06 09:54:10 +00:00
534be9f942
file dialogs now show option to show all files, trimbits is possible to open non existing file, copying clones does not get rid of the old plot
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@257 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-05 16:37:05 +00:00
a70b13d849
testing jungfrau stuff
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@35 113b152e-814d-439b-b186-022a431db7b5
2014-02-05 11:31:49 +00:00
33aee60ab6
now it should work also with jungfrau bis
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@34 113b152e-814d-439b-b186-022a431db7b5
2014-02-05 10:45:00 +00:00
02c85d4638
now it should work also with jungfrau
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@33 113b152e-814d-439b-b186-022a431db7b5
2014-02-05 10:43:14 +00:00
71c66775cc
added Jungrfau02 - does not really work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@32 113b152e-814d-439b-b186-022a431db7b5
2014-02-05 10:35:29 +00:00
dd26dccde4
some modifications and demos
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@31 113b152e-814d-439b-b186-022a431db7b5
2014-02-04 11:25:33 +00:00
28e0cae2e2
rescaled histogram plotting
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@256 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-04 11:22:58 +00:00
f3e58f95ea
quadrant finding moved to singlePhotnDetector class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@30 113b152e-814d-439b-b186-022a431db7b5
2014-02-03 13:58:07 +00:00
32e4af910d
to reduce warning in between plotting
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@255 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-03 13:10:53 +00:00
fea8670994
some modifications
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@29 113b152e-814d-439b-b186-022a431db7b5
2014-02-03 12:48:57 +00:00
922c7ede92
removed an extra settings check
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@254 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-31 16:32:31 +00:00
f5413637c4
changed the settings comments to include that it is loaded successfully
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@731 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-31 16:31:39 +00:00
78e6dccf46
fixed angular conversion crashing problem and got rid of unnecssary prints
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@253 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-31 14:12:14 +00:00
64d9223cb3
updated multi such that offsets are not updated if number of modules is just get
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@730 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-31 14:11:22 +00:00
f738b218e1
svn rev updates
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@252 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-30 17:52:00 +00:00
fded64f5b1
svn rev updates
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@729 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 17:51:45 +00:00
d9a5e7e2a5
got rid of unncessary printouts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@28 113b152e-814d-439b-b186-022a431db7b5
2014-01-30 17:51:11 +00:00
a1c58f152f
got rid of unncessary printouts and MyApplication inqDetectorMain does not work.so bak to original
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@251 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-30 17:50:41 +00:00
b1a13a601d
changed makefile back from epics, got rid of unnecessary print outs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@728 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 17:50:12 +00:00
382f5652ea
make it work for multi threaded compression receiver for moench only
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@727 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:41:22 +00:00
9e7bff2cdd
make it work for multi threaded compression receiver for moench only
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@726 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:41:17 +00:00
f3d130a64b
make it work for multi threaded compression receiver for moench only
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@725 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:41:06 +00:00
16b7458595
make it work for multi threaded compression receiver for moench only
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@724 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:40:56 +00:00
a39e828e3a
make it work for multi threaded compression receiver for moench only
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@723 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:40:45 +00:00
f4deb5856d
make it work for multi threaded compression receiver for moench only
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@722 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:40:38 +00:00
c0ed0e231d
make it work for multi threaded compression receiver for moench only
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@721 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:40:28 +00:00
50acdf5628
filter runs from 1..159
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@27 113b152e-814d-439b-b186-022a431db7b5
2014-01-29 12:52:21 +00:00
849c5eb190
multi threadet version of moenchReadData
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@26 113b152e-814d-439b-b186-022a431db7b5
2014-01-29 11:27:02 +00:00
b7bc8fd8e5
changes made for compression- works only for moench with 1 thread
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@720 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-28 15:20:03 +00:00
f08d4828d9
display images received after detector done but receiver still processing in case of compression
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@719 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-28 15:15:29 +00:00
635a33ea85
fixed bug when trimming
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@250 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-28 12:20:43 +00:00
a7ad6b5b66
solevd bug on trimbit retrieving
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@718 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-28 10:17:46 +00:00
5c245d6c62
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@25 113b152e-814d-439b-b186-022a431db7b5
2014-01-24 08:01:51 +00:00
c74ecc7894
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@24 113b152e-814d-439b-b186-022a431db7b5
2014-01-24 08:01:15 +00:00
fa060c5dc0
dummy change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@23 113b152e-814d-439b-b186-022a431db7b5
2014-01-21 09:24:24 +00:00
cbf781aba3
dummy change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@22 113b152e-814d-439b-b186-022a431db7b5
2014-01-21 09:23:53 +00:00
37a52ebd32
read all photon data
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@21 113b152e-814d-439b-b186-022a431db7b5
2014-01-20 16:34:49 +00:00
4d71f07cde
more debugging with moench
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@20 113b152e-814d-439b-b186-022a431db7b5
2014-01-20 16:16:08 +00:00
df64805059
bug in photon finder and memory leak corrected
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@19 113b152e-814d-439b-b186-022a431db7b5
2014-01-20 13:47:10 +00:00
154be62476
verbose removed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@717 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-17 08:26:21 +00:00
28ad4a1f8c
bug solved in angular data merging
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@716 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-17 08:25:42 +00:00
15e1ac8750
some debugs commented out
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@715 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-16 10:23:03 +00:00
e9d58fdee7
included cal lib
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@69 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2014-01-16 10:06:35 +00:00
0d0b1fd389
commented define myroot1 insinglephotondetector.h
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@18 113b152e-814d-439b-b186-022a431db7b5
2014-01-16 09:57:29 +00:00
0df39b24e9
moench should work as well.. without filer
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@714 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-16 09:46:33 +00:00
facbce62cf
Some bug fixes to slsReceiverData
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@17 113b152e-814d-439b-b186-022a431db7b5
2014-01-14 13:46:21 +00:00
172d452bb2
works for moench receiver without compression
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@713 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-10 16:11:28 +00:00
a4aa9d6d5c
got rid of unnecessary printout
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@712 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-10 14:39:58 +00:00
7d322231e5
got rid of unnecessary printout
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@711 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-10 14:39:30 +00:00
574f9cf566
common mode
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@16 113b152e-814d-439b-b186-022a431db7b5
2014-01-07 13:39:25 +00:00
3731bfd51e
removed checkinfinity flags
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@249 af1100a4-978c-4157-bff7-07162d2ba061
2013-12-17 10:31:54 +00:00
9517d4f0f2
some bugs in the analysis solved
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@710 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-17 10:28:36 +00:00
356801a3dd
improved packet loss statistics and multi threaded locking for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@709 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-17 09:30:46 +00:00
22f20507db
Some improved documentation
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@15 113b152e-814d-439b-b186-022a431db7b5
2013-12-16 16:01:20 +00:00
0287f3c8a9
Installation instructions updated with subbestions by Andrea Parenti (DESY)
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@68 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-12-16 10:59:40 +00:00
3fa2fe5392
corrected Makefile target install_inc
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@708 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-16 10:45:58 +00:00
a485e33e82
changed receiver to work with many writer threads for only receiver without compression
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@707 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-16 10:07:08 +00:00
4111c65e37
doxygen configuration file added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@14 113b152e-814d-439b-b186-022a431db7b5
2013-12-16 09:48:16 +00:00
8d09f061da
some doxy comments added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@13 113b152e-814d-439b-b186-022a431db7b5
2013-12-12 16:05:24 +00:00
1ae2d78bf5
general funcs for pedestal subtraction, common mode, photon finding developed and implemented specifically for moench
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@12 113b152e-814d-439b-b186-022a431db7b5
2013-12-11 09:56:09 +00:00
01f87cff96
added general class to detect photons
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@11 113b152e-814d-439b-b186-022a431db7b5
2013-12-09 10:26:50 +00:00
d2958eb0a4
single photon writer updated
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@706 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-05 14:51:29 +00:00
b8462e24ef
common mode subtraction now works for moench - bad channel mask added to the data structure
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@10 113b152e-814d-439b-b186-022a431db7b5
2013-12-04 11:12:13 +00:00
04239872b6
removed comments
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@705 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-03 15:11:42 +00:00
0df206e340
Some debugging concerning getRunStatus
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@704 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-03 15:04:11 +00:00
64616be52d
changes to slsreceiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@703 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-03 08:54:52 +00:00
a952077c1d
receiver show count how much listened to
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@702 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-29 12:08:08 +00:00
cf3e3db83e
gotthard example set up shouldnt hve probes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@67 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-11-29 11:57:21 +00:00
adb500c4a0
receiver modified: fifofreed using callback, last fifo freed after all the process, using locks for fifofree, updating currentframenum only in singlephoton if datacompression
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@701 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-29 11:39:22 +00:00
03d0d5e6cd
changes to receiver works for data compression. needs optimizing
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@700 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-28 14:33:16 +00:00
8e24fc7ef9
changes to receiver works for data compression. needs optimizing
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@699 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-28 14:31:03 +00:00
0c3f1d95b9
some debugging of the post processing funcs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@698 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-27 12:00:04 +00:00
dc15bccaa6
some debugging of the post processing funcs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@66 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-11-27 11:18:20 +00:00
5c1574ec90
updated binary of 2d to be negative an update the label enabling before each acquisition if disabled
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@248 af1100a4-978c-4157-bff7-07162d2ba061
2013-11-25 16:57:57 +00:00
6956ee3164
getting back to basics in zooming, using a flag to check for angle error
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@247 af1100a4-978c-4157-bff7-07162d2ba061
2013-11-25 16:00:35 +00:00
9f92f5cffa
getting back to basics in zooming, using a flag to check for angle error
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@246 af1100a4-978c-4157-bff7-07162d2ba061
2013-11-25 15:59:30 +00:00
4f7c6f633f
common mode subtraction implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@9 113b152e-814d-439b-b186-022a431db7b5
2013-11-25 11:03:04 +00:00
1ed2ba63b5
solved bug on the number of chans of multiSlsDetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@697 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-21 15:57:57 +00:00
3b3e4eb8c3
some more changes to receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@696 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-15 12:26:46 +00:00
ff856d91a4
some more changes to receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@695 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 16:12:37 +00:00
eb69cabb3f
some more changes to receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@694 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 15:19:03 +00:00
151725dd66
some more changes to receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@693 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 14:24:26 +00:00
0202d16d48
some more changes to receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@692 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 14:18:30 +00:00
00620db119
gui progress of receiver should be of frame index and not frames caught
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@691 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:37:45 +00:00
6faf3621d5
gui progress of receiver should be of frame index and not frames caught
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@690 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:35:36 +00:00
15f8ba344b
receiver complete change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@689 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:34:56 +00:00
3ce5db8f1d
receiver complete change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@688 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:34:47 +00:00
cd88aff756
receiver complete change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@687 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:34:31 +00:00
18fce607a6
receiver complete change.dont check out
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@686 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:33:54 +00:00
68ae219125
receiver complete change.dont check out
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@685 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 12:32:56 +00:00
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
37196f14ca
moenchReadData with ttree overwiting previous versions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@8 113b152e-814d-439b-b186-022a431db7b5
2013-11-06 11:13:25 +00:00
957c73e200
Generalized moenchReadData to generate tree and cluster histos file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@7 113b152e-814d-439b-b186-022a431db7b5
2013-11-06 11:10:01 +00:00
c562fff78b
generalized several funcs for hit finding and looping over meonch data
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@6 113b152e-814d-439b-b186-022a431db7b5
2013-10-24 11:47:48 +00:00
b652a8560d
moench multithread tree maker
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@5 113b152e-814d-439b-b186-022a431db7b5
2013-10-18 14:42:38 +00:00
b5992ed5b8
moench Tree Maker added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@4 113b152e-814d-439b-b186-022a431db7b5
2013-10-18 12:26:31 +00:00
11abebfe7e
moench data classes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@3 113b152e-814d-439b-b186-022a431db7b5
2013-10-18 08:20:55 +00:00
d421c0c9fe
checked in threshold changes to binary
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@245 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-14 08:33:40 +00:00
c32acebc35
fixed problem of period beign recalculated for each refresh
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@244 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-10 09:09:55 +00:00
b9fcbf4697
changed order to pedestal binary then accumulate, also fxed a bug in that
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@243 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-09 10:37:49 +00:00
1ac2c6d09b
minor change in couts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@683 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-04 12:04:35 +00:00
64ab43cb8c
included total packets to display
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@682 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-04 09:53:22 +00:00
560d61c343
moench send to gui unnecessary ones fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@681 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-04 09:37:51 +00:00
c7bc397098
changed 1d line color to black
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@242 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-04 08:58:10 +00:00
74cc08a766
included frameindexmask and frameindexoffset for moench
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@680 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-04 08:49:28 +00:00
a7c044ef17
small changes with singlePhotonFilter
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@679 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-04 08:48:50 +00:00
75f3420888
initialized filefd to null, else if receiver goes offline tries to close file which doesnt exist
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@678 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-04 08:48:08 +00:00
4c662270cd
fixed zooming problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@241 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-02 16:41:50 +00:00
83bcbeddc9
fixed receiver bug for moench mapping problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@677 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-02 16:40:15 +00:00
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
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
fbf853ea20
some more untested methods for single photon filter
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@674 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-02 14:19:26 +00:00
38570080b9
revered changed to old version for negative threshold
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@240 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-25 08:52:15 +00:00
a06a4ef8d7
reverted to old version for negative threshold
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@239 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-25 08:50:36 +00:00
5e4e52936b
spin poxes can get negative values for binary plotting
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@238 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-24 13:29:06 +00:00
6a1ffaeda0
added slsDetectorData class to readout (analog) detectors
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@2 113b152e-814d-439b-b186-022a431db7b5
2013-09-24 08:13:42 +00:00
e3df740901
bug fix filename with an underscore was a problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@237 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-20 13:11:57 +00:00
e7633f1e04
let threshold take negative numbers fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@236 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-20 10:25:40 +00:00
7ca31b2a62
Classes, Libraries and Functions for Characterization and Calibration of SLS Detectors. First import.
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@1 113b152e-814d-439b-b186-022a431db7b5
2013-09-19 14:30:30 +00:00
05d4290ace
included stoptimer bug fix and also screwing up period updates in measurement tab
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@235 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-18 15:29:21 +00:00
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
7b637e9cc6
DACS are integer by default
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@672 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-17 13:27:33 +00:00
4811001680
included files for data compression, saving only hits
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@671 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-17 09:29:26 +00:00
a86cf645ed
2nd ci, Eiger class added, DAC test
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@670 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 13:19:10 +00:00
41140c882a
2nd ci, Eiger class added, DAC test
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@669 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 13:18:02 +00:00
8f4a2cc182
Eiger class added, DAC test
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@668 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 13:17:11 +00:00
78d2fa5bc6
the right mapping for pc and moving includes below the c includes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@667 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 09:22:06 +00:00
ce7e801f03
reverted eiger.h to originals
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@666 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 07:02:39 +00:00
2218a2e7e5
corrected enums, typecasted mallocs, changed eiger server to compile only in c++
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@665 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 07:02:15 +00:00
99b0ea47b0
moved globals from commu.h to .c and used extern. This needed for eiger g++ server compiling. Also typecasted all the mallocs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@664 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 07:01:36 +00:00
23bbefd4a2
trying to get atomic circular fifo
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@663 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-12 10:06:03 +00:00
f908226713
typo meV -> eV
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@662 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-12 09:57:45 +00:00
fd9d627412
Added: embedded classes for Eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@661 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-04 14:26:52 +00:00
790966e3dd
semaphores , no usleep in receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@234 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-04 13:10:18 +00:00
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
e6c94a1d62
fixed the zooming problems for 2d
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@233 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-29 15:15:24 +00:00
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
88f0b089b4
fixed the zooming problems for 2d
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@232 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-28 15:17:36 +00:00
3c30ef71cf
fixed the zooming problems for 2d
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@231 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-28 15:02:17 +00:00
22de76c8b0
histogram included, improved ready every frame, and other stuff.. a working version
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@230 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-27 15:47:07 +00:00
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
cd6e67b618
mythenDetectorServer executable added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@657 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-26 10:22:25 +00:00
d9444121b7
pedestal correction
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@229 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-16 14:07:46 +00:00
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
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
061bd4251c
pedestalbug fixed, trylock changed to lock, binary has qtip
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@228 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-16 13:48:03 +00:00
3c92f26be7
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/slsDetectorGui@227 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-16 12:59:48 +00:00
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
97aa35a388
small error couts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@653 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-15 12:34:25 +00:00
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
505328bcaa
displaying statistics works now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@226 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-13 10:30:13 +00:00
e05ea6aa84
clearer error printout for gotthard cant set probes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@651 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-12 12:23:07 +00:00
58cf66cf10
clearer error printout for gotthard cant set probes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@650 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-12 12:22:19 +00:00
eb48b1c492
checking if probes or threshold ..shouldnt check if its the wrong detector unnecessary err printouts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@225 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-12 12:21:49 +00:00
440b244b66
checking conditions before trimming and settings include low noise now, so a few changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@224 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-12 10:28:42 +00:00
f2a77be1b2
layoutthreshold was disabled for mythen, changed that
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@223 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 14:30:10 +00:00
113ee269d4
added trimming checks
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@222 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 13:39:36 +00:00
038d3c11df
set maximum number for probes in gui as 3
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@221 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 09:56:15 +00:00
1274b5532c
set maximum number for probes in gui as 3
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@220 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 09:54:29 +00:00
daae091945
a HUGE number of changes in measurement tab, and changes probes to be still disabled until #frames>1 and set cycles to 1 if probes >1
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@219 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 09:53:28 +00:00
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
d6dccef65c
added the tip that probes are enabled only in expert mode
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@218 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-07 09:36:42 +00:00
ad6b9e3617
changed buffer size and max input queue in kernel
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@648 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-06 15:23:05 +00:00
4728ce7218
changing socket buffer size
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@647 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-06 14:46:06 +00:00
215a17ce2c
changing socket buffer size
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@646 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-06 14:14:27 +00:00
d1a3cf8ed8
changing socket buffer size
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@645 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-06 14:02:22 +00:00
d2839f1e5a
changed receiver buffer to proper 16mb
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@644 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-06 13:45:09 +00:00
2425d3f13c
can change path while receiver running
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@643 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-06 13:41:37 +00:00
543687ce9c
can change path while receiver running
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@642 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-06 10:34:49 +00:00
5036cdc357
included rx_tcpport in command line for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@641 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-06 10:12:47 +00:00
35d7359403
qdefs message changed everything from \n to <br>, helps for gray source as html
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@217 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-06 07:22:50 +00:00
ae35542193
ask before disabling file write and fixed the ccorrect source for it
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@216 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-05 15:36:36 +00:00
2c8df98bf8
included the error message source to debug errors because of too many slots and signals
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@215 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-05 14:57:40 +00:00
4f2f7639af
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/slsDetectorGui@214 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-30 14:55:17 +00:00
9cdbd74471
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/slsDetectorGui@213 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-30 14:50:01 +00:00
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
429c25142c
small change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@65 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-07-29 07:19:10 +00:00
16b8bb967c
proceed anyway if outdir doesnt exist implmented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@212 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-25 09:23:38 +00:00
500f83f0b4
got rid of checking for outdir in receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@639 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-25 09:23:09 +00:00
676fe91e57
change outdir for all receivers in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@211 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-24 13:17:47 +00:00
57e801e5ea
change outdir for all receivers in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@210 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-24 09:43:09 +00:00
77aec59da9
change outdir for all receivers in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@209 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-24 09:39:30 +00:00
68f360e395
change outdir for all receivers in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@208 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-24 09:38:55 +00:00
27a21cc258
change outdir for non receivers in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@207 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-24 08:31:30 +00:00
6ea6f44824
verifying output directory works for receiver based detectors.. before acquisition
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@206 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-23 08:39:15 +00:00
dde2d91139
changed the error message of outputdir doesn not exist
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@638 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-23 08:26:14 +00:00
b6145510ad
refresh output dir requires output dir to be set to really check if it exists
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@205 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-19 10:10:11 +00:00
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
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
d84f95456b
included accumulate, pedestal and binary
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@204 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-17 14:54:42 +00:00
34af5c9be0
temporary solution is to restart and restop state machine many times till it works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@635 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-16 15:11:13 +00:00
bac70754cb
added config file for 2 gotthard detectors
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@64 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-07-15 15:55:29 +00:00
12f48fb0d2
form used ampersand
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@203 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-12 12:44:23 +00:00
bca0799b84
fixed gui bug: time interval must be set before acquisition
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@202 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-12 10:27:16 +00:00
0aef2f3b81
updated svn
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@201 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-12 09:25:05 +00:00
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
adcf1e2e8c
looks at dac names in settings file for moench and gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@633 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-11 10:28:32 +00:00
f618ed439d
svn updated
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@200 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-11 09:07:14 +00:00
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
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
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
7f2730e02d
changed filenames to have detector number
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@63 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-07-10 15:56:55 +00:00
cf30612701
trying to find memory leak, deleted pointers etc
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@629 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-10 09:31:29 +00:00
390ca76130
small change in config file err msg
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@199 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-25 11:30:54 +00:00
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
c0e735c0b9
updated svn
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@198 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-21 14:28:45 +00:00
802095ebc6
updated svn
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@627 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:28:33 +00:00
a2767004da
edited the sending and receiving for modules for now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@626 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:27:28 +00:00
3aaca5296f
eiger:fixed module to be 1 and getmodule saves dacs to variables in server for now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@625 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:26:51 +00:00
19d3c1eb0c
fixed reading settings file for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@624 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:25:07 +00:00
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
5a2018fc6f
get id small change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@622 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:22:54 +00:00
ac860afd19
fixed settings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@62 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-06-21 14:19:41 +00:00
af22e53a16
eiger setting dac works now and setsettings.. need to work on trimbits
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@621 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-20 09:25:21 +00:00
6d4e5aa1af
eiger setting dac works now and setsettings.. need to work on trimbits
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@620 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-20 08:46:47 +00:00
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
dc06c6e40e
enum for idac works now..
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@618 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-20 08:45:43 +00:00
019b231a8c
update svn
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@197 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-19 09:34:58 +00:00
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
e1ba4ff34d
small bugs in nchan, nchip and dacs_int flag wasnt included
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@616 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:34:27 +00:00
f390b7bba7
small errors in read settings file for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@615 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:33:52 +00:00
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
157292ac68
small errors
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@613 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:32:13 +00:00
cb326e1f63
modified all the receive module, chip to be non struct and with an extra parameter for type
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@612 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:30:45 +00:00
3ab9107b8e
updated the eiger settings file to have everything in mV as we sent only int over network
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@61 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-06-19 09:26:39 +00:00
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
89a8871e22
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@610 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-17 13:40:47 +00:00
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
05b898b82c
eiger server definitions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@608 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-17 13:31:51 +00:00
1d5287d0a2
eiger server definitions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@607 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-17 13:26:17 +00:00
bff6dc0a0f
added eiger dacs and settings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@606 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-17 13:23:16 +00:00
5639202dad
changed gotthard settings file to have normal names which are checked when reading the settings file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@60 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-06-17 13:20:45 +00:00
769566cf95
removed blank space in settings file in eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@59 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-06-14 12:18:29 +00:00
e3509dc402
adding calibration to eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@58 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-06-14 10:39:10 +00:00
bb485949bf
checked in eiger exe
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@605 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-13 13:34:14 +00:00
99ff9eeaca
revision stuff
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@604 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-13 13:33:27 +00:00
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
453d9d9f92
updated eiger revision stuff
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@57 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-06-13 13:32:38 +00:00
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
419519a3d2
added some standard settings files for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@56 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-06-13 13:27:14 +00:00
6c6a7c2679
works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@601 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-13 08:10:56 +00:00
7a3a70105f
gotthard and moench communication files are links to the common
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@600 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-12 13:22:32 +00:00
bac6e91e24
gotthard and moench communication files are links to the common
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@599 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-12 13:22:16 +00:00
76ad99ada1
gotthard and moench communication files are links to the common
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@598 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-12 13:22:02 +00:00
e6f189201f
gotthard and moench communication files are links to the common
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@597 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-12 13:21:46 +00:00
d235182b10
gotthard and moench communication files are links to the common
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@596 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-12 13:21:24 +00:00
1cfab0e542
gotthard and moench communication files are links to the common
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@595 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-12 13:20:22 +00:00
6dfa75430c
svn info
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@196 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-12 10:24:55 +00:00
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
91adb03daa
temp changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@593 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-12 10:08:45 +00:00
5e4feb9705
basic common working version
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@592 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-11 11:44:46 +00:00
7b9e12f8ff
a rough working version
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@591 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-11 11:41:29 +00:00
d49a5cd7b4
bug fix: after cloning, signals still ocnnected
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@195 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-07 11:16:53 +00:00
378f7715b9
update svn number
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@194 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-03 08:18:34 +00:00
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
a9b18ab32e
fixed more files in rxr earlier bug
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@589 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 15:42:50 +00:00
78aaedf243
servers, setupdetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@588 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 13:50:41 +00:00
392129675c
packetloss for moench was weird,fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@587 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 13:50:10 +00:00
65fe046fef
basic changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@586 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 09:05:57 +00:00
bdbd91b485
basic changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@585 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 09:05:52 +00:00
b095e9cc9d
got rif of unncessary couts in receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@584 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 08:25:01 +00:00
6ace6f279a
some basic changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@583 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 08:24:38 +00:00
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
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
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
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
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
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
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
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
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
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
f0e30926fe
fixed part of mythen module 6 problem: offsets should be updated after set nmod, still need to fix numchips in one direction
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@542 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-06 16:23:13 +00:00
8e19beb410
changed to trackertextF for qwt6 to show z value for 2d plots
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@176 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-06 15:04:24 +00:00
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
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
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
675ab8ceca
bad channel not read on refresh or start up, makefile reverted to compile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@175 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-30 15:05:21 +00:00
35f151775e
some debugging at the beamline, still crashing sl6 64bit, angular conversion etc.
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@174 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-30 11:26:22 +00:00
88f3fe3b26
more debugging at the beamline
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@538 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-30 11:25:29 +00:00
711cb836c0
post processing debugging at the beamline
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@537 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-29 21:58:29 +00:00
3c3ab6fc9d
corrections to the angular conversion made at the beamline
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@536 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-29 08:46:47 +00:00
689a8a6b44
updated servers
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@535 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 15:44:34 +00:00
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
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
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
c4b9b00d93
confirm if it is really moench detector;optimized code;option to start moench server with gotthard module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@531 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 12:08:01 +00:00
f006d289a3
confirm if it is really moench detector;optimized code;option to start moench server with gotthard module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@530 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 12:07:49 +00:00
679a7dfd7e
a check in gotthard server to ensure that it is really gotthard and not moench module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@529 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 12:07:10 +00:00
fb47f3d4fc
a check in gotthard server to ensure that it is really gotthard and not moench module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@528 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 09:10:46 +00:00
671c30f30a
a check in gotthard server to ensure that it is really gotthard and not moench module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@527 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 09:02:40 +00:00
528b34d2b5
a check in gotthard server to ensure that it is really gotthard and not moench module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@526 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:59:28 +00:00
a7bc91da1d
a check in gotthard server to ensure that it is really gotthard and not moench module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@525 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:56:43 +00:00
2ada072803
a check in gotthard server to ensure that it is really gotthard and not moench module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@524 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:36:45 +00:00
055c557931
a check in gotthard server to ensure that it is really gotthard and not moench module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@523 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:36:29 +00:00
507debd7f4
a check in gotthard server to ensure that it is really gotthard and not moench module
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@522 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:29:43 +00:00
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
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
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
0efaaa5520
added moench and gotthard server exe
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@518 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-18 10:20:05 +00:00
178674432e
added moench and gotthard server exe
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@517 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-18 10:15:37 +00:00
fd80a8b628
changed the receiver to use mmap and msync instead of fwrite each time, so no botteleneck after some frames as before
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@516 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-18 09:06:43 +00:00
461a7029e7
added binary to svn
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@515 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-17 08:19:09 +00:00
a4a450f324
added moench to svn update
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@53 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-04-16 15:31:51 +00:00
4719fff09a
sample 2d plot
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@173 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-16 14:52:27 +00:00
c605c77037
adjusted gui for moench and proper 2d plots, which are not scans for 1ds
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@172 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-16 13:43:28 +00:00
ca15ff971d
added nchans for each dimension and edited update offsets to work better for 2d dets
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@514 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-16 13:39:58 +00:00
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
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
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
cb9de5973f
moench server compiles
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@510 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:53:34 +00:00
61a1356bc3
moench server first draft
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@509 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:44:19 +00:00
c5b3f10669
changed gotthard server type to be defined in makefile and not in mcb
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@508 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:32:26 +00:00
e4c61a230a
added moenchdetector server skeleton, copy of gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@507 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:23:13 +00:00
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
050bec703d
defining everything to reduce null pointer errors, fixed zooming problem for scans
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@171 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-10 13:34:52 +00:00
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
ef3afe8b0f
Added examples for client and receiver main
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@52 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-04-08 15:30:13 +00:00
8088e6231e
virtual servers can be compiled from top directory; include directory with users headers added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@504 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-08 12:40:28 +00:00
c004e72fbb
moved udpip before hostname for gotthard config
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@51 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-04-08 09:15:48 +00:00
5e4c2f30b4
static compilation now works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@503 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-05 10:54:56 +00:00
c559a43262
static compilation now works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@50 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-04-05 10:54:36 +00:00
1d159e676a
makefile updated to include the receiver in the library
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@502 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-05 08:15:10 +00:00
31044e7567
slsReceiverUsers added to API documentation
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@49 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-04-04 15:16:33 +00:00
a19c989dd9
slsReceiverUsers added to API documentation
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@48 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-04-04 15:16:04 +00:00
34a2f92cb4
slsReceiver now uses the slsReceiverUsers class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@501 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-04 09:46:16 +00:00
4a133d8f6e
Receiver API slsReceiverUsers implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@500 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-04 09:32:44 +00:00
d56b2b480b
edited the gui makefile to be able to compile withot errors from this directory
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@170 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-04 07:23:19 +00:00
b0870216a1
edited Makefile to allow compiling from this folder
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@499 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-03 08:33:41 +00:00
10e47581e0
gui_client more stable with 2 servers for stop and acquire
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@169 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-21 09:27:16 +00:00
303d84b24a
reduced gui_client crashes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@168 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-19 16:00:38 +00:00
8c06405622
reduced gui_client crashes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@498 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-19 16:00:25 +00:00
84c65b7884
sending struct over the network changed to sending each value because of 32 to 64 conversoin problems
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@497 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-18 14:46:59 +00:00
19ad1ae06e
file permissions problem crash in rxr fixed, increased usleep in postprocessing getting rxr data which gives better gui display, allowed for mythen and gotthard sending module compatibility for 64 bit temp solution
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@496 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-15 14:37:14 +00:00
922bc929c8
fixed connect receiver problem from previous version
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@495 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-15 11:02:57 +00:00
b7629f6c67
included a flag to print log or not
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@167 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-15 08:11:52 +00:00
a7dbfa91ce
changed multislsdetector class to check for error mask each time they call a slsdetector fucntion
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@494 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-15 08:11:11 +00:00
b26245da1d
compiles now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@493 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-14 14:28:27 +00:00
1f15f7d5cb
every function call in slsdetector also sets error mask if it was online and failed to connect
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@492 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-14 11:31:10 +00:00
ebd6a9131b
check error message in between implemented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@166 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:53:24 +00:00
b0534f194a
check error message in between implemented in gui, uncommented the displaying messages part
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@165 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:51:10 +00:00
7352407968
check error message in between implemented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@164 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:50:49 +00:00
3e81c16f38
check error message in between implemented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@163 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:50:41 +00:00
9e1029185f
check error message in between implemented in gui, also fixed wrong ports being set:control:stop
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@162 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:48:30 +00:00
db1aaf041a
check error message in between implemented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@161 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:47:19 +00:00
4ac8439202
check error message in between implemented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@160 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:46:35 +00:00
f809657ec4
check error message in between implemented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@159 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:45:49 +00:00
bef3745693
check error message in between implemented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@158 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:39:21 +00:00
5c78f148b6
check error message in between implemented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@157 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:38:57 +00:00
7675b47474
check error message in between implemented in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@156 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:38:33 +00:00
3e4f76ed07
slsdet clear errormask fixed, qmessage not printing and displog fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@155 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:36:37 +00:00
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
d205e79106
implemented SCHED_RR scheduling with priority in receiver-only if super user
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@490 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-08 15:27:25 +00:00
d89e405748
included the break needed for the second network card problem in genericsocket
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@489 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-08 13:22:36 +00:00
620e83821d
fixed the getnmod problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@488 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-08 13:21:59 +00:00
c65026792c
made sure read frame from receiver doesnt send a null for current filename
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@487 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-07 17:02:53 +00:00
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
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
96d9e5d078
some revision variable problem resolved in slsDetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@484 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-06 15:26:29 +00:00
ab41ffb6bf
there was a gap between start and get status
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@154 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-06 10:16:48 +00:00
217f63b701
Small change in the receiver concerning the data to the GUI
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@483 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-06 10:00:40 +00:00
448f333b1e
changed the makefiles a bit to be included in slsDetectorsPAckage make
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@153 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-06 09:41:21 +00:00
499cf4db56
forgot client makefile for gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@152 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-06 09:21:15 +00:00
8a87f17811
included makefile changes for gui client
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@151 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-06 09:18:46 +00:00
bf429705bf
svn rev changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@482 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-06 09:18:16 +00:00
16c9561fcd
Receiver changed passing only data array to fifos - fixed adata size given by bufferSize
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@481 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-05 16:02:10 +00:00
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
22b51032dd
client connecting to gui serveR done
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@150 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-04 15:27:57 +00:00
863b662c6b
gui client works for just getting status
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@149 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-01 13:21:07 +00:00
6aa90bba79
added default gui server port number
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@479 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-01 13:14:47 +00:00
e3d68d05c6
added latest changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@478 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-01 10:36:20 +00:00
9d8b621adf
got rid of eth taking weird values error and also checks for fifo empty before you stop writing data
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@477 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-27 10:13:22 +00:00
bb07b6db7d
UHRIX Callback function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@476 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 16:31:55 +00:00
3c26cac591
UHRIX Callback added to receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@475 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 16:25:37 +00:00
1ef4ace390
updated bug-crashing when file write disabled and included file pointer in call back function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@474 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 16:08:03 +00:00
28d2d64f51
defined a default and register call back function to write receiver data
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@473 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 10:19:05 +00:00
2fc324ab4b
made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@148 af1100a4-978c-4157-bff7-07162d2ba061
2013-02-26 08:35:20 +00:00
0e9b32fb33
made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@472 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 08:35:12 +00:00
0682d23abd
made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@147 af1100a4-978c-4157-bff7-07162d2ba061
2013-02-26 08:34:47 +00:00
3075b8ae11
made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@471 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 08:34:41 +00:00
460ffe0549
trying changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@470 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 08:34:35 +00:00
aae7c68f65
concatenated filenames for the gui when using receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@469 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-22 11:26:43 +00:00
642d7d8c74
previous checkin is not a working version
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@146 af1100a4-978c-4157-bff7-07162d2ba061
2013-02-22 09:54:06 +00:00
b98545814f
included setroi for multidet
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@468 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 16:09:57 +00:00
4814962347
included setroi for multidet
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@145 af1100a4-978c-4157-bff7-07162d2ba061
2013-02-21 16:00:44 +00:00
403813a509
included setroi for multidet
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@467 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:57:55 +00:00
5335e82100
included setroi for multidet
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@466 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:55:11 +00:00
1b6571500e
included setroi for multidet
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@465 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:54:27 +00:00
6022c9b29e
included setroi for multidet
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@464 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:53:44 +00:00
bc61fd4883
included setroi for multidet
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@463 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:53:07 +00:00
6adeca51ed
gotthardServer: added pedestal substraction function (not yet working properly).
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@462 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-15 17:13:26 +00:00
51a008784b
first time detector starts, chip of interest was not configured at all and this was never configured if via blackfin, fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@461 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-12 13:59:26 +00:00
a48ae49ae4
took off start state machine for startAndReadAll by mistake
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@460 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 17:22:46 +00:00
e324d5ec83
threshold for gottahrd shouldnt exist
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@459 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 13:54:14 +00:00
11eea73138
just fixed the links in gotthard server
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@458 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 13:46:16 +00:00
2a1755df50
just fixed the links in gotthard server
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@457 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 13:45:42 +00:00
4a4efda69f
added calibrate pedestal for gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@456 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 10:45:41 +00:00
2c9f05e8fd
added a virtual make file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@455 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 09:57:43 +00:00
f3eb9c924f
included network tab in gui, correctedmulti to be able to clear sls detectors error mask,included coud not set up network parameter error
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@144 af1100a4-978c-4157-bff7-07162d2ba061
2013-02-07 17:34:16 +00:00
35de710225
included network tab in gui, correctedmulti to be able to clear sls detectors error mask,included coud not set up network parameter error
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@454 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-07 17:34:09 +00:00
9fe499e20c
made ports reusable and added cannot connect to these ports in error class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@453 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-06 17:36:03 +00:00
aec136cf21
added error mask properly inherited by base; mask exist only for cannot connect to detector, receiver and could not configure mac
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@143 af1100a4-978c-4157-bff7-07162d2ba061
2013-02-06 15:23:35 +00:00
1d03be832f
added error mask properly inherited by base; mask exist only for cannot connect to detector, receiver and could not configure mac
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@452 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-06 15:22:45 +00:00
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
ed4aaa83ce
changed getframeindex and getacquisitionindex to return proper values without checking framescaught
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@450 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-04 16:04:19 +00:00
c420906b0c
uncommented the part about eth in slsreceiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@449 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-04 12:50:53 +00:00
aff0123672
a rough draft of send and rx via fifo with gerds bit file and software
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@448 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-04 12:45:50 +00:00
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
1d1e5e1202
included shortframe in gui for time being its just adc selection
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@142 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-31 15:42:04 +00:00
6b311f931b
included shortframe in gui for time being its just adc selection
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@141 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-31 15:34:31 +00:00
09d9e2fd03
forgot to check in error_defs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@446 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-31 12:40:28 +00:00
2ead554b7b
fixed browse to show in red when disabled browse button for receiver, got rid of error message showing,
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@140 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-31 11:15:38 +00:00
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
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
7d96d8b3af
tried fifo change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@443 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-30 14:33:39 +00:00
2176620ca4
server should be up to date
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@442 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-30 14:33:03 +00:00
1ee23e21d5
basic tcp communication with writing /reading to fpga PLB_LL_FIFO_REG_CTRL works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@441 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-29 16:34:02 +00:00
11924d1a51
forgot to add some files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@440 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:10:46 +00:00
a9d0a3faa4
forgot to add some files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@439 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:10:22 +00:00
39368180cb
forgot to add some files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@438 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:09:51 +00:00
2b31e23f75
forgot to add some server files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@437 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:08:22 +00:00
55bfeb6044
added eiger server to svn
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@436 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:05:55 +00:00
8f4f778928
updated manual directory
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@47 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-01-28 16:23:26 +00:00
1847eaf1d7
modified the server so that it has a firmware class as well to read/write fpga
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@435 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 08:02:37 +00:00
a4206208c9
implemented a trial error class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@434 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-22 11:16:37 +00:00
3be74327f3
fixed clean fifo roi_flag error(being set after cleanfifo called)
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@433 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-22 10:23:53 +00:00
64208d5edd
dataoutput browse button disabled help in red
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@139 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-22 09:45:24 +00:00
47a9d34991
corected the rx_udpport change segmentation fault
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@432 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-17 10:53:39 +00:00
0c529e09fb
with all the svn revisions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@138 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-16 13:59:41 +00:00
2c38aedcf8
with all the svn revisions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@431 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-16 13:59:30 +00:00
cff497337e
added gotthard sample gotthard setup file as well
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@46 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-01-16 13:56:34 +00:00
4c9dfa564e
changed gotthard config example
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@45 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-01-16 13:49:01 +00:00
4fca3d302a
cleaned up a bit of gotthard detector server side
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@430 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-16 10:39:38 +00:00
b10fedb8f3
cleared data in gui at beginning
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@137 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-16 10:19:14 +00:00
fc2e1cedee
probes was screwing up gotthard data, changed in places to be only for data
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@429 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-16 10:16:44 +00:00
b994e9d63f
added rx_tcpport to examples
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@44 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2013-01-15 18:08:45 +00:00
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
b94e9475a0
also catches cerr now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@136 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-15 17:36:04 +00:00
bb46b9afce
also catches cerr now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@135 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-15 17:28:59 +00:00
6a3747638d
also catches cerr now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@134 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-15 17:11:54 +00:00
f6a3254c2f
got rid of local host because pcname works on its own
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@427 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-15 10:26:37 +00:00
5d88f249a4
localhost works as a receiver now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@426 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-14 16:40:10 +00:00
ac79bb86fb
initialized everything in gui to get rid of the initialization error
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@133 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-11 17:21:37 +00:00
4cc8566311
included a current frame index whch is different than file frame index for gotthard, even when readout through blackfin, for mythen both will alwys be incrememnted by one; gotthard server all of them should be consistent for 32 bit
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@425 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 17:20:57 +00:00
0b05f67f9d
included sls defs in every file so that int is 32 bit
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@132 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-11 09:59:29 +00:00
9cfdbdac67
included sls defs first
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@424 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 09:59:09 +00:00
9f1825b193
uncommented ifdef verbose
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@423 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 09:52:35 +00:00
42fe126f33
by default readout through blackfin upon server startup
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@422 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 09:17:41 +00:00
da2fd8369d
not much change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@421 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 07:55:02 +00:00
af2d3d87b3
not really a change in the server, but this seems to have worked for cpu transfer after changing vhdl code
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@420 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-10 15:54:45 +00:00
1c275c28bd
the functions setspeed, setflags and execute trimming should do nothing in the server and send back a fail to client
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@419 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-09 10:12:53 +00:00
74654b1ebc
got rid of the weird ui look, which was due to windows style from afs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@131 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-08 16:28:32 +00:00
6560a325ce
no change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@130 af1100a4-978c-4157-bff7-07162d2ba061
2013-01-08 14:05:49 +00:00
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
6f793abca8
added receiver mac to be compatible with aldos receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@417 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-20 11:11:53 +00:00
f0ae4bfe31
removed exprtsoftware script outdated
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@43 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-19 17:08:39 +00:00
c21d674e89
changed uint in qDebugStream so that qtabmessages work on 64bit machine
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@129 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-18 16:33:30 +00:00
dbad2a41d8
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@128 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-18 15:21:09 +00:00
83342b6d5b
got rid of firmware svn version, combined with detector version
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@416 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-18 15:04:19 +00:00
5b4a90db29
checked in receiver svn info
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@415 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-18 15:02:09 +00:00
dd7385cd88
included -f in config file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@127 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-18 14:34:48 +00:00
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
c9c8527bb4
included svn receiver in script
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@42 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-18 14:34:03 +00:00
b59b54e004
got rid of segmentation fault while loading settings file which didnt refresh actions tab etc
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@126 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-18 12:07:45 +00:00
1d9ae4e316
updated server firmware and software versions to reflect an svn date plus svn rev
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@413 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 17:01:03 +00:00
8cad188c59
got rid of svnInfo class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@412 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 16:43:46 +00:00
46a4fee083
included the revision change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@125 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-17 16:39:25 +00:00
5bb8bc4574
svn version headers generated, but not yet implemented in the code
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@124 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-17 15:51:44 +00:00
5f74a469eb
svn version from svn works for text client
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@411 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 15:47:36 +00:00
c9a9d0103f
versioning scripts now work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@41 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 15:40:30 +00:00
587c03b246
Added scripts to update version headers
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@40 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 14:56:01 +00:00
b573014a02
changed makefile since gui has a different fodlername
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@39 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 14:49:59 +00:00
67d3e34c08
changed makefile since its directory has changed relatively
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@38 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 14:35:34 +00:00
2f058c89a6
changed client makefile since its directory has changed relatively
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@410 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 14:35:16 +00:00
3d6530f043
deleted a few unnecessary c files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@409 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 14:12:26 +00:00
499be37d0c
deleted all the detector classes since they are all combined now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@408 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 14:04:53 +00:00
4a47657b9e
using force to overwrite when exporting
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@37 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 08:21:17 +00:00
adc52782f8
gui svninfo added to script
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@123 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-14 13:45:38 +00:00
b4127fa31c
gui svninfo added to script
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@36 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-14 13:45:23 +00:00
df144d90f1
added exportsoftware script which exports software and creates the svninfo.txt file for slsdetectorsoftware. others to be implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@35 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-14 12:56:49 +00:00
824e4458ec
removed docs from Makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@34 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-13 11:38:08 +00:00
4ccb47203e
manual removed from makefiile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@122 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-13 11:36:50 +00:00
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
101c3b17ef
examples directory with config files and scripts added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@33 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-13 11:23:05 +00:00
27ef53da4a
made some change in static member used as index to avoid compile time error with new gcc
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@121 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-05 08:48:57 +00:00
3acf9bd469
docs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@32 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-04 15:54:52 +00:00
1e705df5dc
docs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@120 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-04 15:46:18 +00:00
c841c1111c
test2
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@31 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-04 15:41:23 +00:00
2405c70805
some docs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@30 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-04 15:36:02 +00:00
bbb6e21607
included pedestal and also moved the frame index out of graph so it doesnt keep moving
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@119 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-30 17:05:06 +00:00
382554afe9
included spacebar as a shortcut to start and stop acq
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@118 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-30 09:51:52 +00:00
0b8f6cc925
changed the check for is a file using stat and not looking for a dot in file name
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@117 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-26 15:54:22 +00:00
95741a1c33
project file finally ok
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@116 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-22 10:11:54 +00:00
90e219d402
makefile again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@115 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-22 08:29:47 +00:00
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
b32937f541
makefile again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@29 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-22 08:29:19 +00:00
29a9678d3b
makefile changed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@114 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-21 09:01:33 +00:00
2ba3823c69
makefile changed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@28 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-21 09:00:59 +00:00
832287af9e
fixed filedir for gotthard receiver problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@113 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-15 13:53:08 +00:00
f201a6a32b
for receiver, display frame number since not in filename
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@112 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-15 11:18:56 +00:00
7a6bba3c77
fixed the problem with multiple frame scan, frame index and file index included in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@111 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-14 13:39:04 +00:00
6e529f1c06
warings suppressed (directly with flag in .pro)
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@110 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-14 11:37:40 +00:00
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
bc1c3522d8
standard ch0 trimbit OK again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@27 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-13 09:20:42 +00:00
4a8f89cea8
high gain trimbit OK again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@26 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-13 09:20:24 +00:00
4f016db0c9
include gui in makefile,was commented out
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@25 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-13 08:38:42 +00:00
854015532e
gotthard works with receiver without tcp lock
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@109 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-12 15:47:55 +00:00
ba923b55b7
updated gui to work with receiver, start and stop receiver, show progress using callback
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@108 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-07 17:01:24 +00:00
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
716b3530e8
zero value in 2D plot set to BG, logZ does not crash any longer (?)
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@107 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-25 08:37:18 +00:00
4d47efb847
changed slsDetectorReceiver to slsReceiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@24 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-10-24 13:11:31 +00:00
98945dce88
including receiver in makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@23 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-10-24 12:34:14 +00:00
de6836493c
Makefile adjusted for nonstatic
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@22 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-10-24 11:56:51 +00:00
80e0cd7fa1
qwtsrc was commented out in pro file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@106 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-24 11:52:55 +00:00
d083d80a29
got rid of sample plot for 2d again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@105 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-24 11:47:20 +00:00
3759b48c6e
editted QDrawPlot to include sample plot just before they do a 2d scan
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@104 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-24 11:35:16 +00:00
07ff5ce42d
Some problems with LogZ solved, but stil crashing when unsetting logZ
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@103 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-24 10:39:05 +00:00
3e979fdece
finally works also with qwt6 - 2D plot color scales changed to root's
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@102 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-24 09:44:31 +00:00
1d03067bd5
works with qwt5, but qwt6 except for 2D plots
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@101 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-23 10:30:32 +00:00
8715a416a0
Changes for Qwt6, but 2D plot still does not work...and should be checked if Qwt5 still works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@100 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-22 15:34:14 +00:00
6cec748335
added the buttons
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@99 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-22 14:10:32 +00:00
04e04db2ad
problem with segmentation fault when trying to capture config loading logs at start:fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@98 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-19 10:21:56 +00:00
ce110a79c8
some small changes to comly with qt4.7 version..but it still does not work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@97 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-18 15:28:57 +00:00
34b3a8b01b
bugfix: catching config count at the beginning caused it to crash. now it works without crashing. still to catch cerr output
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@96 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-16 09:44:09 +00:00
e104b1d529
messages capture config output, still to find a way to capture all cerr output
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@95 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-16 08:29:44 +00:00
863662a5eb
enhancement: logy with arrow buttons
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@94 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-12 14:12:20 +00:00
353e9baa78
got rid of some unnecessary coutlines in plotting by dhanya
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@93 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-12 12:16:58 +00:00
4ada872aaa
histogram for 1d detectors without scan implemened
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@92 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-12 11:58:47 +00:00
51faab3c7c
enhancement:nth frame changed to red, instead of error and changing it back
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@91 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-11 09:17:54 +00:00
19b6ca2eda
enhancement:nth frame changed to red, instead of error and changing it back
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@90 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-11 08:57:09 +00:00
f4dc6aab22
enhancement:nth frame changed to red, instead of error and changing it back
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@89 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-11 08:36:11 +00:00
ad171a3257
enhancement:plotting interval changed to red for error
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@88 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-10 15:42:23 +00:00
55f7145b1b
bugfix:settings undefined and uninitialized not disabled anymore
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@87 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-10 12:12:00 +00:00
87410f09de
check if outdir exists,indent Actions,degreeC,cascode,thresholdscan(ev),not saving data secondary title,got rid of 2d sampledata
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@86 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-10 10:25:31 +00:00
b703e52563
bug fix: got rid of title as measurement,as it should be empty
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@85 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-08 09:01:20 +00:00
918765e06f
bug fix:output directory did not set when using browse. solved
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@84 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-01 16:00:39 +00:00
9fc66d571e
bug fix: run index, plots only new data, lockimage for clone
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@83 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-01 15:45:47 +00:00
7eb48a300d
bug fix: time interval disabled when angular conversion disabled.solved
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@82 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-01 09:36:39 +00:00
887303c820
bug fix: time interval disabled when angular conversion disabled.solved
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@81 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-01 09:36:25 +00:00
87f79a9327
without very verbose
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@80 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 17:05:38 +00:00
1eb07b31f6
bug fix: plot tab refresh doesnt change plot
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@79 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 16:55:33 +00:00
bdabf9e649
bug fix: update measurement index, update index does not use sharedmemory, start run index updated after measurement
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@78 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 16:08:10 +00:00
cfce337c46
bug fix:scans: backward scan plotting works now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@77 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 15:51:29 +00:00
f4bd585ba2
bug fix:scans: backward scan plotting works now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@76 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 15:41:37 +00:00
bc5fddbe1e
bug fix: tabactions: positions disabled label color
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@75 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 14:30:36 +00:00
c506fcf739
script fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@74 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 13:47:25 +00:00
f3ea217712
added instructions for the qt, qwt and root libraries
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@21 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-09-25 13:08:08 +00:00
4e4b8b9beb
ang conversion enables positions without having to do refresh
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@73 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 13:05:07 +00:00
4143c648d8
bug fixed: constant scan widget: use red label to indicate wrong to, numsteps neednt be an integer
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@72 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 12:52:49 +00:00
1ffcbc5e6c
command list added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@20 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-09-25 12:35:09 +00:00
eb84dca0b4
make also takes care of the calibration wizards
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@19 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-09-25 12:23:49 +00:00
6988e11a44
make also takes care of the calibration wizards
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@18 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-09-25 12:19:41 +00:00
d56780d906
bug fixed: must wait to get data for scans
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@71 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 11:44:49 +00:00
e6e991bc64
fixed constant scan widget problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@70 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 11:34:18 +00:00
bf8a1ec0d2
fixed constant scan widget problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@69 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 11:31:15 +00:00
a79c5c6183
fixed advanced tab, optimize settings, threshold and exposure time enabling, histogram plotting crashing
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@68 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 07:22:04 +00:00
cc20af8d5d
changed makefile to include guidir in clean
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@17 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-09-21 10:17:33 +00:00
197de5c995
checked in the change about config file at the very start of gui and gui version
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@67 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-21 10:14:03 +00:00
0100eb1d0c
makefile compiles also the GUI
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@16 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-09-21 08:45:43 +00:00
96c805f7bf
Makefile with clean label addded
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@66 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-21 08:37:34 +00:00
1273a3b1a1
added images
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@65 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-21 08:32:47 +00:00
cd0d1976bc
changed qw dir
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@64 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-20 10:19:27 +00:00
8c250ed26a
modified makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@63 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-20 10:12:05 +00:00
12eeebb439
done
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@62 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-20 09:25:44 +00:00
4f1c03c879
removed possible chances of a shared memory access during acquisition, start button to entable tabs, to refresh plot tab and startstoptoggle
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@61 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-19 15:10:28 +00:00
d01852892b
done
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@60 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-19 14:40:27 +00:00
ee264e9b56
change filename in plot only when you get to plot
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@59 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-17 12:20:01 +00:00
34d20aa712
change filename in plot only when you get to plot
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@58 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-17 12:12:25 +00:00
4527e9f61b
should be completely done except for mods in mythen for debuggin
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@57 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-14 15:19:09 +00:00
38451caa7c
should all be done now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@56 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-14 14:55:53 +00:00
62b14f4199
fixed gettrimbits, histogram(still more),start stop,scans,not accessign shared memory duign acquisition
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@55 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-12 15:44:23 +00:00
f7078c3700
updated number of measurements to be taken from the detector class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@54 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-10 17:55:44 +00:00
b85e03adfd
included images
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@53 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-07 16:33:24 +00:00
c9db2c4272
included images
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@52 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-07 16:29:32 +00:00
a4a0237711
trim tab works except for graph
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@51 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-07 08:17:16 +00:00
b67f3a83d8
stop signal works, call back works, number of probes to expert mode, angular works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@50 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-05 08:42:03 +00:00
e32c1de0af
stop signal works, call back works, number of probes to expert mode, angular works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@49 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-05 07:33:55 +00:00
63fadd3633
added color to collapse in actions, changed angular for number of data to be received, corrected constant size scan widget
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@48 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-04 10:30:18 +00:00
a754e419fe
loading and saving trimbits and calibration file works now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@47 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-03 09:35:01 +00:00
f0217ce9b1
loading and saving trimbits and calibration file works now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@46 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-03 09:25:09 +00:00
a25b74c9ab
angle done, more of trimming...save, load, yet to fix number of probes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@45 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-31 15:09:13 +00:00
4686cb9c0e
the angles should work now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@44 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-30 16:45:11 +00:00
c4d478484b
deleted some forms not used
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@43 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-30 08:35:45 +00:00
fa5817ab77
constant size scan widget works properly now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@42 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-30 08:28:16 +00:00
86ccd014ab
included position scan
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@41 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-29 09:07:05 +00:00
c9ecec183f
included position scan
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@40 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-29 09:06:49 +00:00
51e7feb605
the scans work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@39 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-27 14:50:59 +00:00
ee3a54601c
the scans work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@38 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-27 14:11:58 +00:00
73152572a5
a rough idea of a scan is implemented with all frames
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@37 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-21 16:52:41 +00:00
cc176ea404
updated plot to show index instead of frame number
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@36 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-21 12:05:22 +00:00
1ce04ef785
updated plot to show index instead of frame number
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@35 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-21 11:53:23 +00:00
40af9384b5
fixed the losing focus too often problem in rangeSizeWidget for scanwidget
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@34 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 14:31:47 +00:00
6c19d75359
included high voltage for developer tab in gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@33 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 13:16:02 +00:00
b21b4d066c
included high voltage for developer tab in gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@32 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 13:12:08 +00:00
685e236828
energy calibration is not needed anymore
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@31 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 10:37:06 +00:00
92406bf6a8
energy calibration is not needed anymore
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@30 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 10:35:39 +00:00
423a47cd9e
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@29 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 10:29:46 +00:00
30c11d7589
fixed the dac problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@28 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-15 17:21:05 +00:00
63bfdb9cb9
dacs and adcs work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@27 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-08 17:10:44 +00:00
a47d0a57f6
finished getting dacs and adcs..need to set it
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@26 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-07 19:11:54 +00:00
72c52de2fe
included checkbox for enable file write
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@25 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-07 12:20:50 +00:00
bcb4710477
changed such that getdata returns if not really necessary to copy
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@24 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-07 10:19:15 +00:00
e88e24178c
scans work as of now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@23 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-06 16:15:33 +00:00
2dbdf8ff17
fixed bugs to do with stacked trace and fixed file input range for scan
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@22 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-03 16:52:21 +00:00
63f9d04981
actions without scan, positions, min plotimer=250,acquisition problem,error showing in actions tab
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@21 af1100a4-978c-4157-bff7-07162d2ba061
2012-07-27 10:01:35 +00:00
111608bdc8
included number of triggers for number of measurements, script and parameters work for non scan types
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@20 af1100a4-978c-4157-bff7-07162d2ba061
2012-07-24 15:39:36 +00:00
3b59d03526
going to start actions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@19 af1100a4-978c-4157-bff7-07162d2ba061
2012-07-19 14:20:51 +00:00
d2b9b6ae1d
interval between plots work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@18 af1100a4-978c-4157-bff7-07162d2ba061
2012-07-11 17:06:12 +00:00
6fb45c6c4b
set current measurement dont work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@17 af1100a4-978c-4157-bff7-07162d2ba061
2012-07-04 15:09:29 +00:00
81ac62dd49
no plot histogram, messages work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@16 af1100a4-978c-4157-bff7-07162d2ba061
2012-07-04 13:39:30 +00:00
ec0878d008
created messages tab-not working completely yet
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@15 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-28 08:35:21 +00:00
824da9d4c4
snapshot works,id works, conversion from seconds to ms,us etc works, number of measurements works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@14 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-26 15:06:55 +00:00
b3de7a9051
made number of measurements static
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@13 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-20 15:26:31 +00:00
31b65642cb
The timing mode works now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@12 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-20 15:02:35 +00:00
69e6500522
All the ranges of the axes work properly without zooming in and out each time
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@11 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-19 15:01:40 +00:00
7a916df311
solved bug on retrieve detector setup?
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@15 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-06-19 13:32:51 +00:00
8246154032
Setting axes range and enabling/disabling zooming functionalities successfull
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@10 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-15 12:10:54 +00:00
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
eadbd5c55c
make file adjusted
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@14 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-06-15 08:00:49 +00:00
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
2b02f94fe3
small changes from the meeting
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@9 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-08 10:21:30 +00:00
ef41286bf0
Got rid of tabAction form
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@8 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-06 15:45:46 +00:00
06ec6558a1
Got rid of tabAction form
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@7 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-06 15:44:33 +00:00
7a218418d1
Version 1 with the action tab working
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@6 af1100a4-978c-4157-bff7-07162d2ba061
2012-06-06 15:23:55 +00:00
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
20cc6d9a90
done with save plot and all resizing options
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@5 af1100a4-978c-4157-bff7-07162d2ba061
2012-05-29 16:49:30 +00:00
216a9ada7c
made some changes to make clone and main window resize plot
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@4 af1100a4-978c-4157-bff7-07162d2ba061
2012-05-29 08:26:49 +00:00
4624c65398
made some changes to make clone and main window resize plot
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@3 af1100a4-978c-4157-bff7-07162d2ba061
2012-05-29 08:24:03 +00:00
0ce9eb2dcb
impplemented the possibility of setting the bad channels on a module basis
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@13 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-05-25 15:23:22 +00:00
934bbbd0c8
resize works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@2 af1100a4-978c-4157-bff7-07162d2ba061
2012-05-23 16:00:35 +00:00
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
9f851d6156
Creating Classes, Libraries and Functions for the Common SLS Detector GUI
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@1 af1100a4-978c-4157-bff7-07162d2ba061
2012-05-21 16:00:26 +00:00
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
098cd1939d
added the slsDetectorAnalysis folder in include for Makefile for slsDetectorClient
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@12 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-04-04 09:33:57 +00:00
4535deae96
After the big changes...
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@11 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-04-03 15:31:27 +00:00
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
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
50224a3473
sls_detector binaries
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@10 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-03-15 12:46:16 +00:00
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
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
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
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
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
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
9d903f59ba
changed the dacs of the settings for gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@9 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-01-17 10:52:48 +00:00
816fdee5a2
changed the dac values for all settings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@8 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-01-17 10:48:41 +00:00
f67f0736b0
changed the dac values for gotthard in settings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@7 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-01-13 13:54:24 +00:00
99854eec0f
added highgain settings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@6 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2011-11-28 11:18:25 +00:00
22eb152c27
settings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@5 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2011-11-28 11:02:01 +00:00
193bb51247
gottharD: changed settings file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@4 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2011-11-22 15:09:57 +00:00
be7ee15561
gotthard: changed the settings files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@3 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2011-11-21 10:42:54 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2580c29886
makefile again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@354 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-22 08:29:29 +00:00
6ffe7ff229
makefile changed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@353 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-21 09:01:14 +00:00
a86141a608
changed dataport to receiver port
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@352 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-21 08:27:12 +00:00
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
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
1b7c42540a
included receiver defs in doxy
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@349 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-19 13:01:26 +00:00
af3abff8dd
converted receiver to c++, edited generic socket to include differentclients
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@348 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-19 12:44:17 +00:00
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
58623dcd34
fixed file index problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@346 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-15 13:54:02 +00:00
e4e46920cd
fixed frames from receiver to flip accordingly, also display frame index as not visible from filename
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@345 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-15 11:19:50 +00:00
89ddfa9b51
fixed the problem with multiple frame scan, frame index and file index included in gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@344 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-14 13:43:42 +00:00
e0a1e4ab36
warnings fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@343 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-14 11:37:06 +00:00
09982d84f2
asm includes universally found
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@342 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-14 10:08:03 +00:00
f6ff1359aa
implemented server to have a phase shift input
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@341 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-13 12:31:41 +00:00
d944ee5372
generic socket updated
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@340 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-13 12:28:13 +00:00
dc94fc3c97
receiver-read frame in right order, cleaned fileio, config file-include extsig and vhighvoltage
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@339 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-13 10:21:22 +00:00
bf7da5f493
closeDataFile is only for gotthard and included lock for socket while using receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@338 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-13 08:38:18 +00:00
8f7872d056
gotthard receiver works so far without cpu file write and tcp generic socket lock
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@337 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-12 15:48:28 +00:00
6ee21ba810
included progresscallback to use in the gui to get the progress for receivers
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@336 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-08 08:28:51 +00:00
33fa69d546
configuremac doesnt return a retval, separated setdaqregister and clean fifo, included clean fifo before startstatemachine, set delay and gates to 0 at start of server
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@335 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-08 08:21:33 +00:00
3cc914a8fb
moved configuremac to receiverip and change the config file writing to have the correct order
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@334 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-08 08:18:01 +00:00
fa9449e447
genericSocket implemented with also send/receive functions, possibility to select the binding network interface for the server and utilities to get the interface name, ip or mac
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@333 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-05 14:25:14 +00:00
50beac1f8a
defined generic socket class for both TCP and UDP, inherited by MySocketTCP - send receive funcs should still be implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@332 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-31 11:56:01 +00:00
3f1780f71b
circular fifo from the web added to the svn
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@331 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-31 09:45:59 +00:00
96d08d61d0
frame index in file name, increments instead of file index for real time acquisitions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@330 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-30 15:52:40 +00:00
2f9dea8341
forgot to add slsREceiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@329 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-30 14:30:57 +00:00
2338de4054
added receiver in here
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@328 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-30 10:06:58 +00:00
007995a5ec
changed the default of incrememnt progress to 1
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@327 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-30 10:04:05 +00:00
b29d8d33f0
got rif of unnnecessary couts for receiver part in processing
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@326 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 17:02:42 +00:00
439c2b1de8
got rid of client telling detector that receiver is down each time it doesnt work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@325 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 17:01:59 +00:00
f37cd6640f
acquire works with receiver now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@324 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 17:00:53 +00:00
30e6c810a8
put some printf in verbose mode
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@323 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 13:49:41 +00:00
7cd1f9138e
frame index updated for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@322 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 13:48:56 +00:00
69d08ac546
frame index updated for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@321 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 13:46:22 +00:00
e94677cbf5
frame index updated for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@320 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 13:46:04 +00:00
1f69778a6f
frame index updated for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@319 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 13:45:22 +00:00
5d50fa8e00
frame index updated for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@318 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 13:44:57 +00:00
b7dd317c08
frame index updated for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@317 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 13:44:07 +00:00
db249237c9
fixed error with cleaning fifo
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@316 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-26 10:21:09 +00:00
8387f70071
doxygen for slsReceiver and slsReceiverInterface
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@315 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-26 09:38:54 +00:00
83775bd7f3
separated slsReceiverInterface from slsDetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@314 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-26 08:59:04 +00:00
4dcad48ecb
separated slsReceiverInterface from slsDetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@313 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-26 08:58:26 +00:00
b52f9a8569
filepath, filename and index set from slsdet or multislsdet, moving all receiver coding from slsdetectorcommand to slsdetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@312 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-24 11:59:04 +00:00
9b323c9e7e
included registers.h in server_funcs.c
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@311 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-24 08:17:58 +00:00
da5759bed6
changes of get detector status by Anna-with error message
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@310 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-24 08:12:42 +00:00
e577cd369e
changes of get detector status by Anna
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@309 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-24 08:09:21 +00:00
964ff9006f
using daq register function in configuremac
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@308 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 12:08:20 +00:00
0c122168f3
file name with frame index and detector index
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@307 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 10:01:26 +00:00
cf5214bb01
file name with frame index and detector index
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@306 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 10:01:16 +00:00
8637272248
file name with frame index and detector index
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@305 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 10:00:35 +00:00
d115b8bf20
file name with frame index and detector index
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@304 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:59:28 +00:00
f2be1d5fd9
file name with frame index and detector index
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@303 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:59:18 +00:00
a05631f2c3
file name with frame index and detector index
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@302 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:58:54 +00:00
79bc1a010b
file name with frame index and detector index
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@301 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:57:52 +00:00
524160422f
using daq register function in configuremac
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@300 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:27:35 +00:00
f0450fbf5e
included DAQ reg editing in configuremac function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@299 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:07:55 +00:00
6cf4fc5e43
editing configuremac to include adc number
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@298 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-16 15:31:46 +00:00
6fb6f72bc3
almost compiling on 64bit...
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@297 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-16 14:50:05 +00:00
0c89b0986f
status start should not look for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@296 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-16 13:51:28 +00:00
4e3fc179fa
bugfix:receiverip checked for dots in the exact place, also updated receiver using multislsdetector reference
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@295 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-16 12:41:46 +00:00
aa10120574
bugfix:receiverip checked for dots in the exact place, also updated receiver using multislsdetector reference
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@294 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-16 12:41:24 +00:00
5d9d26506f
passing multislsdetector reference to slsdetector constructor
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@293 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-15 10:23:17 +00:00
733f5b1f3e
made sure that server knows whether to stop sending to receiver even if receiver is down, made sure error in configuremac is shown when doing start receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@292 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-12 10:20:19 +00:00
f6a2d599a0
indenting to emacs format and including check and start receiver before doing acquire or status start
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@291 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-11 16:17:07 +00:00
29a540818f
configuremac after starting receiver, also telling the server to send packets to receiver or cpu with receiver start and receiver stop
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@290 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-11 12:53:48 +00:00
e5a7d834db
detectorData now properly instantiated
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@289 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-10 08:50:02 +00:00
b75b09cc7b
dataReady called
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@288 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-10 08:12:42 +00:00
7f8f89f89d
not important:got rid of warning in sls_det_funcs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@287 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-10 08:04:52 +00:00
1d47eb16a1
few bugs fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@286 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-08 10:34:34 +00:00
05181fa618
postprocessing based on external functions - can work with f90 interface
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@285 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-08 09:34:14 +00:00
e5c5b76236
included lock receiver and update clients for receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@284 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-03 15:12:33 +00:00
980d7ecce0
float caused error and included header file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@283 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-03 12:58:25 +00:00
8b3c4c21eb
update frames caught
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@282 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-03 12:43:17 +00:00
eb58540e2e
bug fix: receiver connection
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@281 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-03 09:10:48 +00:00
6f9e265949
receiver online flag sets back to offline if it tried to connect and didnt work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@280 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-03 08:58:01 +00:00
d6ff3e9227
outdir checks if path exists, bug fix receiver: now checks online flag before tryig to set it online for outdir, filename and file index
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@279 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-03 08:31:35 +00:00
8fa7e97470
receiver works without index
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@278 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-03 08:08:36 +00:00
7e374abc27
should not update filename, dir or index when receiver cannot update
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@277 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:38:09 +00:00
d5a092c2e8
added receiver functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@276 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:21:19 +00:00
d77f4a679a
slsDetectorUsers reloaded
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@275 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:20:56 +00:00
2a31378b73
added receiver functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@274 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:18:18 +00:00
a59d47289c
added receiver functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@273 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:16:29 +00:00
e1b0da53cc
added receiver functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@272 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:15:34 +00:00
11fe4522eb
added receiver functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@271 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:14:05 +00:00
3232ce8dac
added receiver functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@270 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:12:58 +00:00
924f583be9
Added f90Interface used at SLS X04SA
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@269 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 08:52:01 +00:00
fe73d4cb92
slsDetectorUsers is composed of multiSlsDetector instead of being its base class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@268 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 07:23:24 +00:00
2e5dc6515f
setup receiver first working draft
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@267 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-01 08:25:41 +00:00
aefdcaa82e
added stop server, the implementation part of the class, and edited slsDetectorServer to include the correct slsDetectorFunctionList.h
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@266 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-21 16:03:13 +00:00
ae9b39fba3
now updating max number of modules when reading the number of modules
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@265 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-20 15:28:54 +00:00
dc9d295860
problem in verbose mode if no angular conversion
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@264 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-20 14:15:46 +00:00
d7bafd8072
almost no changes - checking in for alba
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@263 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-20 08:57:44 +00:00
e0ad54dd46
updated getting detector mac address for gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@262 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-19 13:58:03 +00:00
32621b1916
included command to get detector firmware svn version
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@261 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-19 12:09:00 +00:00
8cc957f109
dacs_int makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@260 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-19 10:59:45 +00:00
7b058c55cf
some more changes in savesettings for gotthard and loadsettings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@259 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-18 15:58:16 +00:00
8ed87df48f
edited writesettings for gotthard to not include hv, ipaddress etc and edited loadsettings to allow .settings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@258 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-18 15:12:08 +00:00
658589d15e
getmodulenumber gives back fff instead of screwing up reading random stuff
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@257 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-18 14:59:35 +00:00
5f78b4534f
angular conversion data ready callback working also with 0 positions, and multislsdetector write data file fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@256 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-17 15:31:20 +00:00
4b3fecbaf0
copy call back data verbose
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@255 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-17 15:19:45 +00:00
3f5bda1674
added trimbit mask
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@254 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-13 08:58:45 +00:00
4c8bc09143
edited getChanregs to include argument to get trimbits from sharedmemory or detector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@253 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-12 08:50:25 +00:00
008d930594
stop now works also on scans/ measurements etc.
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@252 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-12 08:23:45 +00:00
3faeca0649
added getchanregs function to get the trimbits
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@251 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-11 15:15:32 +00:00
c6d383f770
Solved bug on number of measurements
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@250 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-11 09:13:52 +00:00
25edfba592
added measurement_finished callback
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@249 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-11 08:23:33 +00:00
d92a6649ee
updated number of measurements to reflect in acquire
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@248 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-10 17:55:26 +00:00
e257e2f796
editted measurement command
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@247 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-10 15:20:09 +00:00
7638e6638c
added checkonline command
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@246 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-10 15:17:51 +00:00
5cb68d870e
checkOnline works properly now and calls tcpsocket if controlsocket not defined
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@245 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-10 15:15:43 +00:00
2cfdc2b108
check online is ok
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@244 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-10 13:17:09 +00:00
ef8455ced6
added a new function checkOnline to check individually if det is connected
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@243 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-10 09:31:32 +00:00
6902585e24
edited the getRateCorrectionTau for multislsdet to return -1 if different for any of the detectors
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@242 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-10 08:36:22 +00:00
6e4be40f37
Bad channels correction separated from postProcessing
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@241 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-06 12:03:22 +00:00
6b34cb8e71
AngularConversion splitted in a static file and in one file dependent on slsDetectorBase
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@240 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-05 10:12:49 +00:00
ca75754b83
Default angle function separated from usersFunctions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@239 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-04 11:47:26 +00:00
26b4b8a2a7
Debugged loadCalibrationFile and loadSettingsFile concerning the extensions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@238 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-04 10:18:16 +00:00
43c51f5be5
added acquisition finished callback when the acquisition returns registerAcquisitionFinishedCallback
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@237 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-04 09:47:47 +00:00
2b59857032
added loadCalibrationfile and saving it
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@236 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-03 09:21:25 +00:00
b0eea2a6e6
Splitted fileIO with fileIOStatic.h
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@235 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-29 09:50:07 +00:00
852bd47bc9
changed enum positions to have scriptscan as the last value
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@234 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-29 09:03:26 +00:00
7093e92c08
enCalLog and angCalLog added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@233 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-27 15:29:18 +00:00
d50ac0fe30
try again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@232 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-23 09:23:00 +00:00
7c0f93d4d1
dummy ci
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@231 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-23 09:19:32 +00:00
148d37281a
branch for interfacing to f90 software for data analysis from MS beamline
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@230 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-22 10:44:41 +00:00
bb8349b756
branch for interfacing to f90 software for data analysis from MS beamline
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@229 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-22 10:43:40 +00:00
aed6fe9c2e
make the branches directory to hold all the branches
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@228 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-22 10:42:46 +00:00
e888689036
makefile with dacs_t flag
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@227 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-22 10:02:43 +00:00
362ba2af11
mythenDetectorServer now works with dacs_t and the commands vpreamp and vcalibration respond correctly
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@226 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-22 09:44:08 +00:00
cd7cfadac8
changes in gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@225 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-21 13:38:01 +00:00
2981ac8700
added a change for the dacs from double to dacs_t
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@224 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-16 08:46:41 +00:00
3e8f1e22e9
changed all the dacs and adc types from double to dacs_int to an ifdef defined in sls det defs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@223 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-15 17:12:20 +00:00
5407fdcf6e
changed dacs and adcs values to be an int between sockets
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@222 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-15 17:07:55 +00:00
73424d0376
somehow it works with the receive adc in receieveModule blocked. added DDACS_DOUBLE to makefile to make it work with client
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@221 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-15 15:33:04 +00:00
398b1aa844
Undoing all float to double changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@220 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-13 13:31:18 +00:00
c880f883e3
Undoing all float to double changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@219 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-13 13:26:53 +00:00
1c7f70e14e
Undoing all float to double changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@218 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-13 13:23:51 +00:00
dbfc814768
Undoing all float to double changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@217 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-13 13:21:07 +00:00
3229c849ab
vref_ds wasnt included
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@216 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-10 14:01:05 +00:00
f686a575b6
gotthard dacs only save 10 bits but firmware is more than 14-16 bits..so changed setdacreg to save only msb and accordingly ignore a difference of 3 while setting. Problem not detected earlier, communicationfuncs.c.Solution: commented out a part from receiveModule
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@215 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-08 16:18:46 +00:00
d934111c2a
no change
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@214 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-03 10:21:49 +00:00
b154207535
changed sscanf for double from %f to %lf in slsdetcommand.cpp and fileio.cpp
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@213 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-03 10:05:37 +00:00
71339022cf
added virtual to the slsDectector.h destructor
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@212 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-03 09:34:13 +00:00
afbf7c9166
changed everything back
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@211 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-03 09:13:48 +00:00
268711f6a6
changed back to before
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@210 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-02 16:32:35 +00:00
4f376dc499
changed slsDetectorUtils.cpp to before
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@209 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-02 15:57:58 +00:00
4fce2499b1
changed slsDetectorUtils.h back to before
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@208 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-02 15:47:16 +00:00
1982b25d89
File_IO added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@207 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-02 14:37:37 +00:00
5aebcd4888
Changed everywhere from float to double, even mythenDetectorServer and the standalone files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@206 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-02 12:58:08 +00:00
3795dcedfe
standalone version of angularConversion and postProcessing added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@205 951219d9-93cf-4727-9268-0efd64621fa3
2012-07-17 15:18:31 +00:00
aa480795c6
enableWriteToFile added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@204 951219d9-93cf-4727-9268-0efd64621fa3
2012-07-17 10:05:43 +00:00
c04ed80b83
changed setDynamicRange to work if not set, set initial settings for num of frames, triggers,period,exptime etc to be 1
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@203 951219d9-93cf-4727-9268-0efd64621fa3
2012-07-13 11:21:51 +00:00
13fa3520a6
Added ifbadchannelmask, else error while compiling in verbose
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@202 951219d9-93cf-4727-9268-0efd64621fa3
2012-07-03 12:47:35 +00:00
cee632e3b5
modification to setDetectorSize
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@201 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-29 07:21:30 +00:00
f0dfedeba7
reverted a printout of write 0 position 0 offset 0 back to verbose mode
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@200 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-28 12:47:54 +00:00
67471563b0
void pointers added to callback functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@199 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-22 12:12:29 +00:00
6298136a19
add missing header in gcc 4.4
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@198 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-22 09:31:51 +00:00
289318aff6
clear warnings using gcc 4.4
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@197 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-22 09:26:31 +00:00
ab3a5bd2c2
Modified the externalcommunication mode variables to include trigger frame and trigger window
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@196 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-20 13:35:58 +00:00
98bf7a4c68
solved bug on retrieve detector setup?
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@195 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-19 13:33:00 +00:00
7582cf9781
dataCallback has an argument provided by user
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@194 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-19 10:04:15 +00:00
bc85c26bdd
solved problem on absolute channel number in raw files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@193 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-15 15:30:42 +00:00
69965fcb7e
changed detector size from module to channel number, added y dimension to detectorData
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@192 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-15 12:49:28 +00:00
042b71b403
solved problem reading config files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@191 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-15 12:29:40 +00:00
dfcd8f749e
makefile adjusted
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@190 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-15 08:01:02 +00:00
84e113d447
small changes in makefile and replaced long long with int64_t
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@189 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-15 07:12:24 +00:00
c1c646db15
Added slsDetectorUsers
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@188 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-11 14:54:32 +00:00
fe86145881
slsDetectorUsers inherited by all classes i.e. API ready for EPICS driver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@187 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-05 13:57:00 +00:00
ed84d21da0
solved bug in angular conversion
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@186 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-01 13:57:31 +00:00
0a561c1c1f
solved bug concerning headers
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@185 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-01 07:25:02 +00:00
0ef003646e
solved conflicts between detectors about config files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@184 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-31 07:46:53 +00:00
c14b98d938
impplemented the possibility of setting the bad channels on a module basis
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@183 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-25 15:23:32 +00:00
d30ad5faac
added callbacks (but should still implement them in the base classes)
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@182 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-22 15:34:12 +00:00
0bab16cde7
Detectors types can (should) be configured in the multiSlsDetector structure
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@181 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-22 12:24:15 +00:00
83ee449e3c
solved bug with multidetector angular conversion
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@180 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-15 09:17:16 +00:00
b5e966bb58
reshuffling by Anna
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@179 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-14 13:39:18 +00:00
b484ad7f20
changed the getdetectorstype function to return type and not string
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@178 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-11 07:22:40 +00:00
e0333e9f84
changed the multi getdetectortype to return unknown
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@177 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-04 13:47:32 +00:00
9c020fb67d
modified getDetectorType function name in slsDetector to be able to make a getDetectorType(pos) function for multiSlsDetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@176 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-03 16:29:29 +00:00
7824719d98
some smaller modification to slsDetectorServer
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@175 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-30 13:19:31 +00:00
b32265caf9
Added common socket interface for the server
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@174 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-30 12:58:32 +00:00
4a9dfa12b2
the final working gotthard:with no errors in state
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@173 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-16 14:28:18 +00:00
1b6f8259c7
some more changes in the acquisition function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@172 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-13 15:26:36 +00:00
ab4e569b6c
After some speed optimization...
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@171 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-13 13:03:53 +00:00
3ddafe3baf
added the usingnamespace std for slsDetectorActions.cpp
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@170 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-04 09:33:32 +00:00
e72621959e
changed the test function a bit
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@169 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-03 09:44:06 +00:00
d8e03f80e4
added reset for control reg and changed teh read and write register functions in server_funcs.c
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@168 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-03 09:35:23 +00:00
ee36cdf9e4
functions splitted in many sub-files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@167 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-02 15:16:32 +00:00
b227ad1b0c
test function changed a bit
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@166 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-28 08:30:52 +00:00
af4262aa42
added comments to the last functions and added a comma at the end
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@165 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-26 16:50:19 +00:00
002444fd57
debugged
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@164 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-26 08:46:45 +00:00
2463c9841c
really merged after the mess...
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@163 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-23 15:58:03 +00:00
13344152aa
cretated the class slsDetectorDefs, more advanced funcs moved from slsDetectorBase to slsDetectorUtils, separated function index enum from other definitions (share with dectris?)
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@162 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-23 11:44:24 +00:00
513e033a45
now the read/reset counter block and loadimage for gotthard works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@161 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-23 11:18:07 +00:00
47312e625c
now the read/reset counter block and loadimage for gotthard works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@160 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-23 11:17:39 +00:00
c0a69ebc2d
now the loadimage, read/reset counterblock for gotthard works
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@159 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-23 11:16:30 +00:00
410725784c
got rid of many warnings and load darkimage and reset/read counter works now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@158 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-23 11:13:42 +00:00
ca896b8b30
now processing all files of a sequence
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@157 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-23 08:30:24 +00:00
e3ca421c3c
faster acquisition for multidetector and angualr data merging independent of angular direction
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@156 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-22 13:25:19 +00:00
bc8b0860b4
moved testfunction to slsDetectorUtils
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@155 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-19 14:50:44 +00:00
aae550b997
moved the test function to the slsDetectorUtils class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@154 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-19 14:50:01 +00:00
145e38eac1
commenting out small printf changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@153 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-19 14:35:21 +00:00
3a24dd2396
moved the test function from protected
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@152 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-16 15:48:09 +00:00
c822b064ab
added the testfunction
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@151 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-16 15:47:25 +00:00
7b3bc86678
a weird merge had a return ok in the end of retreievedetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@150 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-16 15:24:12 +00:00
6a49d8a6df
updated the updatedetector function for gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@149 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-16 15:23:34 +00:00
bb12fe77d3
edited the updatedetector function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@148 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-16 15:22:43 +00:00
af864279a5
added loadimage function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@147 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-16 13:06:28 +00:00
2076fb75f5
ll
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@146 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-16 13:05:38 +00:00
794ab4fdfc
updated the master, settiming, setextsig, setfpgasignal, synchronization functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@145 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-16 12:55:01 +00:00
d8d08d5a9b
solved segmentation fault on may frames, printing progress during acquisition
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@144 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-16 12:25:45 +00:00
97a0d06618
string length on the scansteps command corrected
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@143 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 15:15:54 +00:00
d58ccf9c1e
compilation warnings (unused variables, no return value for non void functions etc.) removed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@142 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 13:47:50 +00:00
584e99b1b7
weird change added to master while merging
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@141 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 10:02:22 +00:00
4b296b6b7d
Should now work also for multiple frames and positions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@140 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 09:59:40 +00:00
14bc483310
couldnt commit changes, tried to merge, probably messy
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@139 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 09:57:20 +00:00
c2846e72e7
changed fifo_data address, made fifo related stuff volatile, changed makefile to incorporate compiling image and program simultaneously
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@138 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 08:26:10 +00:00
7c07ae5a5a
after some debugging at the beamline
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@137 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-09 14:40:10 +00:00
b070938f57
versions at the beamline
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@136 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-08 08:23:33 +00:00
461fd8824f
Raw data file write/read now uses absolute channel values in multidetector systems. Flat field and bad channel corrections and angular conversion debugged
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@135 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-02 11:01:53 +00:00
5e086b9ee6
timing command added, several bugs concerning the synchronization of multiple detectors fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@134 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-28 13:59:28 +00:00
b755c533f0
timing functions changed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@133 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-27 16:29:40 +00:00
1064bd21ff
slsDetectorCommand does not inherit slsDetectorBase but rather uses its methods
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@132 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-24 15:32:39 +00:00
c2a24e2c73
changes in the software structure debugged
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@131 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-24 13:14:58 +00:00
e0368c69ee
added a testfunction to test start and stop acquisition of gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@130 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-21 16:01:13 +00:00
bd54f179ed
status register updates
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@129 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-21 15:58:58 +00:00
4a4e7540ca
added digital_test_bit for gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@128 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 14:00:08 +00:00
e24a4b79a3
modified configuremac function to have zero arguments
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@127 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 13:59:31 +00:00
8e79e5077f
modified configuremac function, moved digital test bit to digital test function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@126 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 13:57:52 +00:00
7ed37b2e3f
moving digital test bit in configuremac function to the digital test function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@125 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 13:46:41 +00:00
92a61d1441
added the dark/gain image functions and enum
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@124 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 10:06:30 +00:00
c6f61d3663
added load image, changed key find, changed get temp to getADC
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@123 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 10:05:57 +00:00
44eea027f3
fixed dark/gain image correction
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@122 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 10:00:59 +00:00
47f18d3cbf
adding hostname+ changing that
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@121 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-17 11:09:51 +00:00
a7e9cc1091
added the dark and gain image funcitions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@120 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-17 10:26:04 +00:00
23aea6007b
data file read/write now work with both file names and file streams
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@119 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-17 10:09:10 +00:00
a556b2a7da
major changes with inheritances
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@118 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-17 09:43:46 +00:00
6778060b56
changed dynamic range of gotthard, moved get temp to getadc function, added 3 debugging functions just for now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@117 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-16 14:23:05 +00:00
ee2652f864
read_frame works and moved get temp to the getadc function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@116 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-16 14:16:38 +00:00
2e15e9c2db
works but usleep required
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@115 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-14 10:39:37 +00:00
ba833233b9
changed the register addresses
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@114 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-03 15:44:57 +00:00
266d13759c
a few changes for the fifo_read and the bus_r16
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@113 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-30 07:45:05 +00:00
af2c6b9bb2
named enums in mcb_funcs.h
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@112 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-23 15:33:19 +00:00
094a87ec7b
changes for testram which didnt work anyway
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@111 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-23 15:05:08 +00:00
41fea1fbcf
fixed testfpga, fixed pattern reg etc
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@110 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-19 11:05:37 +00:00
b7bb5a961b
fixed fpgaversion etc register problems
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@109 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-18 18:00:37 +00:00
302a70d59b
Using myMod-reg for settings for the gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@108 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-17 10:48:01 +00:00
918bcd3836
settings fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@107 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-17 10:47:21 +00:00
3e8f916561
implemented the read write reg for debugging
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@106 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 17:00:26 +00:00
3265f8b483
added the read write reg for debugging
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@105 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 17:00:06 +00:00
89c00ffda3
added adc_write to simply write to registers and read back, instead of making more functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@104 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 13:53:48 +00:00
429bedecca
included the ival for digital_test_bit and set adc_write_reg to all FFFFFFFF by default in DAQ reg initialization
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@103 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 13:40:58 +00:00
bbedcbc329
included serverMAC function for gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@102 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 12:13:07 +00:00
8424decb72
complete before adding adcwritereg function from client
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@101 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 11:47:36 +00:00
e8e1157c1a
included serverMAC function for gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@100 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 11:43:03 +00:00
e5ab585ab0
included the ival for digital_test_bit and set adc_write_reg to all FFFFFFFF by default in DAQ reg initialization
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@99 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 11:41:59 +00:00
6abd580f95
commented out stuff to make sure they are not included
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@98 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:45:43 +00:00
fa369ca22f
commented out everything to do with out detectors including multislsdetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@97 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:45:08 +00:00
19f7712e65
changes which commented out virtual for child functions and some other changes for configuremac and setclientip and setclientmac
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@96 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:44:04 +00:00
c50716f623
reverted the change: no struct for tse_conf etc in here anymore
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@95 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:39:56 +00:00
f0ec4036be
works with gigabit
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@94 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:39:02 +00:00
9f7fe775e8
works with gigabit
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@93 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:38:29 +00:00
6b6fe986d4
works with gigabit
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@92 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:38:20 +00:00
af1dab372e
works with gigabit
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@91 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:38:16 +00:00
913d1c5310
works with gigabit
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@90 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:33:37 +00:00
88d7f7ffd2
added the enet conf structs
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@89 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-12 08:20:29 +00:00
80bbea0b6f
done update
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@88 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 17:53:32 +00:00
fceb4d63f8
before configuremac for errorfree
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@87 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:39:21 +00:00
20bc38fe1a
reverting to before configuremac command for error-free
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@86 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:38:29 +00:00
784c423b55
changed the Makefile to what it was before
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@85 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:36:06 +00:00
16bfd722b3
changed a few parameters & nvar for writeConfigurationFile function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@84 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:31:37 +00:00
9a93a5f019
all detectors merged into slsDetector
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@83 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:14:52 +00:00
ef65cc8b54
added the setclientmac function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@82 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 13:41:53 +00:00
1a85d9f691
changed the setClientIP function and included 2 header files for IP validation
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@81 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 09:31:52 +00:00
0fd14ad113
a few more changes for phaseshiftonce
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@80 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 09:29:50 +00:00
d5271ecb46
added the phase shift at power on part
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@79 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-06 14:06:34 +00:00
efb30128fd
changed RET to RETVAL for setDetectorType function to compile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@78 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-06 10:34:08 +00:00
c7d0330f55
got rid of some parameters in read-write of config file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@77 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-06 10:13:16 +00:00
77d21d16f9
added the set & get functions for clientIP and clientMAC
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@76 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-06 10:11:56 +00:00
1770045bce
Modified upto DAQ reg
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@75 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-06 10:02:55 +00:00
c9a314d829
forces update
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@74 951219d9-93cf-4727-9268-0efd64621fa3
2011-12-09 15:48:26 +00:00
a77a6bac21
gotthard: everything done except gigabyte and adcwrite upto now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@73 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-29 09:19:35 +00:00
15a649c767
gotthard: everything done upto the gigabyte part
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@72 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 17:08:03 +00:00
05705a907a
gotthard settings name change again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@71 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 15:18:44 +00:00
5c4dfacadb
changed name of settings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@70 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 15:07:01 +00:00
5eab29ed13
settings:upto a highgain
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@69 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 15:05:53 +00:00
0044bdf0fd
gotthard: moving confgain to configuration part
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@68 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 15:02:39 +00:00
145de52af3
gotthard: got rid of confgain as a parameter read from settings file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@67 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 15:01:02 +00:00
cd28aaa350
gotthard: changed settings names
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@66 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 12:56:37 +00:00
57b892267a
gotthard a few changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@65 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 12:52:47 +00:00
4cbd9b2265
server locking flag (not real lock), last client vs this client, change port implemented, most funcs of the multidetector implemented again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@64 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-25 15:33:25 +00:00
f1654363e0
interchanged both the temp_adc and temp_fpga values, since they were reading alternate values
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@63 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-25 10:55:22 +00:00
fdeba63bff
added the confgain parameter of gotthard and changed the MYTHEN part of setsettings that I had commented out earlier
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@62 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-25 10:10:02 +00:00
05aaefb8f0
temp, confgain and hv works well, temp is alternate though
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@61 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-24 15:54:26 +00:00
9f85175dce
adding conf gain member to sls detector and change a bit in setSettings to read this back
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@60 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-22 17:55:17 +00:00
7de31bbe93
highvoltage again
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@59 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-22 17:19:58 +00:00
798ff206c1
gotthard:sls_detector_defs:changed a comment
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@58 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-22 15:09:20 +00:00
39d9ae8b7b
gotthard:highvoltage done
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@57 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-22 15:08:48 +00:00
1ecde6beeb
gotthard: got rid of HV in settings file and changing the way macadd read from settings file
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@56 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-22 11:01:27 +00:00
b2723feb47
changed a few things in gotthardDetector.cpp and added 2 members to sls_detector_module in slsdetector.cpp to incorporate gotthards need of client ip address and client mac address to send data
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@55 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-21 16:11:28 +00:00
19e2f2ef60
gotthard: temp readable
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@54 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-18 17:04:58 +00:00
e4495f2bf4
gotthard:adding the temperature in the client part and getting rid of gettemperature,gotthardString functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@53 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-18 16:59:18 +00:00
40e945889c
gotthard:incorporated the temperature read
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@52 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-18 16:56:14 +00:00
fc07eee532
added some registers
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@51 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-18 12:54:59 +00:00
9812021ef0
gotthard:changed port
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@50 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-15 14:41:04 +00:00
5d687a1dee
gotthard: changed the fpga dummyreg read/write test
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@49 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-15 14:24:45 +00:00
025c6ae10f
File name functions made (also) static
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@48 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-11 15:51:34 +00:00
a8943b0746
added gates for gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@47 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-11 13:51:54 +00:00
fa4fe558a5
Static methods to check detector type; removed purely virtual functions to avoid error during compilation of multiSlsDetector.
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@46 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-10 15:16:29 +00:00
55ab200dbd
Added 100 read writes to test fpga
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@45 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-09 14:49:05 +00:00
dfcb43b330
Bad channel correction fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@44 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-04 13:26:01 +00:00
9b89333dae
Fixed problem with filename after angular conversion
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@43 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 15:58:31 +00:00
6edf6fa614
gotthard and mythen detector merged
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@42 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 14:37:21 +00:00
93af09b71e
minor changes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@41 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 14:00:41 +00:00
cb0677c3ea
makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@40 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 14:00:13 +00:00
e4543697c7
Internal timer added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@39 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 13:59:28 +00:00
848305f9ac
most methods moved to slsDetector (instead of mythen and gotthard) and connect/disconnect method added to users functions (to possibly comply with epics) - mutex added to the acquisition and data processing threads to avoid wrong indexes.
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@38 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 13:51:26 +00:00
5ec765e41e
dhanya-got rid of temp, setgotthard, getgotthard functions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@37 951219d9-93cf-4727-9268-0efd64621fa3
2011-10-18 09:02:05 +00:00
ef657a9218
gotthard-changes in trimming_funcs and shared_memory to just make it compile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@36 951219d9-93cf-4727-9268-0efd64621fa3
2011-10-14 15:08:14 +00:00
9cb8c0c378
gotthard-changed clock frequency
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@35 951219d9-93cf-4727-9268-0efd64621fa3
2011-10-14 14:24:15 +00:00
09ef669f17
Gotthard software added to MAkefile and settings directory
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@2 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2011-10-13 11:41:48 +00:00
ab27ab1c5d
Gotthard class implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@34 951219d9-93cf-4727-9268-0efd64621fa3
2011-10-13 11:26:28 +00:00
3367bb3026
Header after/before bug solved in text client - implemented commands to change DACs other than threshold (also for chiptestboard)
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@33 951219d9-93cf-4727-9268-0efd64621fa3
2011-04-18 14:00:54 +00:00
be173eaee1
Got rid of C++ comments un usersFunctions.c
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@32 951219d9-93cf-4727-9268-0efd64621fa3
2011-03-10 14:24:40 +00:00
a271d7a9e9
Last workin version
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@31 951219d9-93cf-4727-9268-0efd64621fa3
2011-03-10 13:39:38 +00:00
d4e73141dd
mythenDetectorServer compiles in virtual mode
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@30 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-15 16:28:02 +00:00
9c39073e20
mythenDetectorServer compiles in virtual mode
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@29 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-15 16:25:45 +00:00
ea62caee31
mythenDetectorServer compiles in visrtual mode
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@28 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-15 16:20:06 +00:00
fbe78acbfe
compiles virtual server
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@27 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-15 15:49:57 +00:00
67cd4f9c14
scripting stuff added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@26 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-07 16:24:03 +00:00
677523aa6b
libs not copied to bin directory
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@25 951219d9-93cf-4727-9268-0efd64621fa3
2011-01-28 14:47:12 +00:00
51f399f3ed
first real import
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@1 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2011-01-28 14:39:07 +00:00
62ea1663b9
Unuseful files deleted
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@24 951219d9-93cf-4727-9268-0efd64621fa3
2011-01-28 13:45:45 +00:00
e2d9824bc7
Picasso server makefile and defs added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@23 951219d9-93cf-4727-9268-0efd64621fa3
2011-01-28 13:44:35 +00:00
f882a61802
flatfield directory field added to shared memory - Server works with newest firmware versions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@22 951219d9-93cf-4727-9268-0efd64621fa3
2011-01-28 13:24:03 +00:00
9f64dd01d8
shorter timeout to socket connect
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@21 951219d9-93cf-4727-9268-0efd64621fa3
2010-07-02 14:16:47 +00:00
8d006d5486
client version added to textclient
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@20 951219d9-93cf-4727-9268-0efd64621fa3
2010-07-02 14:16:16 +00:00
a60ac8963c
Offline flag implemented
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@19 951219d9-93cf-4727-9268-0efd64621fa3
2010-06-10 15:16:03 +00:00
8a5bc0750d
Works with firmware version 100527
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@18 951219d9-93cf-4727-9268-0efd64621fa3
2010-05-26 09:04:14 +00:00
aeab347db6
slsDetector adapted also too PICASSO
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@17 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-26 08:30:56 +00:00
bbb9780647
server accepting connection modified in MySocketTCP.cxx
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@16 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-22 08:29:59 +00:00
e12280c83a
added virtual link MySocketTCP.ccp
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@15 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-20 09:35:17 +00:00
2dd7b2c67b
getRunStatus becomes purely virtual in slsDetector and returns already the runStatus type variable
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@14 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 14:46:34 +00:00
26765a30b7
runStatus enum added and get function indexes all starting from -1
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@13 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 14:40:07 +00:00
2cfbc846b9
npoints added to the final data and status and timer left available on the stop socket
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@12 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 10:50:52 +00:00
aeade907d0
Forst version to the users - still trimming problem
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@11 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 10:40:38 +00:00
057d518ddc
first version to MYTHEN users
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@10 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 10:40:10 +00:00
46b2919bb2
first version to the users
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@9 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 10:39:50 +00:00
2ceb966c73
some more changes - mianly configuration file, and dump and retrieve detector settings added + set speed function
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@8 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-10 16:25:29 +00:00
2336c330a8
edited comments
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@7 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-02 10:13:12 +00:00
54b670f4f4
edited doxygen comments
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@6 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-02 09:58:01 +00:00
71ef480327
doxygen comments were added to the class
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@5 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-02 09:56:14 +00:00
3f148c52a1
some more details fixed
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@4 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-01 14:32:14 +00:00
bf976342b9
After meeting on 30.11.09 - Some functions became pure virtual in slsDetector and have been moved to mythenDetector - setSpeed function added
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@3 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-01 09:58:10 +00:00
7e6a0fbd1e
private variables became protected
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@2 951219d9-93cf-4727-9268-0efd64621fa3
2009-10-09 14:56:39 +00:00
e2f9d69677
SlsDetector client library and servers. First import.
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@1 951219d9-93cf-4727-9268-0efd64621fa3
2009-10-09 14:10:09 +00:00