219 Commits

Author SHA1 Message Date
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
bergamaschi
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
bergamaschi
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
l_maliakal_d
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
bergamaschi
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
bergamaschi
1673da0854 fixed mismatch between slsDetectorCommand and slsDetectorUsers when setting the timing mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@684 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-13 11:59:35 +00:00
l_maliakal_d
57d65fd59c semaphores , no usleep in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@660 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-04 13:10:14 +00:00
l_maliakal_d
13189b6414 included detailed error of settings file could not find
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@655 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-16 13:48:27 +00:00
l_maliakal_d
3098664c8f fixed some probelems wuth scans for receiver and also scans for allframes/frameindex
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@654 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-16 12:59:42 +00:00
l_maliakal_d
05f54e996c changed the start and stop receiver error messages to be displayed to the client and not jsus recever
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@640 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-30 14:49:53 +00:00
l_maliakal_d
b5b031a33e changed default output dir to root directory
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@637 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-19 10:09:42 +00:00
l_maliakal_d
7a40b12108 setting buffer for fwrite in slsreceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@636 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-19 09:15:41 +00:00
l_maliakal_d
036d72fec8 eiger server edited to include set timer, settingsand stop server for the time being
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@631 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-11 09:06:37 +00:00
l_maliakal_d
8720f960e7 implemented getting ids for eiger. also id ret should be int64_t
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@630 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-10 15:58:43 +00:00
l_maliakal_d
e8e2c7b3e4 fixed moench settings problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@628 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-25 11:30:29 +00:00
l_maliakal_d
47377a02e9 set settings for eiger, fixd big bug in slsusers for exposures, period etc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@623 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:24:02 +00:00
l_maliakal_d
b661b37b03 changed number of adcs to be 0 for eiger and a temporary chan chip trimbit for setsettings
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@614 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:33:10 +00:00
l_maliakal_d
a17e6f616d settings file shud read and write according ot dac names and can be in any order, included eiger definitions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@609 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-17 13:40:38 +00:00
l_maliakal_d
666c73c988 edited call backs in receiver, got rid of uhrix callback, expose receiver read freq to user, got rid of wait for receiver t finish
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@577 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-27 09:11:26 +00:00
l_maliakal_d
0e73372cf8 receiver read frequency from gui can be set now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@567 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 13:43:25 +00:00
l_maliakal_d
df6774e2c6 users:double for time in ns, bugfix:readframe wen no gui, return ok for config
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@564 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-17 09:51:31 +00:00
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
x04sa
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
x04sa
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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