detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-06 10:00:40 +02:00
Code Issues Actions Packages Releases Activity
3,600 Commits 45 Branches 102 Tags
Commit Graph

3600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dhanya Maliakal
e7f7e0f280 Merge remote branch 'slsDetectorCalibration/3.0.1' into 3.0.1 2017-12-12 11:14:30 +01:00
Dhanya Maliakal
735b8ea206 Merge remote branch 'slsDetectorCalibration/3.0' into 3.0 2017-12-12 11:14:24 +01:00
Dhanya Maliakal
56c504abbb Merge remote branch 'slsDetectorCalibration/2.3.4' into 2.3.4 2017-12-12 11:14:19 +01:00
Dhanya Maliakal
4d6346e678 Merge remote branch 'slsDetectorCalibration/2.3.3' into 2.3.3 2017-12-12 11:14:15 +01:00
Dhanya Maliakal
dc7e448759 Merge remote branch 'slsDetectorCalibration/2.3.2' into 2.3.2 2017-12-12 11:14:12 +01:00
Dhanya Maliakal
e658cbacda Merge remote branch 'slsDetectorCalibration/2.3.1' into 2.3.1 2017-12-12 11:14:08 +01:00
Dhanya Maliakal
1e6c6dea71 Merge remote branch 'slsDetectorCalibration/2.3' into 2.3 2017-12-12 11:14:05 +01:00
Dhanya Maliakal
0e5d4d1d8e Merge remote branch 'slsDetectorCalibration/2.2' into 2.2 2017-12-12 11:14:01 +01:00
Dhanya Maliakal
a2986784d3 Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1 2017-12-12 11:13:34 +01:00
Dhanya Maliakal
975cbb576e Merge remote branch 'slsDetectorCalibration/2.1' into 2.1 2017-12-12 11:06:15 +01:00
Dhanya Maliakal
e48a92d9cd Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5 2.0.5 2017-12-12 11:02:57 +01:00
Dhanya Maliakal
8da5b8318f removed a few stuff from gitignore 2017-12-12 09:05:39 +01:00
helfenstein_p
03de29de90 refine threadpool mutex, remove unlock before destroying, unlocking twice is undefined behaviour 2017-12-11 18:02:33 +01:00
Dhanya Maliakal
bb3e5351b4 solving warnings from latest linux 2017-12-11 13:51:11 +01:00
Dhanya Maliakal
d6a4f83a99 ignore misleading indentation 2017-12-11 11:13:25 +01:00
Dhanya Maliakal
29d66e455d possible to make only certain components of system 2017-12-11 10:51:19 +01:00
Dhanya Maliakal
e19d564364 bug fix no reciever could not set file name for mythen for eg., also bug fix that did not allow _s, _S, _p, _d as suffix to file name 2017-12-08 12:06:10 +01:00
Dhanya Maliakal
8c123982d2 get detector and receiver status only when necessary for stopacquisition 2017-12-08 11:50:10 +01:00
Dhanya Maliakal
40a7b3983a put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle 2017-12-08 11:40:07 +01:00
Dhanya Maliakal
bf9905ad2a possible to use binary --version or -v to get the branch and versionid 2017-12-06 19:05:35 +01:00
Dhanya Maliakal
c4a242e10a changed all variables from svn to git, included --version for receiver binary 2017-12-06 10:29:57 +01:00
Dhanya Maliakal
7436d6c8d3 updaterev 2017-12-06 08:44:07 +01:00
Dhanya Maliakal
b498043ea6 remember old read freq if not 0 in gui 2017-12-05 16:04:10 +01:00
Dhanya Maliakal
7aaf95a565 -1 in getadc fixed in gui as well 2017-12-05 15:37:34 +01:00
Dhanya Maliakal
7b1f935da2 allowing to read adcs/temp during acquire 2017-12-05 14:49:20 +01:00
Dhanya Maliakal
ce1ec97571 some indentation in writing config file 2017-12-05 13:47:01 +01:00
Dhanya Maliakal
d00c837977 updated write config and write parameters list 2017-12-05 13:41:16 +01:00
Dhanya Maliakal
536203b6dc one repo so need for gitall.sh 2017-12-05 11:16:22 +01:00
Dhanya Maliakal
65b4c69847 REST implementation removed from slsReceiver 2017-12-05 11:03:52 +01:00
Dhanya Maliakal
61791c078c Merge remote branch 'slsDetectorGui/3.0.1' into 3.0.1 2017-12-04 16:48:17 +01:00
Dhanya Maliakal
36802cdb14 Merge remote branch 'slsReceiverSoftware/3.0.1' into 3.0.1 2017-12-04 16:48:17 +01:00
Dhanya Maliakal
e26cf3b673 Merge remote branch 'slsDetectorSoftware/3.0.1' into 3.0.1 2017-12-04 16:48:15 +01:00
Dhanya Maliakal
aab62fccc1 Merge remote branch 'slsDetectorGui/3.0' into 3.0 2017-12-04 16:48:09 +01:00
Dhanya Maliakal
73ce4abd58 Merge remote branch 'slsReceiverSoftware/3.0' into 3.0 2017-12-04 16:48:08 +01:00
Dhanya Maliakal
c12b137b79 Merge remote branch 'slsDetectorSoftware/3.0' into 3.0 2017-12-04 16:48:07 +01:00
Dhanya Maliakal
befdcf7f36 Merge remote branch 'slsDetectorGui/2.3.4' into 2.3.4 2017-12-04 16:48:01 +01:00
Dhanya Maliakal
02f5c472a8 Merge remote branch 'slsReceiverSoftware/2.3.4' into 2.3.4 2017-12-04 16:48:00 +01:00
Dhanya Maliakal
75ed2cd2e4 Merge remote branch 'slsDetectorSoftware/2.3.4' into 2.3.4 2017-12-04 16:47:59 +01:00
Dhanya Maliakal
3be045f9b6 Merge remote branch 'slsDetectorGui/2.3.3' into 2.3.3 2017-12-04 16:47:54 +01:00
Dhanya Maliakal
8fae982802 Merge remote branch 'slsReceiverSoftware/2.3.3' into 2.3.3 2017-12-04 16:47:54 +01:00
Dhanya Maliakal
128ec88b5f Merge remote branch 'slsDetectorSoftware/2.3.3' into 2.3.3 2017-12-04 16:47:52 +01:00
Dhanya Maliakal
d5fc158330 Merge remote branch 'slsDetectorGui/2.3.2' into 2.3.2 2017-12-04 16:47:47 +01:00
Dhanya Maliakal
864e6e4c81 Merge remote branch 'slsReceiverSoftware/2.3.2' into 2.3.2 2017-12-04 16:47:47 +01:00
Dhanya Maliakal
343d96ff16 Merge remote branch 'slsDetectorSoftware/2.3.2' into 2.3.2 2017-12-04 16:47:46 +01:00
Dhanya Maliakal
4142328437 Merge remote branch 'slsDetectorGui/2.3.1' into 2.3.1 2017-12-04 16:47:41 +01:00
Dhanya Maliakal
6c797988c7 Merge remote branch 'slsReceiverSoftware/2.3.1' into 2.3.1 2017-12-04 16:47:41 +01:00
Dhanya Maliakal
215c262981 Merge remote branch 'slsDetectorSoftware/2.3.1' into 2.3.1 2017-12-04 16:47:39 +01:00
Dhanya Maliakal
081b809078 Merge remote branch 'slsDetectorGui/2.3' into 2.3 2017-12-04 16:47:35 +01:00
Dhanya Maliakal
9263567cd8 Merge remote branch 'slsReceiverSoftware/2.3' into 2.3 2017-12-04 16:47:34 +01:00
Dhanya Maliakal
58e90a85be Merge remote branch 'slsDetectorSoftware/2.3' into 2.3 2017-12-04 16:47:33 +01:00