50 Commits

Author SHA1 Message Date
Dhanya Maliakal
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
l_msdetect
fa80d6a205 change settings for eiger 2015-11-13 11:43:19 +01:00
Dhanya Maliakal
a770389c90 including subframe index from receiver to client and also sending this to gui 2015-09-23 11:50:02 +02:00
Dhanya Maliakal
cae286941a added subframe exposure time settable 2015-09-03 15:16:48 +02:00
Dhanya Maliakal
a8fc34c92b included propix for client 2015-07-21 16:26:50 +02:00
Dhanya Maliakal
7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01:00
Dhanya Maliakal
85ccf64175 print receiver configurations for all detectors added 2015-03-02 13:56:23 +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
308b3aa9b1 Client and jungfrau server funcs added for pattern generator 2014-10-14 17:03:13 +02:00
Maliakal Dhanya
8788a060dd creating a separate receiver 2014-05-21 09:44:35 +02:00
l_maliakal_d
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
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
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
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
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
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
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
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
l_maliakal_d
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
l_maliakal_d
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
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
l_maliakal_d
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
l_maliakal_d
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
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
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
l_maliakal_d
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
l_maliakal_d
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
l_maliakal_d
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
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
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
bergamaschi
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
ramani_n
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
l_maliakal_d
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
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
bergamaschi
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
bergamaschi
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
bergamaschi
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
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
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
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
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
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
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