Dhanya Maliakal
|
7e00d9f395
|
Merge branch 'developer' into hdf5
|
2017-03-03 10:06:34 +01:00 |
|
Dhanya Maliakal
|
9b3f4a3a66
|
commonFiles/error_defs.h
|
2017-02-03 14:34:05 +01:00 |
|
Dhanya Maliakal
|
87ce1ed736
|
moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable
|
2017-02-03 12:29:44 +01:00 |
|
|
|
3eea80a121
|
compiles after merging
|
2016-12-19 13:50:25 +01:00 |
|
|
|
12cd3d07a2
|
some changes for jctb
|
2016-12-19 12:05:59 +01:00 |
|
Dhanya Maliakal
|
e7621a6cd0
|
moving towards c++ api
|
2016-12-12 14:24:11 +01:00 |
|
|
|
cb879c61ca
|
changes for new chipterboard -now works with reduced dynamic range and analog/digital readout
|
2016-11-09 11:36:59 +01:00 |
|
Dhanya Maliakal
|
1263e80d21
|
done
|
2016-09-16 12:49:27 +02:00 |
|
Dhanya Maliakal
|
a821442b1a
|
almosst
|
2016-09-15 12:16:01 +02:00 |
|
Dhanya Maliakal
|
652d29f2d9
|
almost done
|
2016-09-09 17:51:36 +02:00 |
|
Dhanya Maliakal
|
1db5ef4fd4
|
added 2 gain settings to eigeR
|
2016-08-03 10:35:11 +02:00 |
|
Dhanya Maliakal
|
c0db1a89a8
|
deactivate for eiger
|
2016-08-02 10:32:37 +02:00 |
|
Dhanya Maliakal
|
35b02c9cf0
|
added burst_trigger mode for eiger to replace trigger_readout mode
|
2016-07-04 15:47:32 +02:00 |
|
Dhanya Maliakal
|
6cc22a350d
|
Merge branch 'release' into jungfrauv1.0
|
2016-02-03 15:05:50 +01:00 |
|
Dhanya Maliakal
|
f477b7a5ac
|
not much changes
|
2016-01-19 16:25:48 +01:00 |
|
Dhanya Maliakal
|
5c239ad45f
|
data call back form receiver includes both x and y dimensions
|
2015-12-16 15:01:00 +01:00 |
|
Dhanya Maliakal
|
61f0506c2c
|
settings for jungfrau
|
2015-12-01 16:43:23 +01:00 |
|
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 |
|
