71 Commits

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