Commit Graph

9462 Commits

Author SHA1 Message Date
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_msdetect 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
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 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
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 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
l_maliakal_d 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
l_maliakal_d 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
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 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
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 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
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 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
l_maliakal_d 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
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 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
l_maliakal_d 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