 l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
bergamaschi
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_cartier
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|
|
l_maliakal_d
|
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 |
|