Compare commits

..

1463 Commits
2.1.1 ... 3.1.0

Author SHA1 Message Date
54530ab103 Merge branch 'main-rc' into b3.1.0 2020-11-30 16:50:15 +01:00
6126780660 Merge branch 'main-rc' into b3.0.1 2020-11-30 16:45:00 +01:00
9b7f9b1be1 Merge branch 'main-rc' into b3.0.0 2020-11-30 16:42:35 +01:00
26c829d766 Merge branch 'main-rc' into b2.3.4 2020-11-30 16:38:04 +01:00
3fde5c5b55 Merge branch 'main-rc' into b2.3.3 2020-11-30 16:36:24 +01:00
3e5f546ebe Merge branch 'main-rc' into b2.3.2 2020-11-30 16:26:44 +01:00
9833a7d330 Merge branch 'main-rc' into b2.3.1 2020-11-30 16:25:23 +01:00
8f9155e578 Merge branch 'main-rc' into b2.3.0 2020-11-30 16:23:50 +01:00
9df1eac3c1 Merge branch 'main-rc' into b2.2.0 2020-11-30 15:46:45 +01:00
85aa47b835 updated link in documentation 2018-03-12 16:38:01 +01:00
da9b0bdc0b updated link in documentation 2018-03-12 16:27:45 +01:00
258de4947a updated doc 2018-03-12 15:46:20 +01:00
9197ab6e4b sls detector install omitted, added 2018-03-12 15:36:36 +01:00
6c1c203782 documentation updated 2018-03-12 15:01:23 +01:00
721d2a30f2 read me updated 2018-03-12 14:25:39 +01:00
72970c9669 updated binaries, updated manuals, updated git versioning 2018-03-12 14:21:02 +01:00
b389402d64 Merge branch '3.1.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 3.1.0-rc 2018-03-08 17:13:20 +01:00
0d2dd93498 changed setBit and getBit to uint32_t 2018-03-08 17:13:13 +01:00
fee6465213 eiger and jungfrau servers int to uint32_t for read and write registers 2018-03-08 16:46:15 +01:00
8b02aa9e91 Merge branch '3.1.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 3.1.0-rc 2018-03-08 16:08:45 +01:00
339956e5de changed from int to uint32_t in read and writeRegister 2018-03-08 16:08:31 +01:00
deb59530ab eiger gui fix: delay after trigger and number of gates upon measurements tab refresh doesnt exist for eiger/jungfrau 2018-03-08 15:49:01 +01:00
ec5e779225 added binary 2018-03-08 15:19:11 +01:00
3878212ffd jungfrau server adcphase not responding to a get properly 2018-03-08 15:17:14 +01:00
7649865a8f jungfrau bug fix: adc phase corrected to correctly return value in -1 2018-03-08 14:02:02 +01:00
28101bed22 updated binaries 2018-02-27 14:37:46 +01:00
1f6c289fd4 gotthard server : bugfix for getting id 2018-02-27 14:33:58 +01:00
675d69392a updating versions 2018-02-27 12:52:48 +01:00
61e7c0148f updating versions to 3.1.0 2018-02-27 12:40:53 +01:00
12e4530702 changes to documentation 2018-02-27 12:09:36 +01:00
64c18469bd release changes, gui compile via anaconda changes 2018-02-27 10:29:56 +01:00
aa2c535b4f possibility to use router mac in config file to have detip and rx_udpip in different subnets 2018-02-26 18:31:49 +01:00
5849725b97 posisibility to overwrite rx_udpmac even with receiver 2018-02-26 18:22:07 +01:00
74f327a959 gotthard server: red in stopping server for debugging 2018-02-26 17:34:35 +01:00
f67323d1cc updated gotthard examples to not use extsig of indices 1, 2 and 3 2018-02-26 17:13:51 +01:00
de3bfd85a1 fixed gothard not taking initial images after configuring MAC of detector. 2018-02-26 17:07:12 +01:00
ac9d9f6a93 removing --f from the gui options help, bugfix gotthard auto to trigger to auto mode and changing tabs will result in num gates and delay being enabled 2018-02-26 16:58:45 +01:00
cef9ae39c3 gotthard dac fix vrefcomp from 887 to 350 2018-02-26 16:15:03 +01:00
d14234ee38 jungfrau server bianries 2018-02-26 14:43:53 +01:00
a4aa862ee4 bugfix jungfrau server : tdma bit also needs to be set to enable 2018-02-26 14:43:11 +01:00
0b017b886c added release documentation 2018-02-26 13:28:31 +01:00
7859df6aa3 bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui 2018-02-26 12:44:32 +01:00
ebe1ff4563 jungfrau virtual server needed the stop server as well 2018-02-23 15:32:05 +01:00
c3d6852f97 fixed threshold returning 1 if a trimbit file missing for eiger, it now returns -1, as both values are different 2018-02-23 14:49:18 +01:00
bacc4073f7 png compile fails in gui, removing it from cmakelists.txt in gui 2018-02-23 14:10:53 +01:00
50b515f94d changes to documentation 2018-02-23 13:46:17 +01:00
1e479a5c77 Merge branch '3.0.1' of github.com:slsdetectorgroup/slsDetectorPackage into 3.0.1 2018-02-23 12:48:25 +01:00
9322c176f2 jungfrau server virtual 2018-02-23 12:48:11 +01:00
639fdac232 created jungfrau virtual server(in next commit), edited install manual to give out html pages without subsection toc, links, navigaion, spilit into as many sections etc for wiki page 2018-02-23 12:45:31 +01:00
76bd2c69bc added vrs to Eiger dacs to interpolate 2018-02-19 12:04:05 +01:00
77aa3fa215 added overloading of call operator for access detector 2018-02-16 15:25:35 +01:00
bc6fc51f6a linking cmake 2018-02-12 19:15:12 +01:00
9fe7293dab Merge branch '3.0.1' of github.com:slsdetectorgroup/slsDetectorPackage into 3.0.1 2018-02-09 16:14:57 +01:00
3e417fdaa7 update release 2018-02-09 16:14:47 +01:00
f8c90b6da6 gui cmake 2018-02-09 15:27:25 +01:00
b6e5fa1944 updated Readme.md 2018-02-09 15:00:12 +01:00
daff1c9a09 updated Readme.md 2018-02-09 14:46:49 +01:00
c7b345237a updated Readme.md 2018-02-09 14:44:59 +01:00
a12694b5d0 updated Readme.md 2018-02-09 14:42:03 +01:00
40ce08d33e updated Readme.md 2018-02-09 14:40:34 +01:00
19e77bf303 updated Readme.md 2018-02-09 14:39:16 +01:00
f95b9e8d8d updated Readme.md 2018-02-09 14:37:17 +01:00
9371208a2e updated Readme.md 2018-02-09 14:35:12 +01:00
472d96cd94 updated Readme.md 2018-02-09 14:33:04 +01:00
1609f1d495 release.txt is not pushed in by default 2018-02-09 14:06:09 +01:00
7a6b6e1fea updated Readme.md 2018-02-09 14:02:57 +01:00
1b6ca913b2 removed checkout.sh as it is a single repository now 2018-02-09 13:45:13 +01:00
18c2b8d725 updated Readme.md 2018-02-09 12:27:10 +01:00
a29e70c52f updated Readme.md 2018-02-09 12:26:19 +01:00
98010057ce updated Readme.md 2018-02-09 12:24:05 +01:00
14eff53798 updated Readme.md 2018-02-09 12:23:34 +01:00
2cf150bb30 updated Readme.md 2018-02-09 12:21:25 +01:00
d2a2a2729e updated Readme.md 2018-02-09 12:19:19 +01:00
298663f143 updated Readme.md 2018-02-09 12:15:45 +01:00
5c23fd6502 updated manuals 2018-02-09 11:25:21 +01:00
2429af754f added -t option in release.txt 2018-02-09 11:08:33 +01:00
ef574e6620 indentation in release 2018-02-09 10:23:26 +01:00
0dd0486aa5 indentation in release 2018-02-09 10:22:17 +01:00
7196bfb9a5 updated release.txt 2018-02-09 10:16:06 +01:00
4338217bda jungfrau 25um server, added start acq delay to server config file 2018-02-08 15:16:23 +01:00
0cb5941fc4 Merge branch '3.0.1' into condatest 2018-02-08 13:52:51 +01:00
f7bf1ae2f1 gotthard server simplified trigger, remove synchronization and master for 50um, changed measurement time, fixed compiler bugs 2018-02-08 11:40:35 +01:00
dde032acc8 reverting locations 2018-02-08 10:54:07 +01:00
23c5a73285 Merge branch '3.0.1' into condatest 2018-02-08 10:36:06 +01:00
94b61ea2c4 parallelized setting dynamic range 2018-02-07 15:45:59 +01:00
a6b917851c finetuning printout 2018-02-07 15:22:19 +01:00
5198e67dbd made the detector ip and detector mac update client in configuremac 2018-02-07 15:16:16 +01:00
ecf1e9fac1 bugfix: returning pointer to local variable, char* to string in function definition 2018-02-07 10:14:52 +01:00
618f6291cf server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number 2018-02-07 09:23:52 +01:00
e6bd874a88 modified jungfrau server and client to make auto_comp_disable a not yet implemented feature as it requires a firmware upgrade 2018-02-05 11:50:22 +01:00
5d04067973 added auto comp disable feature 2018-02-02 18:01:01 +01:00
c520f10409 jungfrau server binaries 2018-02-02 15:19:10 +01:00
1872deb1dd fix for temperature workaround for fpga 2018-02-02 15:17:40 +01:00
e6f475d7c4 jungfrau server changes in temperature control for fpga bug: default temp threshold and temp event cleared at start and power reg only reads enable and not status 2018-02-02 12:37:52 +01:00
aebc423fb2 Merge branch '3.0.1' into jungfrauchanges 2018-02-02 10:25:45 +01:00
ee9996908a test 2018-01-30 11:24:50 +01:00
caf2548391 path 2018-01-30 11:15:31 +01:00
8778fa0aca all files in bin 2018-01-30 11:05:43 +01:00
d15fd90e8d hejhej 2018-01-29 17:31:32 +01:00
633284cbdd hej 2018-01-29 17:28:54 +01:00
a3293f4335 more headers 2018-01-29 17:27:32 +01:00
3d0d86eb19 another 2018-01-29 17:22:15 +01:00
915e0d19ca more 2018-01-29 17:20:44 +01:00
44b8f482f0 multiheader 2018-01-29 17:17:43 +01:00
e32a5263e8 file io stat 2018-01-29 17:15:00 +01:00
e8d0bea1a0 file io 2018-01-29 17:13:39 +01:00
1ecc194bf8 bc 2018-01-29 17:10:39 +01:00
fbb8efa5f4 angular static 2018-01-29 17:07:24 +01:00
b78b2bb678 angularConversion 2018-01-29 17:05:51 +01:00
d9116ec0b9 detectorData.h 2018-01-29 17:03:46 +01:00
b6f6122656 post processing header 2018-01-29 17:00:40 +01:00
80c301f88e oj 2018-01-29 16:58:31 +01:00
2feaa27c74 more 2018-01-29 16:56:27 +01:00
b398322fd2 det base 2018-01-29 16:54:34 +01:00
66e0049ded set of headers 2018-01-29 16:52:17 +01:00
7d48c2f8ee actions 2018-01-29 16:48:22 +01:00
988baca7f6 more inc 2018-01-29 16:46:03 +01:00
afd2cd1923 fimnc 2018-01-29 16:40:37 +01:00
2963d5c401 detector defs 2018-01-29 16:38:26 +01:00
2f59d58a50 receiver funcs 2018-01-29 16:33:35 +01:00
ca059db4e9 path 2018-01-29 16:30:44 +01:00
43a1d73522 ansi.h 2018-01-29 16:28:31 +01:00
87d539a040 header 2018-01-29 16:18:12 +01:00
3edac42ed3 remove png 2018-01-25 15:16:56 +01:00
17d26869b5 specific libpng version 2018-01-25 14:32:04 +01:00
933d34590b find png 2018-01-25 13:47:19 +01:00
eb57e3a1d3 gui install 2018-01-24 10:17:24 +01:00
2cc5557ec8 o 2018-01-24 10:05:45 +01:00
7f80b77060 t 2018-01-24 09:22:55 +01:00
ab4f364267 target zmq 2018-01-24 09:20:27 +01:00
3a18a0a6cf o 2018-01-23 17:49:40 +01:00
fd03cf5b0f and more targets 2018-01-23 17:46:35 +01:00
b3d6bc1800 targets 2018-01-23 17:37:54 +01:00
0242db7e7a target for install 2018-01-23 17:16:26 +01:00
41240ac135 eiger manual 2018-01-19 16:05:15 +01:00
061abf7be0 jungfrau server: changes to ensure no update of detector during this, included power chip to read the status bit and give error if temp event is up 2018-01-11 16:52:08 +01:00
2d6e4c95a2 temp_threshold, temp_control, temp_event done 2018-01-11 15:37:24 +01:00
a87687199f jungfrau server: minor typo in previous ocmmit 2018-01-11 11:36:40 +01:00
d879379aa4 jungfrau server: incorporated transmission delay 2018-01-11 11:33:26 +01:00
8fc3d97e78 jungfrau server: changed delay to trigger delay to have better trigger being caught 2018-01-11 09:26:50 +01:00
beabd03be2 jungfrau server: (also previous commit) date changed to have only 6 nibbles in format yymmdd 2018-01-11 09:24:49 +01:00
348a426242 updating to have developer's debug mode, resetfpga, programfpga and added api versioning, changed software date to only have date 2018-01-11 09:14:45 +01:00
68d6c514a9 jungfrau server has same resetfpga, programfpga and debug mode as developer branch, eiger server has effects from debug flag, but not compiled 2018-01-10 15:49:40 +01:00
834794ad98 gotthard renamed binaries 2017-12-19 18:04:44 +01:00
6690335971 gotthard server bug fix, temp read 2017-12-19 17:50:20 +01:00
bc8c706150 updated gotthard server binaries (3.0.0.6 was already used in 3.0.1) 2017-12-19 17:44:32 +01:00
e39bee0113 gotthard server bug fix, temp fail 2017-12-19 17:33:27 +01:00
a4dc00b252 gotthard server binary update 2017-12-19 17:08:28 +01:00
6438238b55 gotthard server bug fix, read temp 2017-12-19 17:06:45 +01:00
0649626842 made the color fix for black/white backgrounds 2017-12-14 14:29:07 +01:00
e7f7e0f280 Merge remote branch 'slsDetectorCalibration/3.0.1' into 3.0.1 2017-12-12 11:14:30 +01:00
735b8ea206 Merge remote branch 'slsDetectorCalibration/3.0' into 3.0 2017-12-12 11:14:24 +01:00
56c504abbb Merge remote branch 'slsDetectorCalibration/2.3.4' into 2.3.4 2017-12-12 11:14:19 +01:00
4d6346e678 Merge remote branch 'slsDetectorCalibration/2.3.3' into 2.3.3 2017-12-12 11:14:15 +01:00
dc7e448759 Merge remote branch 'slsDetectorCalibration/2.3.2' into 2.3.2 2017-12-12 11:14:12 +01:00
e658cbacda Merge remote branch 'slsDetectorCalibration/2.3.1' into 2.3.1 2017-12-12 11:14:08 +01:00
1e6c6dea71 Merge remote branch 'slsDetectorCalibration/2.3' into 2.3 2017-12-12 11:14:05 +01:00
0e5d4d1d8e Merge remote branch 'slsDetectorCalibration/2.2' into 2.2 2017-12-12 11:14:01 +01:00
8da5b8318f removed a few stuff from gitignore 2017-12-12 09:05:39 +01:00
03de29de90 refine threadpool mutex, remove unlock before destroying, unlocking twice is undefined behaviour 2017-12-11 18:02:33 +01:00
bb3e5351b4 solving warnings from latest linux 2017-12-11 13:51:11 +01:00
d6a4f83a99 ignore misleading indentation 2017-12-11 11:13:25 +01:00
29d66e455d possible to make only certain components of system 2017-12-11 10:51:19 +01:00
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
8c123982d2 get detector and receiver status only when necessary for stopacquisition 2017-12-08 11:50:10 +01:00
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
bf9905ad2a possible to use binary --version or -v to get the branch and versionid 2017-12-06 19:05:35 +01:00
c4a242e10a changed all variables from svn to git, included --version for receiver binary 2017-12-06 10:29:57 +01:00
7436d6c8d3 updaterev 2017-12-06 08:44:07 +01:00
b498043ea6 remember old read freq if not 0 in gui 2017-12-05 16:04:10 +01:00
7aaf95a565 -1 in getadc fixed in gui as well 2017-12-05 15:37:34 +01:00
7b1f935da2 allowing to read adcs/temp during acquire 2017-12-05 14:49:20 +01:00
ce1ec97571 some indentation in writing config file 2017-12-05 13:47:01 +01:00
d00c837977 updated write config and write parameters list 2017-12-05 13:41:16 +01:00
536203b6dc one repo so need for gitall.sh 2017-12-05 11:16:22 +01:00
65b4c69847 REST implementation removed from slsReceiver 2017-12-05 11:03:52 +01:00
61791c078c Merge remote branch 'slsDetectorGui/3.0.1' into 3.0.1 2017-12-04 16:48:17 +01:00
36802cdb14 Merge remote branch 'slsReceiverSoftware/3.0.1' into 3.0.1 2017-12-04 16:48:17 +01:00
e26cf3b673 Merge remote branch 'slsDetectorSoftware/3.0.1' into 3.0.1 2017-12-04 16:48:15 +01:00
aab62fccc1 Merge remote branch 'slsDetectorGui/3.0' into 3.0 2017-12-04 16:48:09 +01:00
73ce4abd58 Merge remote branch 'slsReceiverSoftware/3.0' into 3.0 2017-12-04 16:48:08 +01:00
c12b137b79 Merge remote branch 'slsDetectorSoftware/3.0' into 3.0 2017-12-04 16:48:07 +01:00
befdcf7f36 Merge remote branch 'slsDetectorGui/2.3.4' into 2.3.4 2017-12-04 16:48:01 +01:00
02f5c472a8 Merge remote branch 'slsReceiverSoftware/2.3.4' into 2.3.4 2017-12-04 16:48:00 +01:00
75ed2cd2e4 Merge remote branch 'slsDetectorSoftware/2.3.4' into 2.3.4 2017-12-04 16:47:59 +01:00
3be045f9b6 Merge remote branch 'slsDetectorGui/2.3.3' into 2.3.3 2017-12-04 16:47:54 +01:00
8fae982802 Merge remote branch 'slsReceiverSoftware/2.3.3' into 2.3.3 2017-12-04 16:47:54 +01:00
128ec88b5f Merge remote branch 'slsDetectorSoftware/2.3.3' into 2.3.3 2017-12-04 16:47:52 +01:00
d5fc158330 Merge remote branch 'slsDetectorGui/2.3.2' into 2.3.2 2017-12-04 16:47:47 +01:00
864e6e4c81 Merge remote branch 'slsReceiverSoftware/2.3.2' into 2.3.2 2017-12-04 16:47:47 +01:00
343d96ff16 Merge remote branch 'slsDetectorSoftware/2.3.2' into 2.3.2 2017-12-04 16:47:46 +01:00
4142328437 Merge remote branch 'slsDetectorGui/2.3.1' into 2.3.1 2017-12-04 16:47:41 +01:00
6c797988c7 Merge remote branch 'slsReceiverSoftware/2.3.1' into 2.3.1 2017-12-04 16:47:41 +01:00
215c262981 Merge remote branch 'slsDetectorSoftware/2.3.1' into 2.3.1 2017-12-04 16:47:39 +01:00
081b809078 Merge remote branch 'slsDetectorGui/2.3' into 2.3 2017-12-04 16:47:35 +01:00
9263567cd8 Merge remote branch 'slsReceiverSoftware/2.3' into 2.3 2017-12-04 16:47:34 +01:00
58e90a85be Merge remote branch 'slsDetectorSoftware/2.3' into 2.3 2017-12-04 16:47:33 +01:00
025c836e25 Merge remote branch 'slsDetectorGui/2.2' into 2.2 2017-12-04 16:47:28 +01:00
5d5abae3f4 Merge remote branch 'slsReceiverSoftware/2.2' into 2.2 2017-12-04 16:47:28 +01:00
e2ad46386e Merge remote branch 'slsDetectorSoftware/2.2' into 2.2 2017-12-04 16:47:26 +01:00
d1e3d50a87 cosmetic print outs 2017-12-01 12:43:14 +01:00
a06f29f473 minor cosmetics 2017-12-01 11:23:17 +01:00
18422ce215 setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked 2017-12-01 09:18:42 +01:00
e9343a5bd0 remove warning 2017-11-30 19:07:05 +01:00
70bf6eb4cb restream stop from receiver 2017-11-30 18:39:08 +01:00
ca855e6d39 restream stop from receiver 2017-11-30 18:37:11 +01:00
2227265357 removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire 2017-11-30 16:25:23 +01:00
baee38802b wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it 2017-11-30 16:20:26 +01:00
712c9a4524 zmq connect earlier in gui to prevent losing first messages 2017-11-29 12:13:02 +01:00
b75985088d twice connect bug fix in zmq 2017-11-28 18:50:18 +01:00
a351fa8f28 switching from black to white background for receiver 2017-11-28 11:18:30 +01:00
4825ace129 switching from black to white background for receiver 2017-11-28 11:18:22 +01:00
ba71529ff2 comment in users 2017-11-28 10:50:35 +01:00
1fce54ec4b zmqport in users fixed 2017-11-28 10:35:06 +01:00
1dd300f713 only call register call back which already enables streaming in client and receiver, added to postprocessing 2017-11-28 09:36:54 +01:00
d5c310a2db only call register call back which already enables streaming in client and receiveR 2017-11-28 09:36:14 +01:00
9f91b78696 update comments 2017-11-28 09:26:12 +01:00
d1eab6f750 updated slsdetector users for zmqport set up 2017-11-28 09:24:40 +01:00
c0a114345b bug fix set error mask when setting wrong settings 2017-11-27 16:11:33 +01:00
386ef7766c zmq streaming should work with external gui now 2017-11-27 16:01:12 +01:00
375b1c9485 not required to restart client datastreaming due to connect everytime for acquire 2017-11-27 15:40:36 +01:00
65d7922286 merge solved 2017-11-23 18:24:24 +01:00
eb89e9bf96 Merge branch '3.0.1' into zmqchange 2017-11-23 18:22:27 +01:00
9f733c1dfb Merge branch '3.0.1' into zmqchange 2017-11-23 18:22:26 +01:00
59b5fe9424 receiver read freq should save value in shm even if no receiver present 2017-11-23 18:22:03 +01:00
16e4fbf8dd receiver read freq should save value in shm even if no receiver present 2017-11-23 18:21:54 +01:00
d40a2e0efa receiver read freq should save value in shm even if no receiver present 2017-11-23 18:21:29 +01:00
5eb8402742 bugfix zmq streaming both on 2017-11-23 17:28:35 +01:00
dc5384f0f9 copy zmq port even if receiver not online, else it is lost 2017-11-23 17:20:07 +01:00
20dc338c90 when changing network parameter, switch off data streaming only if on 2017-11-23 17:00:12 +01:00
b14ea217ee Merge branch '3.0.1' into zmqchange 2017-11-23 16:34:14 +01:00
da3ca9f306 changes to use ZmqSocket.h externally without further changes 2017-11-23 16:28:02 +01:00
ad64df01c7 somewhere 2017-11-23 14:53:40 +01:00
8538604c0f somewhere 2017-11-23 14:53:37 +01:00
d23c9d52ed somewhere 2017-11-23 14:53:33 +01:00
3b292bdeb6 need to enable data streaming for client 2017-11-23 10:27:59 +01:00
856ad76247 included setreceiver online in users class, so that one can start using users without config file 2017-11-23 10:21:54 +01:00
4749e8c4e4 modified users client to work without config and better print out 2017-11-23 09:34:12 +01:00
447451231c modified users client to work without config and better print out 2017-11-22 18:09:16 +01:00
7860637b46 switching off data streaming from command line only in receiver start and not in receiver as a whoel put command 2017-11-22 18:02:36 +01:00
ea3c722552 made a bin in manual api to be able to compile here 2017-11-22 17:47:16 +01:00
4ecbfada5b Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1 2017-11-22 17:43:12 +01:00
d47abb140f removed detreceivernocall 2017-11-22 17:43:00 +01:00
6753f8ba6c network parameter should return with extra plus at the end like hostname 2017-11-22 17:06:43 +01:00
8c45f94496 updated npixelsy for jungfrau effecting hdf5 mapping 2017-11-21 15:46:10 +01:00
e023cb186f manual 2017-11-21 15:34:56 +01:00
fd4dd5b1e9 removed printout 2017-11-21 15:12:05 +01:00
167a6cff3e restart streaming if port changed in multi level, sls detector level:need to take care of it on your own 2017-11-21 13:42:11 +01:00
d00df32e49 changing zmq rxr port should restart data streaming 2017-11-21 13:39:49 +01:00
2cc11f1ff0 bug fix: enabledatastreaming get should return shared memory variable and not from receiver, bug fix:zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same 2017-11-21 13:39:12 +01:00
49ba893d7e zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same 2017-11-21 13:38:31 +01:00
d1d530f0e7 manual 2017-11-20 16:43:39 +01:00
a0c014eb7d changed rate correction back to what it was before in users class, enabling sets defaults 2017-11-20 15:14:01 +01:00
23b415d837 streaming port set return same as get simple change 2017-11-17 14:04:03 +01:00
a79864a5ae bugfix enabledata streaming send int for update 2017-11-17 11:35:54 +01:00
823d537825 fixed warnings 2017-11-17 09:26:20 +01:00
d7137e0c75 fixed segmentation fault issue of xputsn the right way, fixed warnings 2017-11-17 09:26:05 +01:00
2569ffbf10 fixed warnings, back to int warning in debugstream due to 64 bit 2017-11-17 08:53:05 +01:00
b020270734 edited cmake to show warnings 2017-11-17 08:46:59 +01:00
f647bdaa48 updated users class to reflect zmq changes (separation), fixed warnings 2017-11-17 08:46:43 +01:00
c1e735c1b4 fixed a few warnings 2017-11-17 08:46:04 +01:00
4097c37b31 in between 2017-11-16 16:01:31 +01:00
a89265faf8 Merge branch '3.0.1' into zmqseparate 2017-11-16 15:09:14 +01:00
8e0414d1b9 separating zmqport, enabling in client and receiver works 2017-11-16 15:01:22 +01:00
bbcf75bc09 separating zmqport, enabling in client and receiver works 2017-11-16 15:00:59 +01:00
065b4a8e0f including zmq port change in gui 2017-11-16 13:50:30 +01:00
2fca426ec0 Merge branch '3.0' into zmqseparate 2017-11-16 13:49:11 +01:00
875ca44c0b updated server hotfix binary 2017-11-16 12:30:41 +01:00
4c9cc1b477 Merge branch '3.0' into 3.0.1 2017-11-16 12:29:34 +01:00
f340eef4bc updated server hotfix binary 2017-11-16 12:29:09 +01:00
f192164e32 fixed setdac bug that comes rarely, moved serialize spi to 32bit 2017-11-16 12:27:58 +01:00
c69ae52e76 somewhere 2017-11-16 09:12:57 +01:00
7dee07b9c5 somewhere 2017-11-16 09:12:54 +01:00
0e8d2de253 somewhere 2017-11-16 09:12:49 +01:00
fd34bab34b in between separating datastreaming in client and receiver 2017-11-15 17:19:07 +01:00
2b0d07387a in between separating datastreaming in client and receiver 2017-11-15 17:16:47 +01:00
eb4ab306c7 in between separating datastreaming in client and receiver 2017-11-15 17:16:37 +01:00
32d32dbcdc in between separating datastreaming in client and receiver 2017-11-15 16:16:59 +01:00
6d6133be59 Merge branch '3.0' into zmqseparate 2017-11-15 10:34:30 +01:00
bee751cebb updated binaries 2017-11-15 09:31:49 +01:00
fee95d228e Merge branch '3.0' into 3.0.1 2017-11-15 09:29:05 +01:00
ea0c436fc8 updated binaries 2017-11-15 08:07:59 +01:00
90fb8258ca updated binaries 2017-11-14 17:52:51 +01:00
dd1cf42a73 proper fix for settings, including dacs 2017-11-14 17:51:13 +01:00
dda86cfe9b somewhere in separating zmq rxr and client 2017-11-14 16:26:17 +01:00
a3a30d9b50 manual 2017-11-14 15:18:39 +01:00
b814515d0a manual 2017-11-14 12:42:30 +01:00
0ae706d9a5 file index sent along with zmq stream 2017-11-14 12:13:06 +01:00
6693d08331 fixed help of acquire doing an actual acquisition 2017-11-14 11:53:37 +01:00
4903164f95 added high voltage to users class 2017-11-14 10:58:54 +01:00
ef257d12e7 prev bug fix of ratecorr for eiger from users, made simpler 2017-11-14 09:13:32 +01:00
7e0af1cc7c bugfix: users rate correction able to set for eiger 2017-11-14 09:08:08 +01:00
52a9303a5e removed compression from gui in expert mode 2017-11-13 15:32:24 +01:00
409519a3db fixed the double plot due to unzooming in gui 2017-11-13 15:25:49 +01:00
70848c9891 bugfix ratecorr always gave back -100 2017-11-13 13:39:28 +01:00
dedc00f1bd compiling with rflag 2017-11-13 12:28:27 +01:00
e1c7176c00 Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_receiver_software into 3.0.1 2017-11-10 16:31:01 +01:00
53caebe0f3 replaced gethostbyname with getaddrinfo as it is not thread safe 2017-11-10 16:30:48 +01:00
739187943d replaced gethostbyname with getaddrinfo as it is not thread safe 2017-11-10 16:30:38 +01:00
fb0afc282d gotthard server, too fast now sets stopped bit high and stops acquisition, so polling status also made aware of stopped bit 2017-11-09 14:01:36 +01:00
d24ab31d87 gotthard fix 2017-11-09 13:44:38 +01:00
9255cdde8a bug fixx for the 9m gethostbyname being not thread safe 2017-11-09 13:42:57 +01:00
7c344d4a39 recompile with -fPIC flag 2017-11-08 15:14:34 +01:00
7157b2817d update to zmq 4.0.8
among other fixes, this fixes the tmpnam warning
2017-11-02 10:49:24 +01:00
acfd9acc6c update binaries 2017-10-27 16:09:46 +02:00
18d5fd5a35 update binaries 2017-10-27 16:08:52 +02:00
1881cb0010 updated binaries 2017-10-27 16:07:42 +02:00
1420921291 Merge branch '3.0' into 3.0.1 2017-10-27 15:47:15 +02:00
aab56ea943 updated jungfrau server binary 2017-10-27 15:39:55 +02:00
045a7cfcb1 removed settings bug, highvoltage returning 60 when switched off 2017-10-27 15:38:07 +02:00
92f988ddc1 somewhere 2017-10-27 14:00:57 +02:00
f4f03f659a color code in user example depending on modID, instead of xcoord 2017-10-23 17:07:45 +02:00
e417885459 merge conflict in release, merged incorporating no call back and call back into one user example 2017-10-23 15:30:00 +02:00
65fd5a3057 merged without call back and call back into one user example 2017-10-23 15:26:04 +02:00
387b4ef457 updated release with patches notes 2017-10-19 17:09:50 +02:00
c755a5b602 bug fix to release.txt from the merge 2017-10-19 14:41:46 +02:00
72b71cd680 merge from 3.0 hotfixes done 2017-10-18 17:39:19 +02:00
5388b54eff updaterev 2017-10-18 15:52:08 +02:00
75b94e6614 fixed file write enable bug from the last patch 2017-10-18 12:29:46 +02:00
4aa0c8e24e Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1 2017-10-17 12:14:40 +02:00
40cb2993fb eiger manual 2017-10-12 12:15:43 +02:00
fe6e1c8868 new eiger server binary with status fixed 2017-10-12 11:48:43 +02:00
eb78ae0fe1 new eiger server binary with status fixed 2017-10-12 11:44:46 +02:00
8585a536ec fixed eiger server status problem, updating binary in next commit 2017-10-12 11:42:37 +02:00
338fb2af35 in betwee, fixed eiger server error 2017-10-12 11:38:26 +02:00
a6e520d969 in between stage: error in compiling eiger server with error status: include file 2017-10-12 11:35:31 +02:00
eb32335194 trying changes to server for error 2017-10-12 10:51:47 +02:00
a59309b13f minor bug fix if same client: client ip only 8 bytes instead of 16 bytes copied, added user class functionality for long term use:stopacquisition 2017-10-12 10:18:15 +02:00
f2f061ae18 bug fix: using int instead of int64_t , eg exptime is -1 on return 2017-10-12 09:47:13 +02:00
d30a839eff file writer class should be created only if file write enabled, x coord fixed to reflect hardcoded values as detector does not send this value yet 2017-10-10 16:54:50 +02:00
948eb455e2 editing release text, in between, need to still fix eiger server with new eror status functionality 2017-10-10 12:15:04 +02:00
44bf4c52ed changes for eiger server to return error if error 2017-10-06 13:48:06 +02:00
2aed12dcb9 updaterev 2017-10-03 14:18:33 +02:00
96caf728c8 setting receiver to none properly, ten giga set in shared memoery properly if no receiver involved 2017-10-03 14:17:48 +02:00
e51d178eaa added silent mode functionality and modified users class for it, updated manuals 2017-09-27 10:18:20 +02:00
0a446c425b added users functions for silent mode 2017-09-27 10:17:48 +02:00
6a8aad4c2b added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time 2017-09-27 10:11:31 +02:00
af98d2bb53 added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time 2017-09-27 10:09:02 +02:00
1c3b9c603c manual 2017-09-21 20:26:35 +02:00
7134d0d0ed temp_adc not in eiger for usersclass (esrf). get adc in millicelsius 2017-09-21 14:51:32 +02:00
5873b5c9a8 negligible indentation change 2017-09-21 13:34:54 +02:00
271664f577 changes to users class to call dac and adc by string name 2017-09-21 12:54:03 +02:00
f2be03be05 example for adc index in users 2017-09-21 11:51:38 +02:00
7e37a1da4b change in user functions 2017-09-21 11:16:29 +02:00
18f014fd9e added in users class startreceiver, stop receiver, start status 2017-09-21 11:05:20 +02:00
11d58beec2 updaterev 2017-09-20 19:00:20 +02:00
88b1a5c66a updaterev 2017-09-20 19:00:15 +02:00
a250565f44 updaterev 2017-09-20 19:00:09 +02:00
378f4f0891 updated release doc 2017-09-20 18:59:48 +02:00
45ee8b2a2b changes usleep back to normal in postprocessing 2017-09-20 18:27:54 +02:00
fda9c85bb3 included threaded 0 as a possibility 2017-09-20 17:07:51 +02:00
850ae77b43 in between modifying release.txt 2017-09-19 17:32:02 +02:00
6b6ad6efe0 added one without call back 2017-09-19 16:47:56 +02:00
ae066fab93 modified userReceiver to make it work 2017-09-19 16:33:05 +02:00
41db424837 got rid of usleep, changed to pause() 2017-09-19 16:32:15 +02:00
3a79f0ad9b parallelizing file name has its consequences, file name prefix edited only in multi level 2017-09-19 11:37:54 +02:00
15b86a50d5 added advanced user stuff for esrf 2017-09-19 10:05:55 +02:00
5b0fd60775 parallelized ratecorrection 2017-09-18 17:49:08 +02:00
90f899c936 replaced post incrementing by pre incrementing 2017-09-18 17:20:38 +02:00
a95e2efdb0 parallelized settimer, setfileindex, setonline, setreceiveronline, getreceiverstatus, resetframescaught, setFrameIndex, setFileName, getFramesCaughtByReceiver; added getFramesCaughtbyAnyreceiver to avoid threadpool and to use in post processing 2017-09-18 16:47:22 +02:00
54d231d3c6 parallelized set timer, file index 2017-09-15 14:51:43 +02:00
bcea5a99a1 1. bug fix: loading trimbits and gui complains of different trimbits and sets them all to zero. This is fixed. It just loads -1 to gui. 2. Advanced Tab made slightly better aligned 2017-09-15 09:36:44 +02:00
e6125c3c7f base fix for parallelism made more efficient 2017-09-15 09:20:43 +02:00
67cdfe8b41 in between 2017-09-14 16:58:39 +02:00
c37d3feae9 update revision 2017-09-01 13:59:18 +02:00
c086e9c19f allow for slow joiner in zmq 2017-09-01 13:58:00 +02:00
be37e315c9 compile with gdb flag 2017-09-01 12:01:35 +02:00
91f3db6691 separated virtual master and slave executables 2017-08-30 15:38:43 +02:00
56aa4be358 added eiger virtual class. eiger server minor bug fix. 1. copying local trimbits over from module (in effect same thing)2.rate correction table calculated each time and now only when period is different 2017-08-30 15:29:58 +02:00
7099bc3286 removed users folder, redundant as user documentation in manual-api 2017-08-28 14:17:10 +02:00
35dcdd62c9 links to libraries in manual 2017-08-28 14:15:57 +02:00
84b0f9a91b updaterev 2017-08-28 12:05:48 +02:00
91fece87b2 updaterev 2017-08-28 12:05:42 +02:00
05c5ad711b solving the issue of deleting context by setting linger to 0 so that all open sockets are closed 2017-08-28 12:03:15 +02:00
ad4fdcfa1a eiger manual 2017-08-26 13:32:00 +02:00
2efe9cd40b Eiger manual 2017-08-26 09:01:56 +02:00
07594e0607 eiger manual 2017-08-25 16:14:53 +02:00
c4c063534e update user doc 2017-08-25 15:56:30 +02:00
705e1a762c updating user documentation 2017-08-25 15:46:42 +02:00
a8b41ca813 updating user documentation 2017-08-25 15:46:16 +02:00
0de9682e72 Merge branch '3.0' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0 2017-08-25 15:45:37 +02:00
ce0aa98b3f updated users documentation 2017-08-25 15:42:56 +02:00
57fee3d5ef eiger manual 2017-08-25 14:24:42 +02:00
891e76af0a gotthard bug fix documented 2017-08-25 12:22:40 +02:00
67e92fdf68 Merge branch '3.0' into developer 2017-08-25 12:08:26 +02:00
13186e1ee2 modified examples 2017-08-25 12:08:14 +02:00
14f97cbc10 Merge branch '3.0' into developer 2017-08-24 18:42:32 +02:00
6d2072f198 removed unnecessary print in makefile for manual 2017-08-24 18:41:56 +02:00
a78bc86bca adc reader standalone for blackfin as well 2017-08-24 18:41:30 +02:00
5e11e0a7db added adc reader standalone 2017-08-24 18:40:52 +02:00
319d883880 modified user example in manual/manual-api and regenerated documentation 2017-08-24 16:47:27 +02:00
2d52058a55 Printing thread Ids created and exited, others (if others) are zmqs internal threading, moved all zmq socket type to publish subscriber type: (non blocking in send if no client) as per Aldos gui and probably faster, as only clients to receiver standard impl is aldos gui/slsDetectorGui/xiaoqiangs call back via detector class 2017-08-24 16:06:00 +02:00
e5c84fd11c external gui unused variables 2017-08-24 16:03:31 +02:00
598d163173 new gotthard server in bin 2017-08-24 16:02:51 +02:00
6f09a5abff Merge branch 'developer' into 3.0 2017-08-24 14:09:36 +02:00
fbb04f5ebe Merge branch 'externalgui' into developer 2017-08-23 19:06:59 +02:00
0bea688a83 changes for external gui 2017-08-23 19:06:40 +02:00
19d973f5d6 Merge branch '3.0' into externalgui 2017-08-23 18:26:46 +02:00
92d5143f81 Merge branch '3.0' into developer 2017-08-23 18:26:36 +02:00
6332025bbc frames caught in 9m was only looking at 1st receiver, now made to average 2017-08-23 18:26:25 +02:00
bdccddfe97 in between 2017-08-23 18:24:48 +02:00
a236a7a9aa Merge branch '3.0' into externalgui 2017-08-23 18:01:58 +02:00
72c4cbe871 Merge branch '3.0' into developer 2017-08-23 18:01:48 +02:00
7ffd9b87b8 bug fix:removed 0x prefix for dr 2017-08-23 18:01:34 +02:00
a657bac1b1 removed a print 2017-08-23 18:01:02 +02:00
f4e2b819d2 changes for external gui 2017-08-23 16:31:32 +02:00
634fbc748e compile libraries with -fPIC flag 2017-08-23 16:13:36 +02:00
8fde83499e Merge branch '3.0' into developer 2017-08-23 12:10:29 +02:00
5e90386fda manual 2017-08-23 12:09:42 +02:00
2116070f02 Merge branch '3.0' into externalgui 2017-08-23 10:11:57 +02:00
02c193118b Merge branch '3.0' into developer 2017-08-23 09:41:27 +02:00
33894509e6 Merge branch '3.0' into developer 2017-08-23 09:41:26 +02:00
b208acf4a0 moved doxy.config to here 2017-08-23 09:41:10 +02:00
02f4b5f546 manual-main fixed, detaildoc not, but for developers and in next release 2017-08-23 09:40:53 +02:00
b2513cad23 Merge branch '3.0' into developer 2017-08-22 19:43:49 +02:00
4f28df03ab trials 2017-08-22 19:43:26 +02:00
a7dab9a257 updating user documentation. another update required 2017-08-22 19:42:52 +02:00
ca756dbeee Merge branch '3.0' into developer 2017-08-22 19:40:47 +02:00
760ca98ee4 updating user documentation. another update required 2017-08-22 19:40:20 +02:00
960dc5c62f removing the print 2017-08-21 10:40:15 +02:00
03d9e1d182 check should be before and after the push or pull 2017-08-21 09:24:26 +02:00
25886044ab Merge branch '3.0' into developer 2017-08-21 09:21:41 +02:00
4dd7cafe32 Merge branch '3.0' into developer 2017-08-21 09:21:41 +02:00
f78a7b201b updated master file to reflect all files(not just eiger) 2017-08-18 18:35:55 +02:00
4e374eb2cd updaterev 2017-08-18 18:35:30 +02:00
5b80ef6d04 changes to release 2017-08-18 18:35:04 +02:00
cc5862533e changes for the statistic moved to listener 2017-08-18 17:57:31 +02:00
d58dd1d035 reset fifo statistic at measurement startup 2017-08-18 17:24:56 +02:00
3b497eca36 reset fifo statistic at measurement startup 2017-08-18 17:23:52 +02:00
f4a11533be removed prints 2017-08-18 17:02:09 +02:00
fe24c8fb86 changed check 2017-08-18 17:00:28 +02:00
608f292e4f moved statistics to listener 2017-08-18 16:50:19 +02:00
9868ca3eca Merge branch '3.0-rc' into developer 2017-08-18 16:13:51 +02:00
de3c62fea4 Merge branch '3.0-rc' into developer 2017-08-18 16:13:51 +02:00
4b6144c489 updated server binaries 2017-08-18 16:13:33 +02:00
4838d6c037 updated server binaries 2017-08-18 16:13:09 +02:00
ec4be4f2c0 bugfix: framesl was not conected, exptime default time is 10 us 2017-08-18 16:11:49 +02:00
e93f53f459 changes for min fifo level 2017-08-18 15:59:18 +02:00
efad86335f made fifo bound volatile 2017-08-18 15:29:15 +02:00
70c2165df4 check of fifo level before trying to push in successfully 2017-08-18 15:21:30 +02:00
c1ea73d21c some changes for release txt 2017-08-18 14:03:11 +02:00
181616fb67 Merge branch '3.0-rc' into developer 2017-08-17 17:24:30 +02:00
ed8e41a02c Merge branch '3.0-rc' into developer 2017-08-17 17:24:30 +02:00
37f881017a updating command line docu. 2017-08-17 17:24:20 +02:00
cda7814c21 timing put for delay and period 2017-08-17 17:23:13 +02:00
c87cb5d051 Merge branch '3.0-rc' into developer 2017-08-17 17:16:59 +02:00
70a55428bc removed 2 files in doxygen always generated 2017-08-17 17:16:41 +02:00
8c0b4ac216 Merge branch '3.0-rc' into developer 2017-08-17 17:13:40 +02:00
60292ca0f8 added to .gitignore 2017-08-17 17:13:30 +02:00
fecac2c4d2 Merge branch '3.0-rc' into developer 2017-08-17 17:10:52 +02:00
9167d113dc command line doc. done 2017-08-17 17:10:32 +02:00
04ebc85fcc command line doc. done 2017-08-17 17:09:59 +02:00
de5986e5dd Merge branch '3.0-rc' into developer 2017-08-17 17:09:05 +02:00
7cfc6a9fd9 Merge branch '3.0-rc' into developer 2017-08-17 17:09:04 +02:00
e0c29190a2 command line doc. done 2017-08-17 17:08:55 +02:00
ff7b6c5abe Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc 2017-08-17 17:04:57 +02:00
269227b093 Merge branch '3.0-rc' into developer 2017-08-17 17:04:30 +02:00
355c0a8c11 command line docu. more coming up 2017-08-17 17:04:29 +02:00
be95de0963 Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc 2017-08-17 17:04:27 +02:00
0dd6567ce4 changed some sections in the documentation 2017-08-17 17:04:07 +02:00
638a69ad23 Merge branch '3.0-rc' into developer 2017-08-17 17:02:43 +02:00
7115ac19b6 command line docu. more coming up 2017-08-17 17:02:42 +02:00
b20f994ac4 Merge branch '3.0-rc' into developer 2017-08-17 16:59:08 +02:00
4adf3e9385 command line docu. more coming up 2017-08-17 16:59:07 +02:00
ae13fbce72 changed some sections in the documentation 2017-08-17 16:57:06 +02:00
68840b4544 Merge branch '3.0-rc' into developer 2017-08-17 16:50:18 +02:00
e2af1de83f Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc 2017-08-17 16:49:54 +02:00
7156d2e7b3 updated client docu. more coming up 2017-08-17 16:49:48 +02:00
e2d451a400 Merge branch '3.0-rc' into developer 2017-08-17 16:46:49 +02:00
3189bd5359 command line docu. more coming up 2017-08-17 16:46:48 +02:00
c3fce9822f Merge branch '3.0-rc' into developer 2017-08-17 16:40:35 +02:00
ca02a8fd72 manual 2017-08-17 16:39:48 +02:00
3c3a5062bd Merge branch '3.0-rc' into developer 2017-08-17 16:25:05 +02:00
edfa8493d8 command line docu. more coming up 2017-08-17 16:25:04 +02:00
52223e61d4 Merge branch '3.0-rc' into developer 2017-08-17 16:25:02 +02:00
827ce17fac command line docu. more coming up 2017-08-17 16:25:01 +02:00
96700d42b4 Merge branch '3.0-rc' into developer 2017-08-17 14:34:24 +02:00
56e61de863 command line docu. more coming up 2017-08-17 14:34:09 +02:00
2932a954ab Merge branch '3.0-rc' into developer 2017-08-17 14:32:46 +02:00
de7bb0b979 command line docu. more coming up 2017-08-17 14:32:45 +02:00
6ef4aa9715 Merge branch '3.0-rc' into developer 2017-08-17 14:32:44 +02:00
e333eb15cd command line docu. more coming up 2017-08-17 14:32:43 +02:00
80c8ff9f20 Merge branch '3.0-rc' into developer 2017-08-17 14:17:16 +02:00
3da71c9274 command line docu. more coming up 2017-08-17 14:17:10 +02:00
3a887eb604 Merge branch '3.0-rc' into developer 2017-08-17 14:17:05 +02:00
c6549694a8 command line docu. more coming up 2017-08-17 14:16:54 +02:00
b9cd0054a9 Merge branch '3.0-rc' into developer 2017-08-17 13:56:09 +02:00
cf5137723d command line docu update. more coming 2017-08-17 13:56:00 +02:00
945a7ed10f Merge branch '3.0-rc' into developer 2017-08-17 13:55:52 +02:00
5ef0012518 command line docu update. more coming 2017-08-17 13:55:44 +02:00
94e3874545 docu for bug fix eiger serbver 2017-08-17 12:07:57 +02:00
722fb58010 bugfix:trimval gave first pixel value and not -1 if all are different 2017-08-17 12:04:54 +02:00
d63933b2de fixed 9m hv 2017-08-17 11:09:26 +02:00
c6c0819a5e Merge branch '3.0-rc' into developer 2017-08-16 19:06:24 +02:00
45681f86ce update client command doc 2017-08-16 19:06:17 +02:00
50c5c12523 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer 2017-08-16 19:05:42 +02:00
4f773120b2 Merge branch '3.0-rc' into developer 2017-08-16 19:05:36 +02:00
4ffefc99a2 Merge branch '3.0-rc' into developer 2017-08-16 19:05:28 +02:00
16fc44b3ab update client command doc 2017-08-16 19:05:17 +02:00
e8cfadaae3 Merge branch '3.0-rc' into developer 2017-08-16 18:46:19 +02:00
ac6720e27d appears double in the intro list 2017-08-16 18:46:10 +02:00
65c76e10be Merge branch '3.0-rc' into developer 2017-08-16 18:37:30 +02:00
ae7255953d compile error bug fix 2017-08-16 18:37:10 +02:00
0bbee8d91e Merge branch '3.0-rc' into developer 2017-08-16 18:21:01 +02:00
24d6d2c24a Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc 2017-08-16 18:18:48 +02:00
28e9605ab7 eiger documentation 2017-08-16 18:18:31 +02:00
6b28201f72 comments merged 2017-08-16 17:50:46 +02:00
ae49c04dcd added documentation to slsDetectorCommand.cpp 2017-08-16 17:29:04 +02:00
87abe15227 Merge branch '3.0-rc' into developer 2017-08-16 17:28:09 +02:00
5f90db723c increased default fifo depth for gotthard 2017-08-16 17:27:31 +02:00
2ab90ae2ed Merge branch 'faststreamer' into 3.0-rc 2017-08-16 17:25:25 +02:00
4b7970c191 Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc 2017-08-16 17:23:50 +02:00
3cf092d058 updating cmd line help 2017-08-16 17:23:37 +02:00
0be51b69fb Merge branch '3.0-rc' into developer 2017-08-16 17:12:40 +02:00
57537a350f updating cmd line help; other detectors other than eiger will complain cannot set timer 14 (subexptime) when setting receiver 2017-08-16 17:12:23 +02:00
2b030abf0d sync eiger manual 2017-08-16 16:32:53 +02:00
e8217b0867 do not complain when setting timers 2017-08-16 16:26:57 +02:00
83bb7c99ea removed gotthard server binary..was for developer branch 2017-08-16 16:05:53 +02:00
24d0d776b7 new gotthard server binary 2017-08-16 16:04:47 +02:00
f4b01bc18b rst to sw1 for all 2017-08-16 16:03:57 +02:00
509d81ba7d Merge branch '3.0-rc' into developer 2017-08-16 11:50:26 +02:00
eaed8bab08 Merge branch '3.0-rc' into developer 2017-08-16 11:50:13 +02:00
3c59b3b8dd updated command line doc 2017-08-16 11:50:01 +02:00
2935722b98 updated command line doc 2017-08-16 11:49:55 +02:00
af5f61bd95 updated command line doc 2017-08-16 11:13:40 +02:00
8bc039c95f updated command line doc 2017-08-16 11:13:32 +02:00
b0b3701fcf moved the output dir of slsdetectorClientDocs 2017-08-16 11:11:26 +02:00
c489aeb9dc moved the output dir of slsdetectorClientDocs 2017-08-16 11:11:13 +02:00
db983c5439 moved the output dir of slsdetectorClientDocs 2017-08-16 11:10:56 +02:00
ca6fff9648 Merge branch '3.0-rc' into developer 2017-08-16 11:04:28 +02:00
5de120f7e7 more changes to client docu. more coming up. removed slsDetectorClientDocs from here 2017-08-16 11:03:22 +02:00
c21f7f371a more changes to client docu. more coming up 2017-08-16 10:42:27 +02:00
03cc80dc3c more changes to client docu. more coming up 2017-08-16 10:36:25 +02:00
413a944e70 fixed problem with datastream help 2017-08-16 10:11:39 +02:00
25ece55d7f more changes to client docu. more coming up 2017-08-16 10:09:27 +02:00
4d493504e3 Merge branch '3.0-rc' into developer 2017-08-15 18:42:51 +02:00
bb917b70f3 more changes to client docu. more coming up 2017-08-15 18:42:41 +02:00
c0d0ebb104 Merge branch '3.0-rc' into developer 2017-08-15 18:31:12 +02:00
f8060ef757 more changes to client docu. more coming up 2017-08-15 18:29:07 +02:00
193139f06f Merge branch '3.0-rc' into developer 2017-08-15 18:08:01 +02:00
f92a6e58d3 Merge branch '3.0-rc' into developer 2017-08-15 18:07:17 +02:00
8e1a841b42 in between command line documentation 2017-08-15 18:06:45 +02:00
6a2c0ac86d added command line documentation in release.txt 2017-08-15 18:06:20 +02:00
9bb8a94c55 updated README 2017-08-15 14:14:47 +02:00
f8bb6a04a9 so that the first image shows 2017-08-15 14:10:43 +02:00
1e7932f09c switched back to 200ms 2017-08-15 14:00:34 +02:00
02b6228856 updated eiger server 2017-08-15 13:59:03 +02:00
bcf5e1fc0b updated server binary 2017-08-14 15:07:36 +02:00
3fb92aa9dd changes done 2017-08-14 13:33:24 +02:00
77d688e508 changes done 2017-08-14 13:33:11 +02:00
1ec3a69e29 print memory allocated properly 2017-08-14 10:49:08 +02:00
aca3b4ca1b Merge branch '3.0-rc' into developer 2017-08-10 19:09:58 +02:00
0c6fcc1186 cannot put for get busy 2017-08-10 19:09:46 +02:00
92ae104f39 Merge branch '3.0-rc' into developer 2017-08-10 18:46:42 +02:00
ae6884949b Merge branch '3.0-rc' into developer 2017-08-10 18:46:42 +02:00
1a313e4d5d moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix 2017-08-10 18:46:21 +02:00
e8d83a085f moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix 2017-08-10 18:46:10 +02:00
c724756b5f included subexptime in metadata for hdf5 2017-08-10 17:33:32 +02:00
ad3e3ce255 sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa 2017-08-10 17:25:28 +02:00
f084efd263 sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa 2017-08-10 17:25:18 +02:00
af079f3168 posisibility to read adnd write registers in the front end board for eiger 2017-08-10 14:49:02 +02:00
11943c4b5c merge insignificant conflicts 2017-08-10 11:19:36 +02:00
389f356a3a high voltage reflects the master only, if 2 masters reflects -1 2017-08-10 11:09:44 +02:00
0219d09067 sub frame number for eiger in master ascii file, instead of exposure length 2017-08-10 11:07:56 +02:00
df11f41416 reworked version 2017-08-10 10:04:00 +02:00
97330b65ca to handle frame number 0s from firmware 2017-08-09 18:47:55 +02:00
eed951016b frame number 0 from firmware in eiger is dealt with 2017-08-09 18:13:23 +02:00
39847c5db6 esrf bug, shut down socket, but being processed and object deleted, fixed 2017-08-09 17:25:23 +02:00
12592c1206 updaterev 2017-08-09 17:24:43 +02:00
cb90c3722d esrf bug, shut down socket, but being processed and object deleted, fixed 2017-08-09 17:24:34 +02:00
851914f0ae manuals 2017-08-08 20:04:28 +02:00
e85973ec8b manuals 2017-08-08 19:48:32 +02:00
7a30ab25bd Merge branch '3.0-rc' into developer 2017-08-08 19:16:10 +02:00
5a45f15c7f fixed the frameindex bug (always 0) 2017-08-08 19:15:57 +02:00
558e5e2e9a added busy command, converted get frames etc to an integer output 2017-08-08 19:15:20 +02:00
82d21b6971 changes to release.txt to include busy command and the frameindex bugfix 2017-08-08 19:13:22 +02:00
ccc60dacf4 updated release.txt and the cmk.sh help script 2017-08-08 16:24:33 +02:00
517dfdf523 Merge branch '3.0-rc' into developer 2017-08-08 14:59:07 +02:00
43ba40ec4c updaterev 2017-08-08 14:51:47 +02:00
557d190236 changes for rest implementation 2017-08-08 14:51:32 +02:00
5c6a99afca changes for rest implementation 2017-08-08 14:51:00 +02:00
c98c5e469b added warning in makefile 2017-08-08 07:06:43 +02:00
d827ccc115 backported changes implemented in 2.3.2.rest 2017-08-08 06:55:52 +02:00
a40d18f8b2 last packet even if many padded packets in between should be written (from carryoverflag) 2017-08-07 19:58:48 +02:00
0cd18a3b7a more comments 2017-08-07 10:39:29 +02:00
ebe01104e7 Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc 2017-08-07 10:31:17 +02:00
6b8b6b4b3d no need of quotes for gitall.sh 2017-08-07 10:31:11 +02:00
31026576f4 delete cache before (re-)running cmake 2017-08-07 09:54:03 +02:00
2c58bc6a5c included numbe of compiler threads 2017-08-04 19:12:44 +02:00
3ed2bcf3fa added cmk.sh to build cmake files and compile 2017-08-04 18:54:22 +02:00
8f1e8b1196 cmake withotu hdf5 2017-08-04 15:40:44 +02:00
c0d6958e37 no changE 2017-08-04 15:40:21 +02:00
d2d2959237 Merge branch '3.0-rc' into developer 2017-08-04 14:21:31 +02:00
c31ee2d76f allowing -1 in gui for spinbox 2017-08-04 14:20:51 +02:00
dc318d3f47 updaterev 2017-08-04 14:20:33 +02:00
429bf7f13d updaterev 2017-08-04 14:20:21 +02:00
96ce9ed7c1 if timer gives -1 in multi, it should not multiply answer with 1e-9 to get in seconds in slsdetectorocmmand 2017-08-04 14:09:56 +02:00
41288302f4 fixed resolution for exptime, period and delay in server 2017-08-04 14:01:17 +02:00
039092f292 bug fix: changes for the multipurpose reg in configuremac 2017-08-04 11:21:32 +02:00
fbee70818a 25 um server using a config.txt file 2017-08-03 14:16:18 +02:00
5027f66d77 changed usleep 2017-07-28 12:20:54 +02:00
f5773de068 changes for single images with index 0 not realized as caught and therefore no virtual file created, fixed 2017-07-28 12:16:07 +02:00
88b6fabb0d bug did not give error when switching to hdf5 2017-07-28 11:54:22 +02:00
37dd32f1b0 version 2017-07-28 11:30:21 +02:00
5713cd6092 addin usleep to reduce cpu 2017-07-28 11:28:03 +02:00
3174bd1c85 addin usleep to reduce cpu 2017-07-28 11:27:35 +02:00
eb4da5ff0c removed print of elapsed time 2017-07-28 10:19:33 +02:00
98d5758ba1 Merge branch 'developer' into 3.0-rc 2017-07-27 14:40:50 +02:00
c49c07b34a Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer 2017-07-27 14:40:25 +02:00
058fcd8aba Merge branch 'cmakefix' into developer 2017-07-27 14:40:17 +02:00
699cce713b Merge branch 'cmakefix' into 3.0-rc 2017-07-27 14:40:01 +02:00
a88aa53d82 comment to compile statically 2017-07-27 14:39:00 +02:00
7fa13a5d5d compatible with cmake 2.8.8 2017-07-27 14:28:14 +02:00
56b420d68b manual 2017-07-27 14:20:46 +02:00
efd49ae92a removing individual hdf5 path from cmakelists 2017-07-27 13:55:23 +02:00
71204172df simplify hdf5 linking 2017-07-27 12:51:10 +02:00
6cb387e3a8 tab->space reformat 2017-07-27 12:45:27 +02:00
05b32ce26c find hdf5 cxx component 2017-07-27 12:44:21 +02:00
b920e52218 default no for hdf5 and rest 2017-07-27 12:31:12 +02:00
f07816a0d1 hdf5 works now, but needs fixes 2017-07-27 12:08:51 +02:00
c7d4582efa versioning 2017-07-27 12:08:28 +02:00
77dc4d3d77 solved some warnings 2017-07-27 12:08:12 +02:00
1d073b6897 sort of works, but needs simpler fix 2017-07-27 12:07:44 +02:00
56aaaf2e07 changes for the cmake 2017-07-27 10:18:07 +02:00
e360077e09 changes for the cmake 2017-07-27 10:17:55 +02:00
0fcf768772 basename for hdf5 fixes 2017-07-27 09:31:14 +02:00
a5f3de61a9 should be able to compile in pcmoench as l_msdetect 2017-07-26 15:09:29 +02:00
915fd41bf6 should be able to compile in pcmoench as l_msdetect 2017-07-26 15:09:24 +02:00
497f5289e6 new eiger server in serverbins 2017-07-26 11:37:23 +02:00
8a8e76e839 added usleep to remove the 100%cpu, removed a insignificant printout 2017-07-26 11:36:31 +02:00
086beea501 nothing really 2017-07-26 11:35:56 +02:00
1a522c6696 removed ui include files as they are generated anyway for every make 2017-07-26 11:14:17 +02:00
91f8987b6c removed ui include files as they are generated anyway for every make 2017-07-26 11:12:56 +02:00
5771a3c722 includes in gui 2017-07-25 13:56:27 +02:00
9d8faae375 fixed front end board temp 2017-07-25 13:55:27 +02:00
2ddf4117d0 from package to compile receiver library as well 2017-07-25 12:25:24 +02:00
68cbb63355 adding the form include files back into git 2017-07-25 12:15:58 +02:00
7df21e1790 updated server bins 2017-07-13 14:45:10 +02:00
c25239a398 updaterev 2017-07-13 14:44:52 +02:00
04165a9da8 rest implementation, index issues 2017-07-13 14:44:34 +02:00
0bacb903ea rest implementation, index issues 2017-07-13 14:44:03 +02:00
a1fd34ebb6 for users ensured proper destructors, and ctrl c should kill it 2017-07-13 12:18:45 +02:00
126ad92ed8 can set zmqport from receiver 2017-07-13 12:18:19 +02:00
e3667f6827 can set zmqport from receiver 2017-07-13 12:18:07 +02:00
39560969f4 can set zmqport from receiver, ensured proper destructors, and ctrl c should kill it 2017-07-13 12:17:49 +02:00
f1a77c4146 resolved issue with source not being looked at for compiling 2017-07-11 13:27:27 +02:00
68b1959a85 excluding detector server directories in makefile 2017-07-11 11:16:37 +02:00
931a5840e8 changes to gotthard server to include write adc, and also changes to fix the dma=dma+1 2017-07-11 10:54:21 +02:00
f430152f61 moved common git evaluation variables to the common folder 2017-07-10 11:22:56 +02:00
e0b886e2cc moved the versioning files back to include 2017-07-10 11:22:32 +02:00
ef9fd77850 some more changes to make file for automatic versioning, but changes to cpp file does not affect make, need to include that 2017-07-10 11:20:50 +02:00
672c42a20e some more changes to make file for automatic versioning 2017-07-10 11:20:26 +02:00
dbce25fdea some more changes to make file for automatic versioning 2017-07-10 11:20:15 +02:00
a583f3d6e2 some more changes to make file for automatic versioning 2017-07-10 11:18:41 +02:00
cf0ef68cda fixed adc and num dacs for jungfrau in gui 2017-07-06 18:34:00 +02:00
be6925c504 fixed temperature for jungfrau in server, also for negative values 2017-07-06 16:07:01 +02:00
14bba171e7 conflict gitversion 2017-07-03 17:45:06 +02:00
1e50bc4cc0 conflict git 2017-07-03 17:44:52 +02:00
374b07a126 merge developer 2017-07-03 17:42:06 +02:00
460a44a9b1 made updatereceiver to actually update client in parameters that it can 2017-07-03 17:37:31 +02:00
f944d7cae4 made updatereceiver to actually update client in parameters that it can 2017-07-03 17:37:24 +02:00
b4309a9f60 changed jungfrau temperature conversion but binary to follow 2017-07-03 14:45:44 +02:00
539ab79e99 changed jungfrau temperature conversion 2017-07-03 14:45:29 +02:00
99dad79572 Somewhere 2017-07-03 13:46:06 +02:00
26f9b1ccbd Somewhere 2017-07-03 13:45:45 +02:00
da4ffb235c ensuring set detector type is the first call 2017-07-03 13:32:10 +02:00
b03e35a8d6 sorted receiver client interface, more consistent 2017-07-03 13:31:17 +02:00
f8c04a6a51 sorted the receiver client interface, more manageable 2017-06-30 18:17:33 +02:00
7033d43e61 changed makefile to find libraries 2017-06-30 12:21:48 +02:00
bd9f19f6c7 changed the makefile a bit to find libraries 2017-06-30 12:20:42 +02:00
a4c07ba9a0 added black background for reciever to see gray font better 2017-06-30 12:19:27 +02:00
4b9a8c1dad makefiles and versioning update complete 2017-06-29 17:10:28 +02:00
b05e9c194a makefiles and versioning update complete 2017-06-29 17:10:10 +02:00
c01931e5a6 makefiles and versioning update complete 2017-06-29 17:09:46 +02:00
7afbd8f0f0 makefiles and versioning update complete 2017-06-29 17:09:34 +02:00
b6eb4cbb61 testing changes 2017-06-29 10:18:51 +02:00
21e1fcf693 trying with gui makefile changes 2017-06-29 09:27:26 +02:00
cfff7969e3 changes for Makefile dependencies 2017-06-28 18:52:43 +02:00
6bfbb075c8 ensuring fiel permissions 2017-06-28 18:18:30 +02:00
1a74ceca3e ensuring file permissions 2017-06-28 18:16:55 +02:00
7990dd6f77 fixed makefile and included correct versioning while compiling 2017-06-28 18:13:47 +02:00
f4857355b6 fixed new header for eiger 2017-06-28 16:53:01 +02:00
81d68bebc6 Merge branch 'developer' into eigerheaderchange 2017-06-28 11:30:46 +02:00
8992d51787 correct binary jungfrau 2017-06-28 11:26:35 +02:00
e79827384a included update git versionign in each server, removing the main one 2017-06-28 11:24:30 +02:00
4905f49108 added updateversion into makefile while compiling 2017-06-28 11:23:19 +02:00
073d30bf61 added updateversion into makefile while compiling 2017-06-28 11:21:10 +02:00
3515951bb8 added updateversion into makefile while compiling 2017-06-28 11:18:55 +02:00
fde7ddf832 added updateversion into makefile while compiling 2017-06-28 11:00:21 +02:00
7a8d0b8dad added updateversion into makefile while compiling 2017-06-28 10:57:39 +02:00
56645a48af added updateversion into makefile while compiling 2017-06-28 10:54:27 +02:00
a7d3006cda added updateversion into makefile while compiling 2017-06-28 10:48:03 +02:00
c2624daa9a uncommented a print 2017-06-28 10:27:40 +02:00
2126e2a723 added updategit 2017-06-28 10:24:49 +02:00
c2980b3c44 changes for setting threshold without trimbits for eiger 2017-06-28 10:24:07 +02:00
ca358e4d17 changes to the eiger and jungfrau server regarding getnumberofchans etc a typo bug resulting in could not allocate 2017-06-27 17:46:32 +02:00
22796d0d27 updaterev 2017-06-27 17:43:19 +02:00
e6f1a90ed7 changes 2017-06-27 14:57:43 +02:00
6a80bc5b54 new feature, set threshold without uploading trimbits 2017-06-27 13:00:38 +02:00
5dd2f273fc eigerserver changes, need to include martins changes 2017-06-27 10:22:55 +02:00
1ed4407c11 parallelizing adcs and dacs 2017-06-23 17:26:46 +02:00
f7e4dbc99e getadc must specify -1 for imod, as imod in multi might be default 0 2017-06-23 17:26:33 +02:00
57ae305c7d parallelized enabledatastreaming 2017-06-22 16:59:41 +02:00
5d75d8371b unnecessary printout 2017-06-22 16:59:18 +02:00
bbbd4731d7 ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring 2017-06-22 16:44:29 +02:00
df01ca7e4b ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring 2017-06-22 16:44:13 +02:00
931e750d65 fixed gui starting up without the config file 2017-06-22 15:26:00 +02:00
697fc5b85e updaterev 2017-06-22 14:36:22 +02:00
cd86c708dc updaterev 2017-06-22 14:36:02 +02:00
cffdf7fede updaterev 2017-06-22 14:33:24 +02:00
c05b89a77d updating exe 2017-06-22 14:32:52 +02:00
f66950d312 fixed the 9m master server having to be rebooted for hv to work 2017-06-22 14:32:24 +02:00
98cb8de478 when using userReceiver with many instances of the receiver in one program, the index will keep increasing, hence need to adjust zmq port and det index in file name 2017-06-22 12:27:17 +02:00
1dc774d229 comments 2017-06-21 17:08:47 +02:00
1c7ff1dd8c adding printouts , resetting an image size for each listen image, if last image is not complete, it should be checked with rc==0 and not if itis transmitting, else it doesnt send last incomplete image 2017-06-21 17:07:45 +02:00
fe73e09aa4 removing unnecessary printouts, ensuring lost packets are 0xff 2017-06-21 17:05:47 +02:00
b2caec384f removing receiver print config from gui 2017-06-21 17:03:41 +02:00
1c221d5844 insignificant uncommented gui in makefile 2017-06-20 12:47:25 +02:00
8b3864969c updated server exe 2017-06-20 12:45:13 +02:00
cbd1570a8c fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets), gotthard detector receiver updated 2017-06-20 12:43:28 +02:00
df71899244 fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets), gotthard detector server udpated 2017-06-20 12:40:28 +02:00
48f853aa1a fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets) 2017-06-20 12:38:59 +02:00
e2e25f6e62 changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place 2017-06-19 14:29:45 +02:00
68bbea17d1 removed fifo buffer size print out (fifo buffer size removed earlier) 2017-06-19 14:20:17 +02:00
2ec1e08081 changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui 2017-06-19 14:19:30 +02:00
3007694b77 bug (from eiger_newheader) with imagesize of fifo different from actual image size 2017-06-16 13:53:27 +02:00
c2af014dad new server 2017-06-14 12:07:58 +02:00
a46a8cc686 updaterev 2017-06-14 11:41:11 +02:00
9ab2c1eb1f new server 2017-06-14 11:40:35 +02:00
84d07a3e0c updaterev 2017-06-14 11:39:07 +02:00
8d6ceccf87 updaterev 2017-06-14 11:38:28 +02:00
5176ad521f merged with annas, removed a <<< head merge conflict 2017-06-14 11:36:44 +02:00
feb1ef4ea5 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-06-14 11:28:24 +02:00
00e742e0e0 took out also the ADC and serialspi 2017-06-14 11:28:16 +02:00
a95dbd2215 made some functions common 2017-06-14 10:43:15 +02:00
cbbdd8eeab Merged to developer 2017-06-13 15:30:33 +02:00
8caab4e562 Modicfications for chiptestboard and moench03 module 2017-06-13 15:28:45 +02:00
1537bb3298 more detail in printf 2017-06-13 12:59:26 +02:00
cb7b8713cf fixed the precision problem in converting double to long long int (0.0000325 *1E9), cant find another example 2017-06-13 12:58:56 +02:00
3d8903b2da updaterev 2017-06-12 18:54:58 +02:00
7f01ccc83f updaterev 2017-06-12 18:53:42 +02:00
e1eba8dec3 new servers 2017-06-12 18:53:18 +02:00
3fbbeea434 update rev 2017-06-12 18:51:52 +02:00
47e5504203 updaterev 2017-06-12 18:50:55 +02:00
d41abc2b1c added new jungfraustructure, wiht common detector tcp interface 2017-06-12 18:50:18 +02:00
b46da37932 new server for change in cleanup of servers 2017-06-12 18:39:06 +02:00
d862f10d5c Merge branch 'developer' into jungfrau_cleanup 2017-06-12 18:30:56 +02:00
74ca3fcc9a jungfrau server works 2017-06-12 18:27:59 +02:00
73c97f1381 solved many bugs, but cannot get data in eiger 2017-06-09 16:05:40 +02:00
f516d24089 solved many bugs, but cannot get data in eiger 2017-06-09 16:05:22 +02:00
132a9bbfe9 solved many bugs, but cannot get data in eiger 2017-06-09 16:02:58 +02:00
e10bf9d897 done, but need to compile 2017-06-09 11:42:32 +02:00
c755a8974c done, but need to compile 2017-06-09 11:42:25 +02:00
0254ff0281 cleaning up of servers 2017-06-02 19:29:34 +02:00
2465eafff0 somewhere in between 2017-05-30 19:00:11 +02:00
5481e19709 manual 2017-05-30 16:40:47 +02:00
5dbfbdb82b improved readNextFrame for moench 10G streaming; implemented many photons finder 2017-05-30 12:21:48 +02:00
f74710998d mannnnyyyy changes to jungfrau serverin structure, also to eiger structure a bit 2017-05-26 18:14:44 +02:00
db75f1c81e manual, rate corr 2017-05-26 17:47:08 +02:00
046ac97a9b now need to move it to a new server 2017-05-24 17:42:33 +02:00
b8f0dd5f38 cleaned most of it, just need confirmation from carlos 2017-05-24 17:33:03 +02:00
0ea61a1e3f somewhere 2017-05-24 11:05:37 +02:00
c012f2cda3 change for eiger 10g to work 2017-05-23 10:09:35 +02:00
978af1009e somewhere in between cleaning up 2017-05-22 14:53:15 +02:00
39a985cbba modifying registers_m.h wrt Carlos firmware document, modified detector initialization in firmware_funcs.c and related files 2017-05-19 18:27:11 +02:00
06d60c981d memset of the entire memory in the beginning, cuz mpc2012 shows leak at runtime 2017-05-19 13:45:15 +02:00
0e2d0f07e8 getting hostname from ip (for all, cuz hostname can have dots too 2017-05-19 10:21:33 +02:00
e8e9e12302 changes to header old and new, still memory leak for jungfrau 2017-05-19 10:16:16 +02:00
781fea0a96 fifo fill level included 2017-05-18 16:01:35 +02:00
4aa73c607f print loss 2017-05-18 13:59:40 +02:00
a276b6b7f5 fixed bug rx_hostname being hostname or ip in zmqsockt, and num packets correctly reflects num good frames 2017-05-18 10:53:29 +02:00
ea875a14f9 fixed bug when rx_hostname was an ip and using zmqsocket 2017-05-17 15:58:12 +02:00
cb008bb700 removed unnecessary functions in listener and dataprocessor and ensure processedin measurement is not same saas processed frames in acqustion 2017-05-17 15:37:51 +02:00
4633c142a8 hdf5 by default disabled in makefile 2017-05-16 14:49:37 +02:00
001d6415bf removing thread prioritization for writer, streamer and tcp threads 2017-05-16 14:45:48 +02:00
a182ca3660 jungfrau end column fixed 2017-05-16 11:18:36 +02:00
bd363b2c93 jungfrau finally works with new header 2017-05-15 17:02:37 +02:00
205a3780d5 changes for jungfrau new header 2017-05-15 15:00:04 +02:00
5e82b50a00 to not include hdf5 if no is given in Makefile.include 2017-05-12 15:29:34 +02:00
476f3162af including hardcoded xcord from software 2017-05-12 14:50:20 +02:00
b7291dffb9 hdf5 basic works 2017-05-12 14:33:01 +02:00
15424149cd removed leak from postprocessing, moved delete task to earlier in threadpool and deleting threadpool 2017-05-12 10:32:16 +02:00
f53770a2fc some changes to remove possible warnings 2017-05-11 14:41:07 +02:00
0e9cf558b4 Modified JUNGFRAU_MODULE_ID to match the detector type definition that is tx. with the new header. 2017-05-10 16:47:10 +02:00
95bf19a417 deleting socket and insignificant changes 2017-05-08 15:08:59 +02:00
8471765e30 insignificant 2017-05-08 14:48:29 +02:00
6d7fb07a4c fixing the standard header pointers for it to work 2017-05-08 12:33:31 +02:00
1e8c7bd637 not necessary to check file name 2017-05-08 12:33:00 +02:00
a1fc93b398 changes including warnings and zmq 2017-05-04 17:52:58 +02:00
0722ef3125 changes including warnings and zmq 2017-05-04 17:52:47 +02:00
49b4ae2f56 changed zmq method, and resolved warnings and from esrf 2017-05-03 17:57:56 +02:00
e2d1d58acf Alejandro changes from ESRF 2017-05-02 08:36:36 +02:00
44339d3b89 c_Str() not access global variables from thread 2017-05-02 08:25:45 +02:00
404bb4a653 changed -lpthread to -pthread 2017-05-02 08:15:11 +02:00
066550d38c zmq changes for no dummy data end 2017-05-01 14:02:13 +02:00
020eaded36 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-05-01 13:11:16 +02:00
445da80df8 resolved warnings, also from esrf: todo: include changes in zmq 2017-05-01 13:11:10 +02:00
f937b8ca5d Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-05-01 12:21:07 +02:00
7901b6f463 Modified "calcChecksum" function in jungfrauDetectorServer/firmware_funcs.c to compute properly the new IP header checksum for a new application header of 48 bytes. 2017-05-01 12:14:06 +02:00
e9f6dcf479 strtok is not thread safe..used to set receiver udp ip etc to detector, fixed 2017-05-01 10:24:16 +02:00
264485c8ff changed all -lpthread to -pthread 2017-05-01 09:53:37 +02:00
3525bb3f9f changed all -lpthread to -pthread 2017-05-01 09:44:33 +02:00
78d1504d66 changed all -lpthread to -pthread 2017-05-01 09:39:19 +02:00
c6cb499758 added the jungfrau binary 2017-04-28 13:41:08 +02:00
bc57ea5725 added the binary 2017-04-28 11:31:12 +02:00
27f752ff9e removed wrong edits in merging (not reflected in git browser, weird); changing server names anyway 2017-04-28 11:30:09 +02:00
b9275646ad crazy amount of changes, both necessary and unnecessary;need to narrow down the real change later 2017-04-27 14:05:04 +02:00
9e2f2697c7 crazy amount of changes, both necessary and unnecessary;need to narrow down the real change later 2017-04-27 13:58:25 +02:00
b6b0df62b6 updaterev 2017-04-20 08:26:29 +02:00
0ba537e479 removed headersize compile error 2017-04-20 08:26:16 +02:00
75ddf535dc updaterev 2017-04-19 17:59:53 +02:00
b1de501bef updaterev 2017-04-19 17:59:46 +02:00
0f3a63f101 changed zmq default port starting at 40001 to be able to view in wireshark and removed headersize for warning 2017-04-19 17:42:38 +02:00
3b4b2d707f changes without ostringstream done 2017-04-19 10:17:39 +02:00
f405aa1733 split zmq_msg_t so its not reused 2017-04-19 10:17:30 +02:00
df0fdb7ecb changes without ostringstream done 2017-04-19 10:16:45 +02:00
91b7a87557 just started changin frm ostringstream 2017-04-18 15:32:01 +02:00
9468b9ca1e updaterev 2017-04-11 13:39:59 +02:00
d7982e178e updaterev 2017-04-11 13:39:53 +02:00
9cf5714a5b removing warnings shown from esrf debian 2017-04-11 13:39:35 +02:00
0c9ac8911a removing warnings shown from esrf debian 2017-04-11 13:39:28 +02:00
4730c8c0a9 updaterev 2017-04-11 13:31:49 +02:00
43efb8acfd removing warnings shown from esrf debian 2017-04-11 13:31:32 +02:00
6ecca8fcb0 updaterev 2017-04-11 09:03:26 +02:00
17cb63a57f updaterev 2017-04-11 09:03:19 +02:00
4f83fcb001 updaterev 2017-04-11 09:02:10 +02:00
ab94af6d29 removed verbose etc 2017-04-07 15:08:40 +02:00
7c725cc69b .c_str() must not access global variables from thread 2017-04-07 14:57:19 +02:00
f0198d2d2e alejandro's changes from ESRF 2017-04-07 14:50:17 +02:00
5ddccbdee4 changed all -lpthread to -pthread 2017-04-07 14:28:00 +02:00
8fb39b8c7e changed all -lpthread to -pthread 2017-04-07 14:27:27 +02:00
bd5293f4b1 changed all -lpthread to -pthread 2017-04-07 14:26:09 +02:00
b91180f5b2 changed all -lpthread to -pthread 2017-04-07 14:26:03 +02:00
7c3b5065a5 changed all -lpthread to -pthread 2017-04-07 14:25:09 +02:00
9aef802bea changed all -lpthread to -pthread 2017-04-07 14:24:49 +02:00
f7d85231f2 solved warnings except sscanf for uint64_t 2017-04-07 14:12:21 +02:00
5b3a911e8d solved warnings except sscanf for uint64_t 2017-04-07 14:11:34 +02:00
65f5e1c1ab strtok is not thread safe..used to set receiver udp ip etc to detector, fixed 2017-04-06 15:04:33 +02:00
b401a6c33b in between stage 2017-04-04 11:20:38 +02:00
faefcc4799 Merge branch '2.3' into developer 2017-03-29 11:25:28 +02:00
1afb9e3e48 manual 2017-03-29 11:23:44 +02:00
09d3372cc0 manual 2017-03-29 10:11:16 +02:00
671587c029 manual 2017-03-29 10:09:52 +02:00
fb0b0b96ec need to automize parameter passing 2017-03-24 16:58:17 +01:00
72d89fefc3 modified release 2017-03-24 16:58:00 +01:00
a11313fe96 removed copies 2017-03-24 15:15:30 +01:00
aba3a67b80 Merge branch '2.3' into developer 2017-03-24 14:20:38 +01:00
cacb4c9d93 updaterev 2017-03-24 13:42:11 +01:00
86490226ed removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled 2017-03-24 13:41:56 +01:00
eb203c93b2 removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled 2017-03-24 13:41:30 +01:00
2bb8fa596a from the merge of 2.3 2017-03-24 12:22:49 +01:00
bb52676f50 merged from 2.3 without udpstandard 2017-03-24 10:34:31 +01:00
536f8937cb merging 2017-03-24 09:10:09 +01:00
e8b14f8c8a done 2017-03-24 08:26:10 +01:00
aca09bcd4e done 2017-03-24 08:25:50 +01:00
fdb4fa28db retrying 2017-03-24 08:22:50 +01:00
93362963e2 removed changes for test 2017-03-24 08:12:38 +01:00
33a7375c72 changes to test 2017-03-24 08:12:10 +01:00
97bad0fcb9 changes 2017-03-24 08:06:09 +01:00
059711af37 retrying a test 2017-03-24 07:59:36 +01:00
f0c5106764 trying a test 2017-03-24 07:59:14 +01:00
4182615aa9 trying a test 2017-03-24 07:58:27 +01:00
ff2c42e921 Merge branch '2.3' into developer 2017-03-23 15:38:48 +01:00
44be9829d4 removed anna from support as she prefered it 2017-03-23 15:38:24 +01:00
e450f5ec6a updaterev 2017-03-23 15:17:34 +01:00
70a7217353 changed the header size to a better number 2017-03-23 15:17:21 +01:00
7dfb1b7192 added a release text 2017-03-23 15:17:03 +01:00
da8d535dae updaterev 2017-03-23 14:09:01 +01:00
404be013a2 changes to new callback arguments without filepointer 2017-03-23 14:08:43 +01:00
6d4c0d0d46 modified users for new callback argument without filepointer 2017-03-23 14:07:56 +01:00
54371bc6be updaterev 2017-03-23 13:48:18 +01:00
5c230e2ac5 updaterev 2017-03-23 13:48:12 +01:00
0814f6369d udpaterev 2017-03-23 13:46:16 +01:00
9e658e7947 udpaterev 2017-03-23 13:46:02 +01:00
bf57be309f updated server 2017-03-23 13:44:44 +01:00
6f34dddb5a changed the file header size t0 1kb and changed its description in the header 2017-03-23 13:41:37 +01:00
c47f2f3449 solved the gui 4 bit bug where no data was displayed: due to byterperchannel being int and a 0 2017-03-23 13:31:22 +01:00
5dcacaae2a frame and packet counters for the delay was buggy, not looking at lsb and msb, fixed 2017-03-23 12:38:19 +01:00
b9eb3d5a52 somewere stuck with virtual template overloading 2017-03-23 11:56:17 +01:00
78078f4ef3 esrf suggestion for volatile in multithread threadpool 2017-03-23 11:55:56 +01:00
ea66f2d12f manual 2017-03-20 14:51:18 +01:00
de16c2a7f1 manual 2017-03-20 12:42:28 +01:00
aae4e3f993 removed unnessary printout 2017-03-20 11:22:35 +01:00
911ff49238 changes for merges from 2.3 incl standard packet header 2017-03-20 11:22:07 +01:00
6731c39ce2 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer 2017-03-20 10:48:54 +01:00
81eade8ede Merge branch '2.3' into developer 2017-03-20 10:48:38 +01:00
78958c7699 updaterev 2017-03-20 09:30:15 +01:00
575c9617c7 fixed gui for new header 2017-03-20 09:28:15 +01:00
1ab80b0517 updaterev 2017-03-20 09:28:02 +01:00
4b388f56b2 fixed gui for new header 2017-03-20 09:27:38 +01:00
fb91ba25f3 uncomment gui. insignificant 2017-03-20 09:26:13 +01:00
4d5506a0a8 manual 2017-03-15 15:52:19 +01:00
1413244617 update rev 2017-03-15 15:02:28 +01:00
dc77b07c92 update rev 2017-03-15 15:02:22 +01:00
9f68fc6f3b fixed call backs with new standard header 2017-03-15 15:00:25 +01:00
47a769e677 modified users receiver to have all objects defined in one 2017-03-15 15:00:01 +01:00
ecaa8e45a4 some changes to the command help 2017-03-15 14:52:19 +01:00
36e92c194d changes for callback to work 2017-03-14 08:23:47 +01:00
4a8f2b5a69 Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 2.3-rc 2017-03-14 08:22:29 +01:00
22e0332833 changes to callback 2017-03-14 08:21:27 +01:00
53be854efd including subframe number 2017-03-13 11:33:06 +01:00
0a1aaec708 resolved the recovering from receiver start error , but still does not acknowledge error in gui 2017-03-10 13:24:00 +01:00
cad8ffc0c6 resolved the recovering from receiver start error , but still does not acknowledge error in gui 2017-03-10 13:07:33 +01:00
8ebbfbb84b incl. prev commit: Included file overwrite, format and changed the functonality of filewrite enable and file path 2017-03-10 12:21:19 +01:00
2ef44ec70b somewhere 2017-03-10 10:51:47 +01:00
978b54dff9 somewhere 2017-03-10 10:51:37 +01:00
300b014f73 somewhere 2017-03-10 10:51:28 +01:00
1e94ec0c6a fixed short gotthard 2017-03-09 13:28:03 +01:00
86018684c9 made it work for gotthard 2017-03-09 11:40:48 +01:00
300bf85dae uncommented extra comments 2017-03-09 11:40:26 +01:00
1cbbf9409f manual 2017-03-09 09:23:57 +01:00
0ff79b7d5a manual 2017-03-09 09:21:50 +01:00
0dccd78567 not yet gotthard 2017-03-08 14:37:00 +01:00
0e4c7a9494 adjusted for jungfrau 2017-03-07 14:59:38 +01:00
679e747b5c Merge branch '2.3-rc' into developer 2017-03-07 07:30:40 +01:00
b16757e8d1 adapt eiger noise 2017-03-06 12:18:32 +01:00
daaf13d99c manual with new calibration scheme 2017-03-03 16:45:25 +01:00
6c3165b31a manual with new calibration scheme 2017-03-03 16:42:03 +01:00
e86e9361b6 removed std:: to make round compile 2017-03-03 16:00:22 +01:00
50f8366bc2 small changes for jungfrau, but also for the gui 2017-03-03 15:57:48 +01:00
f3bf331b5f solved bug of decoding data with distorted image 2017-03-03 13:48:47 +01:00
73ec3903bf added data structures for mythen3.01 and adcsar2 for jctb 2017-03-03 13:10:14 +01:00
85cc0d8184 Merge branch 'developer' into hdf5 2017-03-03 10:09:44 +01:00
7e00d9f395 Merge branch 'developer' into hdf5 2017-03-03 10:06:34 +01:00
bd7f3567f8 Merge branch 'developer' into hdf5 2017-03-03 09:33:53 +01:00
bd0f72c60e removed std:: in front of round, else compile error 2017-03-03 09:12:19 +01:00
2505369c08 updaterev 2017-03-03 09:07:46 +01:00
ab4572f544 updaterev 2017-03-03 09:07:36 +01:00
80fb0a99a8 Merge branch '2.3-rc' into hdf5 2017-03-03 09:06:49 +01:00
bdff083402 Merge branch '2.3-rc' into hdf5 2017-03-03 09:05:40 +01:00
053e05628f callback 2017-03-03 08:50:55 +01:00
d8b0a13ee2 changed to have only one virtual file with bunch id, subfnum and data datasets all linked in master file 2017-03-03 08:39:53 +01:00
537260879a created virtual datasets for bunchid and subframenumber 2017-03-02 11:43:11 +01:00
a7309be567 created links to virtual files in master file 2017-03-01 08:44:43 +01:00
829ba49c1c moving subframenumber into a 32 bit number, also in stremer, changing json header to mention 4 bit and version number 2017-02-28 15:30:53 +01:00
fa6d18e9b2 moving subframenumber into a 32 bit number 2017-02-28 15:29:53 +01:00
fd42fad045 Added sebastians python script for interpolation - final debug version 2017-02-28 15:13:58 +01:00
447c5bb8fe gui works 2017-02-28 13:42:56 +01:00
475f0692a0 Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 2.3-rc 2017-02-28 13:42:16 +01:00
2024eb5d6e gui works 2017-02-28 13:14:18 +01:00
cf8b53adff gui works 2017-02-28 13:14:06 +01:00
3aac30b8ee added zmqasocket 2017-02-27 16:06:58 +01:00
62de278f24 bug fix: loading trimbit file should not care about settings 2017-02-27 16:05:27 +01:00
3b07afe3fc in the process of streamer 2017-02-27 15:38:46 +01:00
d90db50a60 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-02-23 12:05:55 +01:00
f12df80c5b some changes for chiptest board and mythen server now compiles 2017-02-23 12:05:34 +01:00
936dfea8a7 works so far, no gui yet 2017-02-22 12:01:00 +01:00
9e9c109898 adding cmath and std:round interp 2017-02-22 11:31:01 +01:00
9e21583331 virtual, master all works, still to do rewriting file in an acquisition 2017-02-21 15:13:59 +01:00
19460a03f5 sending position id and num detectors in x and y dir 2017-02-21 15:13:27 +01:00
72c2fbee9c manual eiger 2017-02-21 09:20:16 +01:00
2cd38fefcd master hdf5 does not work, but so far good 2017-02-16 12:48:15 +01:00
549e346ad4 Merge branch '2.3-rc' into hdf5 2017-02-10 11:56:37 +01:00
111f8beab3 updaterev 2017-02-10 11:51:29 +01:00
4c351ba686 updated server with version variables 2017-02-10 11:51:05 +01:00
a1f00518b8 updaterev 2017-02-10 11:50:24 +01:00
3d2264fa56 updaterev 2017-02-10 11:50:13 +01:00
3e9476cca2 updaterev 2017-02-10 11:49:58 +01:00
54f92fb26c changed namings 2017-02-10 10:41:01 +01:00
b260d08225 somewhere 2017-02-10 10:08:00 +01:00
c89f6e649c fnum wrong, need to add file features 2017-02-07 08:52:27 +01:00
5287441a65 removed warning 2017-02-07 08:52:05 +01:00
9b3f4a3a66 commonFiles/error_defs.h 2017-02-03 14:34:05 +01:00
1decd2dd89 Merge branch '2.3-rc' into hdf5 2017-02-03 14:30:09 +01:00
490e756622 added the servers 2017-02-03 12:31:33 +01:00
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
0896704de7 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:33 +01:00
d95aaa2089 somewhere in between.. next step include generalData pointer in listerner and dataprocessor calss in constructor and a setter 2017-01-31 08:42:16 +01:00
01d54a7a4c Complete rewrite of receiver, with new changes 2017-01-27 15:40:36 +01:00
70a7d83175 somewhere 2017-01-18 15:22:05 +01:00
f6927ad1bf in between 2017-01-17 10:56:01 +01:00
bd31ac1d52 changes to variable name 2017-01-17 10:55:43 +01:00
b16d087fd1 Merge branch '2.2-rc' into hdf5 2017-01-06 15:17:40 +01:00
3563f0deec Merge branch '2.2-rc' into developer 2017-01-06 15:17:14 +01:00
111856ed7b hv should work now 2017-01-06 15:16:05 +01:00
0fdbac981e should work for serial comm hv for 9m 2017-01-05 12:58:49 +01:00
adb5ab5ed1 chunked upto 1000 and new dataset every 10000 2017-01-03 12:11:55 +01:00
abb5bfb6e4 creating new datasets every 10,000 images in same file 2017-01-03 08:57:59 +01:00
987aeda6fb sorted out problem with CPU read out 2016-12-22 17:24:53 +01:00
d847a289a4 changed progress prints, file naming etc 2016-12-21 10:53:56 +01:00
66c488b79a working so far 2016-12-20 14:13:00 +01:00
aa99d289c3 added library path in makefile.include so that you dont have to do ld_library_path 2016-12-19 18:04:59 +01:00
bb9208f8ee some changes to the group 2016-12-19 16:58:08 +01:00
3eea80a121 compiles after merging 2016-12-19 13:50:25 +01:00
68b13a0ecd merged to developer 2016-12-19 12:26:53 +01:00
12cd3d07a2 some changes for jctb 2016-12-19 12:05:59 +01:00
ebf44704b2 merged error defs 2016-12-19 11:39:14 +01:00
bd1601c2eb fixwed the printing of errors but not error message 2016-12-19 11:37:14 +01:00
d555bc6e75 fixwed the printing of errors but not error message 2016-12-19 11:33:16 +01:00
b5f7dc29af Merge branch '2.2-rc' into hdf5 2016-12-16 15:00:22 +01:00
2d1c91c0e0 bug in sem for new scans 2016-12-16 14:59:55 +01:00
b403aa20a6 Merge branch '2.2-rc' into hdf5 2016-12-16 14:51:08 +01:00
64843c1c76 made the scans work, where the the dummy message from rxr doesnt stop it from listening for the scans/measurement, only at set join thread 2016-12-16 14:46:54 +01:00
f464be38a3 xyrangechanged not checked for histogram 2016-12-16 14:46:02 +01:00
33092b6d85 Merge branch '9m_rest' into developer 2016-12-15 14:34:05 +01:00
aaab8d697a Merge branch '9m_rest' into hdf5 2016-12-15 14:33:38 +01:00
ed3129029d Merge branch '9m_rest' into 2.2-rc 2016-12-15 14:32:34 +01:00
8b8d8449f2 Merge branch 'developer' into hdf5 2016-12-15 14:05:29 +01:00
983f517e07 added users to the package 2016-12-15 14:04:37 +01:00
545c5530e3 added moenchT1 data structure 2016-12-15 13:58:55 +01:00
ae48a0e251 made some groups and force closing 2016-12-15 09:26:25 +01:00
62ba3838ef included c++ lib 2016-12-14 18:19:40 +01:00
cdcb413241 removed hdf5 c, only c++ 2016-12-14 18:19:29 +01:00
f8b34a16dd converted to c++ 2016-12-14 18:15:47 +01:00
a971d87008 Merge branch '2.2-rc' into hdf5 2016-12-13 13:23:06 +01:00
2a508435c7 change the filenaming according to det position and not det id 2016-12-13 11:41:27 +01:00
aba3319427 moving towards c++ api 2016-12-12 14:24:39 +01:00
d3200dc76f moving towards c++ api 2016-12-12 14:24:24 +01:00
e7621a6cd0 moving towards c++ api 2016-12-12 14:24:11 +01:00
d6793a0802 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_calibration into developer 2016-12-05 16:01:00 +01:00
37ba8f9a71 added moench03 T CPU data structure 2016-12-05 16:00:34 +01:00
3c0ce23bc2 fixed hardcoded port number, cleanup 2016-12-02 15:21:22 +00:00
a67f9d50de removed the allocating of memory for eiger and jungfrau to receive data via tcp from detector as this will not happen 2016-12-02 12:47:01 +01:00
28b0897dd7 fixed bug of crash when changing dr sometimes, latestdata was incorrectly inititalized 2016-12-02 08:55:07 +01:00
dd9387ef29 using detid to calculte zmq port in case of shmget error and det id does not start with 0 and 1 as in receiver zmq server ports 2016-12-02 08:53:08 +01:00
657d3e5759 first functional commit, still some workarounds. Can start, acquire, stop, restart 2016-12-01 15:59:12 +00:00
f61d819599 wip for Eiger9M 2016-12-01 07:43:46 +00:00
d9016c95de updated the server bins 2016-11-30 11:23:46 +01:00
ce086fe79d updaterev 2016-11-30 11:20:42 +01:00
790cef37ff updaterev 2016-11-30 11:20:16 +01:00
37ea7d425f updaterev 2016-11-30 11:17:38 +01:00
1fe810d9d1 uncommented imagereconstruction in normal checkout script and also added but commented tests repository 2016-11-30 11:16:59 +01:00
09645cbba8 bottom is defined as flippeddatax in config file, not anymore as argument for receiver 2016-11-30 10:36:46 +01:00
466f1506a5 bottom is defined as flippeddatax in config file, not anymore as argument for receiver 2016-11-30 10:36:34 +01:00
0c8ca874e4 image reconstruction should work now 2016-11-28 14:52:46 +01:00
5445552b17 removed bug where it shuts down socket and tries to read it as it is -1 2016-11-25 14:34:49 +01:00
af8c750b5a made the eiger like the jungfrau ignoring packets 2016-11-25 12:22:21 +01:00
52dbb7f9fc smaller changes to make arguments const 2016-11-25 12:22:00 +01:00
b131f268e0 added the check for detector and receiver online in refreshing tabs 2016-11-22 14:11:11 +01:00
c70f453de4 changed everything to depend on receiver online shared memory flag, and if it is online is only checked rarely 2016-11-22 14:01:07 +01:00
96d8478b46 gui ensuring receiver offline caught, also at progress 2016-11-22 13:59:27 +01:00
09d146ee55 changed a printout 2016-11-22 11:39:47 +01:00
9031b3998b removed warnings and zmq only when not mythen 2016-11-22 11:06:05 +01:00
394526a9c3 removed zmq threads from client and made it receive packets via for loop 2016-11-22 11:05:42 +01:00
55408118b1 removed some warnings and printsouts 2016-11-22 11:05:12 +01:00
0ed9ee0e5d fixing the 32 bit crash and empty plot using zmq 2016-11-21 12:02:45 +01:00
9d106f6c93 changed clock for jungfrau, maybe other debugging stuff outside this folder 2016-11-21 09:21:30 +01:00
21e4201bb8 updaterev 2016-11-14 11:57:57 +01:00
ebf102b8d9 updaterev 2016-11-14 11:57:53 +01:00
e6c7dfc440 adding exptime to receiver for file header 2016-11-14 11:57:34 +01:00
c639477f28 adding exptime to receiver for file header 2016-11-14 11:57:29 +01:00
45fc87240f write number of frames and period in file header 2016-11-11 16:08:18 +01:00
b980640a4c updaterev 2016-11-11 14:44:56 +01:00
7ffba557f6 updatereveiger 2016-11-11 14:44:42 +01:00
f13a42feeb eigerupdaterev 2016-11-11 14:43:55 +01:00
b1a3a224ff implemented high voltage for normal modules 2016-11-11 14:43:18 +01:00
4292bf1ce8 updaterev 2016-11-11 14:15:08 +01:00
c364b28922 updaterev 2016-11-11 14:14:59 +01:00
b1f658c439 file header with semi colon 2016-11-11 10:20:00 +01:00
9ee9fdea96 fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards 2016-11-10 16:13:42 +01:00
7d860cc7cd fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards 2016-11-10 16:13:22 +01:00
cec2e5c6b4 reverting to previous 2016-11-10 16:08:38 +01:00
5189640cd7 debugging for eriks pc 2016-11-10 16:02:31 +01:00
8298486f27 debugging for eriks pc 2016-11-10 15:57:04 +01:00
fd666605aa some changes for qwt7 and for higher gcc 2016-11-10 14:56:52 +01:00
acb900961a fixed time interval in receiveR 2016-11-10 14:37:26 +01:00
44d6b0ffc0 fixed time interval in receiveR 2016-11-10 14:37:18 +01:00
b55414cd38 fixed time interval in receiveR 2016-11-10 14:37:08 +01:00
70326f8b10 Merged developer branch with anna's modifications for chiptestboard 2016-11-10 13:27:18 +01:00
3c48065b5a removed the normal timer on the updateplot, it shold now plot as soon as it gets the data 2016-11-10 12:23:01 +01:00
6f43e9fcde the space in the makefile screwed up the compilation 2016-11-10 10:26:27 +01:00
37c0b5bdc1 done 2016-11-10 10:26:02 +01:00
753ed306d9 changes to include eiger in gui 2016-11-10 08:41:46 +01:00
a4d4b05c1d s 2016-11-09 15:35:22 +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
149610aa51 updaterev 2016-11-09 10:21:20 +01:00
f09e5ebad8 debugging 2016-11-09 10:18:33 +01:00
4a96b90296 debugging 2016-11-09 10:13:30 +01:00
f6b753f5d7 debugging 2016-11-09 09:36:42 +01:00
7cbd21651b debugging 2016-11-09 09:27:23 +01:00
6a2adb48aa debugging 2016-11-09 09:19:11 +01:00
b8ffe24c5f debugging 2016-11-09 09:16:36 +01:00
1a64fc30ca added the print temp losses 2016-11-08 16:37:15 +01:00
33d0563133 added the print temp losses 2016-11-08 16:36:17 +01:00
5f4a38416a added the print temp losses 2016-11-08 16:31:05 +01:00
964c76ac60 added the print temp losses 2016-11-08 16:08:48 +01:00
9b9876e287 added the print temp losses 2016-11-08 16:03:44 +01:00
7b2be5b009 debugging 2016-11-08 15:44:34 +01:00
d30e4a4d1c updaterev 2016-11-08 15:26:18 +01:00
400eef6712 updaterevjungfrau 2016-11-08 15:25:56 +01:00
475e217cc5 adding binary 2016-11-08 15:25:16 +01:00
0b5dc3a5a1 updaterev 2016-11-08 15:24:02 +01:00
5c9d610dc4 updaterev 2016-11-08 15:23:56 +01:00
a0b28503d0 updaterev 2016-11-08 15:23:48 +01:00
c2c7365566 works for jungfrau 2016-11-08 15:23:05 +01:00
dec82ab850 included datastream command earlier but not working yet 2016-11-08 15:21:56 +01:00
d335dfaae4 some print 2016-11-08 15:21:00 +01:00
2677fe3729 debugging progress and resettting serveraddress at start 2016-11-08 14:42:16 +01:00
38857d6845 debugging progresS 2016-11-08 14:12:19 +01:00
580b8ec649 manual 2016-11-08 13:38:53 +01:00
54658040dc debugging 2016-11-08 12:25:51 +01:00
7a0efe60c8 debugging 2016-11-08 12:23:42 +01:00
6b67122a8e debugging 2016-11-08 12:20:53 +01:00
5316316c66 debugging 2016-11-08 12:09:18 +01:00
7e9760559c debugging 2016-11-08 12:02:21 +01:00
a42854d9a7 debugging 2016-11-08 11:51:02 +01:00
c7adfd52f2 debugging 2016-11-08 11:43:56 +01:00
f7654f8c94 debugging 2016-11-08 11:35:00 +01:00
76435c5981 debugging 2016-11-08 11:27:49 +01:00
7ca629a128 debugging 2016-11-08 11:10:38 +01:00
55e0bbd04f debugging 2016-11-08 11:08:33 +01:00
b4461207a7 debugging 2016-11-08 11:07:13 +01:00
cf5978d730 debugging 2016-11-08 11:05:49 +01:00
385941d75e debugging 2016-11-08 10:31:53 +01:00
93f99f9aa8 debugging 2016-11-08 10:30:02 +01:00
6d04f1ad68 debugging 2016-11-08 10:28:29 +01:00
cb5fa6223a debugging 2016-11-08 10:24:37 +01:00
abfcfa7dea debugging 2016-11-08 10:22:31 +01:00
cb274095fd debugging 2016-11-08 10:19:14 +01:00
8aea36b4ef fixed jungfrau configure bug by getting rid of gb10reset at configure 2016-11-08 09:35:34 +01:00
96e79c7b99 debugged 2016-11-08 09:34:56 +01:00
9effdab69b debugging 2016-11-08 09:29:42 +01:00
2eade342ad debugging 2016-11-08 09:28:56 +01:00
cbd077e984 debugging 2016-11-08 09:28:05 +01:00
01db6b988b debugging 2016-11-08 09:22:18 +01:00
a5c4434ae8 debugging 2016-11-08 09:18:32 +01:00
8fd1b9b617 debugging 2016-11-08 09:08:09 +01:00
c6dbeda8b7 debugging 2016-11-08 09:03:07 +01:00
52cf790dde deletion of retval in getdatafrom, client 2016-11-07 17:57:03 +01:00
39a2317d8d somewhere 2016-11-07 17:34:41 +01:00
e4dcd1cb6b setting and getting printouts, changed the rx mess to 1000 2016-11-07 15:34:47 +01:00
a337feba7f showing old plot and firstimagE 2016-11-07 15:34:14 +01:00
1825ebd426 for now, leaving as before the background colors 2016-11-07 11:21:12 +01:00
96284fde87 for now, leaving as before the background colors 2016-11-07 11:19:20 +01:00
a17e65c22f switched background to white, used dark gray with bold option for info text 2016-11-07 10:55:09 +01:00
3a3e2e26d8 to see the receiver output 2016-11-07 10:29:56 +01:00
8caa9d8779 fixed jungfrau problem, changed set receiver to updatedetector before 2016-11-04 17:14:47 +01:00
ede6ccd720 removed prints 2016-11-04 14:23:46 +01:00
6df77b5ff2 removed prints 2016-11-04 14:21:59 +01:00
3f9c5af61c removed prints 2016-11-04 14:19:49 +01:00
57979ce970 removed prints 2016-11-04 14:17:51 +01:00
d673367667 removed prints 2016-11-04 14:11:31 +01:00
3b07fd602b removed prints 2016-11-04 14:09:19 +01:00
e2299b5269 removed prints 2016-11-04 13:49:16 +01:00
11d3392064 gui uncomments 2016-11-04 13:46:23 +01:00
25780a2b4f fixed jungfrau gui 2016-11-04 13:45:24 +01:00
947a0e5f41 memry allcation 2016-11-04 12:15:47 +01:00
e4a8933d97 memry allcation 2016-11-04 12:12:06 +01:00
771e5323b4 added binary 2016-11-04 12:10:36 +01:00
15cc7a21f5 uncomment gui 2016-11-04 12:09:54 +01:00
7aae906c62 debugging 2016-11-04 12:02:52 +01:00
79d5a24af4 debugging 2016-11-04 12:02:37 +01:00
ff1b2ac19a solving latestdata crash 2016-11-04 11:24:19 +01:00
11d3511460 trying different machine zmq 2016-11-04 11:03:24 +01:00
d4733543ab trying different machine zmq 2016-11-04 10:25:00 +01:00
78c1372950 trying different machine zmq 2016-11-04 10:20:30 +01:00
44eb790f2d trying different machine zmq 2016-11-03 17:16:53 +01:00
f7b7939ca1 trying different machine zmq 2016-11-03 17:12:41 +01:00
8c53ce9f87 trying different machine zmq 2016-11-03 17:06:02 +01:00
aee60c3dbc something 2016-11-03 16:39:14 +01:00
8066618345 something 2016-11-03 16:33:44 +01:00
493f3169f8 something 2016-11-03 16:26:41 +01:00
6f60f011d1 something 2016-11-03 16:26:11 +01:00
a659fa96dc debugging gui 2016-11-03 16:21:50 +01:00
fa9bac144f number of data call back threads made equal to numberoflistening threads 2016-11-03 16:04:24 +01:00
8b6689e167 moved an offset to get data 2016-11-03 15:49:32 +01:00
f865026c3d lastframe number bug 2016-11-03 15:08:18 +01:00
a6423b30dd Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer 2016-11-03 14:54:04 +01:00
68241924a5 progress bug 2016-11-03 14:22:48 +01:00
b89f0a1663 progress bug 2016-11-03 14:22:37 +01:00
48ae4b4ec2 progress bug 2016-11-03 14:21:51 +01:00
4b65c3b694 progress bug 2016-11-03 14:17:53 +01:00
274fffa609 progress bug 2016-11-03 14:16:07 +01:00
5fb38694d3 progress bug 2016-11-03 14:01:24 +01:00
fbd0f01fa7 progress bug 2016-11-03 13:59:58 +01:00
37cdb3db4f progress bug 2016-11-03 13:57:43 +01:00
3a3e5668d7 progress bug 2016-11-03 13:56:31 +01:00
3ed427e7f0 progress bug 2016-11-03 13:55:03 +01:00
6498b20612 progress bug 2016-11-03 13:51:03 +01:00
0cc89efb20 progress bug 2016-11-03 13:47:24 +01:00
dfe39ef3e5 progress bug 2016-11-03 13:44:24 +01:00
26d8d6e108 creating new files 2016-11-03 13:40:26 +01:00
54458f0af0 creating new files 2016-11-03 13:37:30 +01:00
b7ead7e61e creating new files 2016-11-03 13:30:58 +01:00
20918f2d52 versioning done 2016-11-03 13:22:19 +01:00
7c58f43717 modifications for gitversioning 2016-11-03 13:21:40 +01:00
3f66504f89 included jungfrau for the gitversioning 2016-11-03 13:10:54 +01:00
eeaaef1a99 updaterev 2016-11-03 12:33:14 +01:00
df3e0f3f93 updaterev 2016-11-03 12:32:59 +01:00
404323e13a updaterev 2016-11-03 12:32:37 +01:00
7fdc127356 included bunch id in jungfrau header 2016-11-03 12:31:53 +01:00
4b99ff7fbe reset fpga implemented, changed receiver configuration warning prints, powerchip implemented 2016-11-03 12:31:34 +01:00
5523bc4a09 update manua 2016-11-03 12:11:33 +01:00
2eac6cc116 update manua 2016-11-03 12:08:51 +01:00
014175689f debugging 2016-11-03 09:25:30 +01:00
170d314540 debugging 2016-11-03 09:21:09 +01:00
b33ec4ac2e same files for all the jungfrau settings files 2016-11-03 09:17:02 +01:00
84bdf873ce introduced ignored packets and changed meaning of missing packets for jungfrau 2016-11-03 09:16:36 +01:00
0aecad6644 changed dac values, fixed settings bug of not looking at nchan,nchips, , fixed clock divider, changed usleep in configuremac 2016-11-03 09:16:01 +01:00
754a4f8bdc q for quit 2016-11-02 16:37:37 +01:00
40babc23a3 progress uncommented 2016-11-02 16:24:23 +01:00
941b3dbb02 progress uncommented 2016-11-02 16:09:22 +01:00
8efc455e58 lskjgf 2016-11-02 16:08:02 +01:00
5fd1818ec7 startframeindex corrected 2016-11-02 16:01:55 +01:00
8eb91bc46d startframeindex corrected 2016-11-02 15:56:10 +01:00
b8187a5bf2 startframeindex corrected 2016-11-02 15:49:46 +01:00
f0c82d9027 startframeindex corrected 2016-11-02 15:47:51 +01:00
b9caa1e1e1 startframeindex corrected 2016-11-02 15:45:45 +01:00
a4fcf622a9 startframeindex corrected 2016-11-02 15:44:28 +01:00
e2d6bf31a3 startframeindex corrected 2016-11-02 15:42:15 +01:00
ece614eb7e startframeindex corrected 2016-11-02 15:40:25 +01:00
f71378e67f frame number in header corected, create file logic 2016-11-02 15:25:23 +01:00
525831e8af increased max file size for jungfrau 2016-11-02 15:12:02 +01:00
55c35b6669 merged 2016-11-02 14:36:21 +01:00
237e761588 Merge branch 'developer' into jungfrautomerge 2016-11-02 14:33:03 +01:00
9069e2eba4 Merge branch 'developer' into jungfrautomerge 2016-11-02 14:33:03 +01:00
fa0580ccac to see the frames 2016-11-02 11:01:59 +01:00
5783e3f9d2 counters frame delay 2016-11-02 11:00:51 +01:00
50596d87d1 included the delay and frame counters 2016-11-02 10:56:13 +01:00
4035f9263a got rid completely of threaded proccessing 2016-11-02 07:28:29 +01:00
b9ac75330c removed all prints in generic 2016-11-01 16:36:32 +01:00
88d5e4c9a0 threadstarted not initialized 2016-11-01 16:36:19 +01:00
f0ac9a2e9c back to not asking getframescaught 2016-11-01 15:59:43 +01:00
1f3a418d93 make t crash 2016-11-01 15:02:14 +01:00
e0aee67dcd some changes 2016-11-01 14:06:45 +01:00
5de9ade51d some changes 2016-11-01 14:04:37 +01:00
7fc82723b5 some changes 2016-11-01 14:04:31 +01:00
8bb0249d5b reverted timeouts 2016-11-01 13:09:16 +01:00
19caeb3e38 something 2016-11-01 12:06:08 +01:00
0c257dbcdd something 2016-11-01 12:04:08 +01:00
a3cab06a40 something 2016-11-01 11:27:30 +01:00
92305a9f7a something 2016-11-01 11:27:17 +01:00
d6e78c19ad changing send, rc timeout 2016-11-01 11:09:28 +01:00
7374a37115 back with checking online, got rid of getframescaught altogether 2016-11-01 10:03:38 +01:00
59b5844de6 got rid of check if online 2016-11-01 09:55:38 +01:00
cf8bbad937 got rid of check if online 2016-11-01 09:46:29 +01:00
2edeb74213 got rid of check if online 2016-11-01 09:21:26 +01:00
9c7fb4da38 added gui stuff 2016-11-01 09:13:16 +01:00
2a7a11b80f changes 2016-11-01 09:12:58 +01:00
5b4528925d some changes 2016-11-01 08:10:52 +01:00
d6d6a050bd some changes 2016-11-01 08:06:21 +01:00
a7288dc0de some changes 2016-11-01 08:03:43 +01:00
a330706d86 sorta done 2016-10-31 17:05:07 +01:00
1c073b70bd changed 2016-10-31 17:04:49 +01:00
e2684e1f66 trying 2016-10-31 16:56:21 +01:00
d5c5a0e3c3 trying 2016-10-31 16:50:19 +01:00
6e0f9eaa78 trying 2016-10-31 16:47:10 +01:00
ca93ff798b trying 2016-10-31 16:43:50 +01:00
58228ed00f trying 2016-10-31 16:43:45 +01:00
d789b4a606 trying 2016-10-31 16:24:23 +01:00
ad304094ba trying 2016-10-31 16:21:31 +01:00
8b5612f4aa trying 2016-10-31 16:20:33 +01:00
81b162c465 trying 2016-10-31 16:19:10 +01:00
10a6bc7157 trying 2016-10-31 16:15:49 +01:00
a2b8d9beb9 trying 2016-10-31 16:12:11 +01:00
e7bddd54fa trying 2016-10-31 16:08:49 +01:00
59ade286c2 trying 2016-10-31 16:04:46 +01:00
13d225377d trying 2016-10-31 15:33:35 +01:00
21ccb211c1 trying 2016-10-31 15:29:40 +01:00
966b513f8f trying 2016-10-31 15:24:52 +01:00
cc11ff29bf trying 2016-10-31 15:22:27 +01:00
502a26beff trying 2016-10-31 15:14:40 +01:00
d2a4483e48 trying 2016-10-31 15:12:31 +01:00
f81ede500d trying 2016-10-31 15:06:38 +01:00
bd74a25072 trying 2016-10-31 14:53:58 +01:00
78cfbb92d8 trying 2016-10-31 14:49:39 +01:00
8f318f19ff trying 2016-10-31 14:48:50 +01:00
351d911f46 trying 2016-10-31 14:45:19 +01:00
89928246d2 trying 2016-10-31 14:41:12 +01:00
25e010a3d8 trying 2016-10-31 14:37:40 +01:00
e030a79aba trying 2016-10-31 14:36:13 +01:00
63d9e3ca5f trying 2016-10-31 14:34:47 +01:00
6a843b28d1 trying 2016-10-31 14:30:48 +01:00
cc2346be67 trying 2016-10-31 14:28:15 +01:00
e3455fe1ff trying 2016-10-31 14:24:23 +01:00
873d536729 trying 2016-10-31 14:13:00 +01:00
ac87ae3d5b some changes, almost done 2016-10-31 12:27:54 +01:00
eb68a69e38 merged with developer 2016-10-28 08:18:01 +02:00
5cc17a77c7 Merge branch 'developer' into jungfrauchange 2016-10-28 08:14:06 +02:00
4c6c078442 settimer returning -1 now instead of 1 for different values 2016-10-28 08:12:55 +02:00
f5f9e535de acquiring flag cleared at configuration file load 2016-10-28 07:58:39 +02:00
a1639a9a72 somehwere in btween 2016-10-27 11:32:30 +02:00
622e0a480e added single module binary 2016-10-27 10:26:13 +02:00
434fa863d0 shutdown bug 2016-10-27 09:48:04 +02:00
391ad67e8c changing the mess return from acq finished eiger server:trial for 9m lag bug 2016-10-27 09:20:21 +02:00
e908beb38a 9m try shutdown of client socket before close 2016-10-27 09:17:44 +02:00
c2c80c6bf6 root receiver crashing bug resolved 2016-10-27 08:50:44 +02:00
de53e48078 somewhere 2016-10-27 08:38:28 +02:00
7541c2bcf0 some more change 2016-10-27 08:28:30 +02:00
942f024761 changes to make jungfrau work 2016-10-27 08:27:31 +02:00
3c646c3545 untangled moench from jungfrau, quite a few changes 2016-10-27 07:26:47 +02:00
d38989b340 added 9m binary 2016-10-25 17:03:56 +02:00
b28c68127a check for why gui doesnt show all data 2016-10-25 16:48:04 +02:00
64094be4e3 check for why gui doesnt show all data 2016-10-25 16:45:52 +02:00
d1fd6f0883 check for why gui doesnt show all data 2016-10-25 16:22:31 +02:00
a8fb66483d check for why gui doesnt show all data 2016-10-25 16:22:09 +02:00
fde7d2359c check for why gui doesnt show all data 2016-10-25 16:22:03 +02:00
f2abf0fbfd check for why gui doesnt show all data 2016-10-25 16:08:36 +02:00
a6fecca2b8 check for why gui doesnt show all data 2016-10-25 16:05:39 +02:00
e6f17ed9d5 check for why gui doesnt show all data 2016-10-25 16:05:34 +02:00
d97f1c1677 check for why gui doesnt show all data 2016-10-25 16:02:56 +02:00
7a93fd8a58 check for why gui doesnt show all data 2016-10-25 16:00:18 +02:00
a7658b2b94 check for why gui doesnt show all data 2016-10-25 15:57:11 +02:00
64965e2a1a check for why gui doesnt show all data 2016-10-25 15:53:04 +02:00
51c0ca8c6e check for why gui doesnt show all data 2016-10-25 15:50:35 +02:00
ac4c758636 check for why gui doesnt show all data 2016-10-25 15:44:31 +02:00
cd6b952d64 check for why gui doesnt show all data 2016-10-25 15:44:24 +02:00
81190d29b0 check for why gui doesnt show all data 2016-10-25 15:38:38 +02:00
7803e94d79 check for why gui doesnt show all data 2016-10-25 15:38:32 +02:00
1e361bb3ba check for why gui doesnt show all data 2016-10-25 15:35:00 +02:00
f7898bc62b check for why gui doesnt show all data 2016-10-25 15:13:38 +02:00
994ccac75b check for why gui doesnt show all data 2016-10-25 15:03:13 +02:00
e312098e56 check for why gui doesnt show all data 2016-10-25 14:52:25 +02:00
7b36c63d8f fixed packetloss print 2016-10-25 14:08:31 +02:00
636d5840aa trying to fix packetloss print 2016-10-25 13:31:11 +02:00
4fb26f833a trying to fix packetloss print 2016-10-25 13:29:17 +02:00
0fddcd162d trying to fix packetloss print 2016-10-25 13:26:35 +02:00
173c5b9611 trying to fix packetloss print 2016-10-25 13:23:49 +02:00
38b2a272ee trying to fix packetloss print 2016-10-25 13:14:25 +02:00
28005b7875 trying to fix packetloss print 2016-10-25 12:29:56 +02:00
b38d71b298 trying to fix packetloss print 2016-10-25 12:26:53 +02:00
39b9fcba43 trying to fix packetloss print 2016-10-25 12:16:38 +02:00
58b48aefe2 changed the file max to test for 9m and trying to fix packetloss print 2016-10-25 12:08:46 +02:00
18c6e8208a removed bug, setting dr24 sets dr 32 also for eiger, also added server executable 2016-10-25 12:01:31 +02:00
7eda5f9de5 just finished the clock 2016-10-25 09:21:08 +02:00
31d48411db somewhere 2016-10-25 08:18:02 +02:00
94ff6cb092 moenchserver should not be in jungfrau folder 2016-10-24 13:57:39 +02:00
cf9c3d4f08 break symmetry in eiger writing 2016-10-24 11:13:56 +02:00
0cd9261332 merge fix 2016-10-20 09:17:42 +02:00
899adbce5b merge fixed 2016-10-20 09:17:32 +02:00
266506e67f merged with zmqdata 2016-10-20 08:54:29 +02:00
12574f4c05 merged zmqdata to developer 2016-10-20 08:46:48 +02:00
2f749bb91d Merge branch 'zmqdata' into developer 2016-10-20 08:40:19 +02:00
d1de27992b Merge branch '2.1.1-rc' into developer 2016-10-20 08:30:50 +02:00
8bc2755759 Merge branch '2.1.1-rc' into developer 2016-10-20 08:25:04 +02:00
7eafce87f9 fixed the print file packet loss progress bug 2016-10-20 08:13:42 +02:00
8d5259d653 Merge branch '2.1.1-rc' into developer 2016-10-20 07:56:07 +02:00
fa7536e1d1 merge with 2.1.1-rc to be latest 2016-10-20 07:38:08 +02:00
81d96a047d slsDetector/slsDetectorCommand.cpp 2016-10-20 07:31:53 +02:00
e49f97a03c done showing error when detectors not added in sharedmemory due to connect failure 2016-10-19 08:10:42 +02:00
f535e11bba check not done 2016-10-18 15:31:48 +02:00
028ba57876 check for giving an error in gui if cannot connect to hostname 2016-10-18 15:06:01 +02:00
ca89835035 check for giving an error in gui if cannot connect to hostname 2016-10-18 15:03:44 +02:00
1e9ebc6f37 check for giving an error in gui if cannot connect to hostname 2016-10-18 14:50:25 +02:00
4bfbd24144 check for giving an error in gui if cannot connect to hostname 2016-10-18 14:47:52 +02:00
18046379ab bugfix:seg fault for giving an error in gui if cannot connect to hostname 2016-10-18 14:44:13 +02:00
8502a7b79f giving 2016-10-18 14:36:04 +02:00
0f8a33d71f overwriting 2016-10-18 14:31:05 +02:00
a7e8ff1c42 back 2016-10-18 14:05:05 +02:00
82884370b5 back 2016-10-18 14:05:05 +02:00
eec812f92c switched 2016-10-18 12:33:47 +02:00
cdaeff76d5 switched 2016-10-18 12:19:20 +02:00
de5037ae2b switched 2016-10-18 12:19:20 +02:00
208c12b72c trying 2016-10-18 12:12:08 +02:00
e00ad76e55 trying 2016-10-18 12:08:11 +02:00
3a6d97b4f3 trying 2016-10-18 12:08:11 +02:00
01366b7273 done 2016-10-18 11:10:42 +02:00
9f28cc686c done 2016-10-18 11:10:42 +02:00
37c0ea7453 almost there 2016-10-18 08:43:21 +02:00
1bade91254 almost there 2016-10-18 08:43:16 +02:00
b0bedc516d works for missing packets and image reconstruction 2016-10-14 16:08:43 +02:00
a6d9f681d8 works for missing packets and image reconstruction 2016-10-14 16:07:51 +02:00
5c4d55af6b random read, the current fnum shoud be sent, not the padded frame 2016-10-12 08:53:13 +02:00
e45b89695b somewhere 2016-10-11 12:35:49 +02:00
55c352a9cd somewhere 2016-10-11 12:35:48 +02:00
f751e060b9 fixed bug that it does not display image 2 2016-10-07 15:13:20 +02:00
47516cafde works 2016-10-07 14:26:53 +02:00
6751132466 works 2016-10-07 14:26:41 +02:00
4d1c6a1940 ask only 1 for frames caught for 9m 2016-10-07 13:48:19 +02:00
d4122726ec ask only 1 for frames caught for 9m 2016-10-07 13:16:12 +02:00
16adb444b9 changed back the delay between framescaught 2016-10-07 13:12:57 +02:00
d54392c6eb increased delay to get framescaught from receiver for acquire form command line 2016-10-07 12:45:34 +02:00
51e45baeff removing check for read out 2016-10-07 12:14:08 +02:00
125c3a789a locking improved 2016-10-07 11:56:04 +02:00
831bd8e160 some changes for quitting gui and continuing with acquire from command line 2016-10-07 11:40:56 +02:00
1545d37f36 some changes for quitting gui and continuing with acquire from command line 2016-10-07 11:40:51 +02:00
dc16d52d49 switching off gui, and acqire should work 2016-10-07 10:21:22 +02:00
59f3aef703 back to subscriber publisher 2016-10-07 10:15:19 +02:00
b1dde586e1 back to subscriber publisher 2016-10-07 10:15:12 +02:00
cce93ebbcf removing the check for receiver to update data threads upon configuration 2016-10-07 07:54:26 +02:00
e6db70354c thread starting if rxr closed and others 2016-10-06 15:50:11 +02:00
ed8a779f7f thread starting if rxr closed and others 2016-10-06 15:50:02 +02:00
6f6199ad20 moved created socket outside innner and outer loop 2016-10-06 14:43:56 +02:00
54b78363b0 enabling datastream back to qdrawplot 2016-10-06 14:22:08 +02:00
65acd118c5 looks done 2016-10-06 13:51:23 +02:00
c5e7d44b15 looks done 2016-10-06 13:49:40 +02:00
de2de6315c somewhere 2016-10-06 08:44:00 +02:00
723df0e9fb somewhere 2016-10-06 08:43:14 +02:00
09e8bf4144 somewhere 2016-10-05 15:27:25 +02:00
6da59ca382 somewhere, but weird threads 2016-10-05 15:26:58 +02:00
bf54c15560 updated to have activate function implemented 2016-10-05 09:30:08 +02:00
489b623afd trying to get in changes for activate in receiver 2016-10-05 08:24:35 +02:00
39a1f16b33 Merge branch '2.1.1-rc' into developer 2016-10-04 15:16:04 +02:00
39baeade37 Merge branch 'developer' into zmqdata 2016-10-04 14:43:31 +02:00
13cff71faf got rid of activate function definition redeclaration in receiver funcs 2016-10-04 14:43:02 +02:00
9cfd914a3e Merge branch '2.1.1-rc' into developer 2016-10-04 14:35:19 +02:00
f6b7fd7aa3 merged thread error fix from developer 2016-10-04 14:29:25 +02:00
7ead69a761 merged with developer after it merged with 2.1.1-rc(deactivate) 2016-10-04 14:10:52 +02:00
a4bb3fe4dd merged with 2.1.1-rc inclding deactivate detectr and receiver 2016-10-04 14:06:47 +02:00
984698efad merged with developer a lot of bug fixes from 14 sep to 30 sep 2016-10-04 13:36:04 +02:00
1aec6a71a1 Merge branch '2.1' into developer 2016-09-30 15:13:34 +02:00
f513fb06fb switching the gpio definitions into function implementation 2016-09-30 07:56:54 +02:00
dcee737faf documentation 2016-09-29 15:45:43 +02:00
d3c4d52118 updaterev 2016-09-29 10:29:48 +02:00
01ed24263f updaterev 2016-09-29 10:29:24 +02:00
5ae3522028 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2016-09-29 10:28:37 +02:00
813b7ba6e7 added prgoramfpga functionality, currently gpio definitions required in /etc/rc file, will rectify in later commits 2016-09-29 10:28:27 +02:00
c093da38ae updaterev 2016-09-29 08:29:39 +02:00
8a80cb489d change server with new boundary for counts above teh max 2016-09-27 20:47:59 +02:00
5c81abdce0 jungfrau programming change 2016-09-26 12:00:23 +02:00
5f4a4b0d90 maybe fixed 16 bit rate corr eiger 2016-09-23 17:15:16 +02:00
1b61e10e36 forgot to add eiger binary 2016-09-23 14:32:21 +02:00
d904f7b32e adding 16 bit rate correction in eiger 2016-09-23 14:28:20 +02:00
c678199802 Merge branch '2.1-rc' into developer 2016-09-22 17:19:10 +02:00
44870480be merging for gotthard, not done 2016-09-22 13:17:17 +02:00
1aff36efb8 small print out change 2016-09-21 16:37:52 +02:00
d0501c3139 creating and destroying sockets for each receiver start and stop in a single acquisition (to deal with scans etc) 2016-09-21 16:37:29 +02:00
d6ca7ecbc4 done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc 2016-09-20 15:12:26 +02:00
a1df8bdc15 done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc 2016-09-20 15:11:39 +02:00
acb5e50870 Merge branch 'developer' into zmqdata 2016-09-20 14:42:20 +02:00
9f2430cace enablingdatastream name change 2016-09-20 14:42:01 +02:00
bdcbdba2ab done with eiger 2016-09-20 10:42:49 +02:00
d751c626b3 done with eiger 2016-09-20 10:42:43 +02:00
611f3a26c2 only missing data left to be handled in zmqthread in receiver 2016-09-19 17:21:28 +02:00
904d21d0be only missing data left to be handled in zmqthread in receiver 2016-09-19 17:21:23 +02:00
6a244c1057 bug fixed, rapidjson parse error 2016-09-19 12:34:38 +02:00
38d477a1ad bug fixed, rapidjson parse error 2016-09-19 12:34:31 +02:00
189834bb53 autorcc is not available for cmake 2.8, use manual instead 2016-09-19 11:59:47 +02:00
82669103af added rapidjson lib 2016-09-16 17:22:44 +02:00
57e741c36c included json example with dummy values 2016-09-16 17:19:55 +02:00
f517eb7a41 included json example with dummy values 2016-09-16 17:19:37 +02:00
6abb1d2ae9 included json example with dummy values 2016-09-16 17:19:29 +02:00
e9a3310042 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_receiver_software into zmqdata 2016-09-16 15:41:20 +02:00
c16f251442 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata 2016-09-16 15:41:05 +02:00
9c8f663b8e done 2016-09-16 12:49:39 +02:00
1263e80d21 done 2016-09-16 12:49:27 +02:00
895dae6d68 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_gui into zmqdata 2016-09-16 12:48:57 +02:00
e0dc25905b done 2016-09-16 12:48:32 +02:00
58713a90aa works, need to do json header and send dataready 2016-09-15 17:16:00 +02:00
1da4b07e73 works, need to do json header and send dataready 2016-09-15 17:15:55 +02:00
e1604a081f add missing pthread lib 2016-09-15 13:59:18 +02:00
7d86e62045 almost 2016-09-15 12:16:08 +02:00
a821442b1a almosst 2016-09-15 12:16:01 +02:00
0f9a841c4a almost done 2016-09-15 10:17:16 +02:00
a80da4f677 Merge branch 'developer' into cmake 2016-09-14 14:38:54 +02:00
721249231f add missing preprocessor macro 2016-09-14 12:03:39 +02:00
c80b1c9a91 add missing preprossor macros 2016-09-14 11:58:39 +02:00
33807b7fac Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata 2016-09-14 10:43:33 +02:00
557eccb74d almost there 2016-09-14 10:42:51 +02:00
3ed738b949 almost done 2016-09-09 17:52:07 +02:00
652d29f2d9 almost done 2016-09-09 17:51:36 +02:00
988426dc96 Added adc command for chiptestboard 2016-09-05 10:49:47 +02:00
258e671420 Merge branch 'cmake' into zmqdata 2016-09-05 10:43:13 +02:00
5f6b4c1b79 in between 2016-09-05 10:09:49 +02:00
fdffe8dc1e compatible with qwt 6.1 2016-09-02 16:22:34 +02:00
4eceb3b5f7 kinda 2016-09-02 15:47:28 +02:00
5b3ab9a2b4 soewhere 2016-09-01 13:34:02 +02:00
eea2809136 in between 2016-09-01 11:22:28 +02:00
6152ca66b4 add cmake configuration 2016-08-31 20:55:00 +02:00
f8b62bba64 add cmake configuration 2016-08-31 20:54:06 +02:00
b8944a3156 add cmake configuration 2016-08-31 20:51:15 +02:00
a3369a7d21 separated 2016-08-31 17:23:44 +02:00
fbf6e2bff1 not done 2016-08-31 10:23:58 +02:00
be2bc15ab5 not done 2016-08-30 16:10:46 +02:00
e9b7a11cf6 in between 2016-08-24 16:23:43 +02:00
f17a2ba2b8 in between 2016-08-24 11:54:15 +02:00
0a2a88e23f in between 2016-08-17 09:33:59 +02:00
b440c11a46 in between 2016-08-16 13:42:29 +02:00
f50f4752dd in between 2016-08-16 11:44:20 +02:00
7a3e08406a in between 2016-08-15 17:32:27 +02:00
46b23dba24 in between 2016-08-15 16:59:30 +02:00
3fbcbd5153 in between 2016-08-15 15:11:46 +02:00
b64af8dc8d starting 2016-08-15 12:10:16 +02:00
1064 changed files with 109409 additions and 48502 deletions

10
.gitignore vendored
View File

@ -1,17 +1,11 @@
.cproject
.project
bin/
calibrationWizards/
slsDetectorGui/
slsDetectorSoftware/
slsReceiverSoftware/
slsDetectorCalibration/
slsImageReconstruction/
.settings
JCTBGui/
*.aux
*.log
*.out
*.toc
build
tests
docs/
RELEASE.txt

View File

@ -1,21 +1,50 @@
cmake_minimum_required(VERSION 2.8)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
set (CALIBRATE OFF)
option (USE_HDF5 "HDF5 File format" OFF)
option (USE_TEXTCLIENT "Text Client" OFF)
option (USE_RECEIVER "Receiver" OFF)
option (USE_GUI "GUI" OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-misleading-indentation")
find_package(Qt4)
find_package(Qwt 6)
find_package(CBF)
find_package(Doxygen)
find_package(PNG REQUIRED)
add_subdirectory(slsDetectorSoftware)
add_subdirectory(slsReceiverSoftware)
add_subdirectory(slsImageReconstruction)
if (QT4_FOUND AND QWT_FOUND)
add_subdirectory(slsDetectorGui)
endif()
if (USE_HDF5)
find_package(HDF5 1.10 COMPONENTS CXX)
endif (USE_HDF5)
if (DEFINED ENV{ROOTSYS})
find_package(ROOT)
if (ROOT_FOUND)
add_subdirectory(calibrationWizards)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_INSTALL_RPATH "$ORIGIN")
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
if (USE_TEXTCLIENT)
add_subdirectory(slsDetectorSoftware)
endif (USE_TEXTCLIENT)
if (USE_RECEIVER)
add_subdirectory(slsReceiverSoftware)
endif (USE_RECEIVER)
if (USE_GUI)
if (QT4_FOUND AND QWT_FOUND)
add_subdirectory(slsDetectorGui)
endif()
endif (USE_GUI)
if (CALIBRATE)
if (DEFINED ENV{ROOTSYS})
find_package(ROOT)
if (ROOT_FOUND)
add_subdirectory(calibrationWizards)
endif()
endif()
endif()
endif(CALIBRATE)

View File

@ -5,10 +5,11 @@ include Makefile.include
INSTALLROOT ?= $(PWD)
BINDIR ?= $(INSTALLROOT)/bin
DOCDIR ?= $(INSTALLROOT)/docs
DOCDIR ?= $(INSTALLROOT)/manual/docs
LIBDIR ?= $(INSTALLROOT)/bin
INCDIR ?= $(INSTALLROOT)/include
DETAILDOC ?= $(INSTALLROOT)/docs
WD = $(shell pwd)
LIBRARYDIR = $(WD)/slsDetectorSoftware
LIBRARYRXRDIR = $(WD)/slsReceiverSoftware
@ -19,7 +20,9 @@ CALWIZDIR = $(WD)/calibrationWizards
MANDIR = $(WD)/manual
CALIBDIR = $(WD)/slsDetectorCalibration
TABSPACE := "\t"
INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(ASM)
INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM)
@ -27,14 +30,15 @@ INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM)
$(info )
$(info #######################################)
$(info # Compiling slsDetectorsPackage #)
$(info # In slsDetectorsPackage Makefile #)
$(info #######################################)
$(info )
.PHONY: all nonstatic static lib libreceiver textclient receiver gui stextclient sreceiver
all: lib textclient receiver gui
#all: lib textclient receiver gui
all: textclient receiver gui
nonstatic: lib libreceiver textclient receiver gui
@ -42,39 +46,61 @@ static: lib libreceiver stextclient sreceiver gui
lib:
cd $(LIBRARYDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)'
cd $(LIBRARYDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' LIBRARYDIR='$(LIBRARYDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
libreceiver:
cd $(LIBRARYRXRDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' INCLUDES='$(INCLUDESRXR)'
cd $(LIBRARYRXRDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)'
stextclient: slsDetectorClient_static
slsDetectorClient: textclient
slsDetectorClient_static: lib
cd $(CLIENTDIR) && $(MAKE) static_clients FLAGS='$(FLAGS)' LIBS='$(LDFLAGDET)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)'
textclient: lib
cd $(CLIENTDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
slsDetectorClient_static: #lib
cd $(CLIENTDIR) && $(MAKE) static_clients FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBRARYDIR='$(LIBRARYDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
@echo ""
@echo "#######################################"
@echo "# Back in slsDetectorPackage Makefile #"
@echo "#######################################"
@echo ""
textclient: #lib
cd $(CLIENTDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBRARYDIR='$(LIBRARYDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
@echo ""
@echo "#######################################"
@echo "# Back in slsDetectorPackage Makefile #"
@echo "#######################################"
@echo ""
slsReceiver: receiver
slsReceiver_static: receiver
receiver: libreceiver
cd $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
sreceiver: libreceiver
cd $(RECEIVERDIR) && $(MAKE) static_receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
slsDetectorGUI: lib
cd $(GUIDIR) && $(MAKE) DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)' LDFLAGDET='-L$(LIBDIR) -lSlsDetector'
receiver: #libreceiver
# cd $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)'
cd $(RECEIVERDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)'
@echo ""
@echo "#######################################"
@echo "# Back in slsDetectorPackage Makefile #"
@echo "#######################################"
@echo ""
sreceiver: #libreceiver
cd $(RECEIVERDIR) && $(MAKE) static_receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)'
@echo ""
@echo "#######################################"
@echo "# Back in slsDetectorPackage Makefile #"
@echo "#######################################"
@echo ""
slsDetectorGUI: #lib
cd $(GUIDIR) && $(MAKE) DESTDIR='$(BINDIR)' LIBRARYDIR='$(LIBRARYDIR)' INCLUDES='$(INCLUDES)' LDFLAGDET='$(LDFLAGDETONLY)' LIBDIR='$(LIBDIR)'
@echo ""
@echo "#######################################"
@echo "# Back in slsDetectorPackage Makefile #"
@echo "#######################################"
@echo ""
calWiz:
cd $(CALWIZDIR) && $(MAKE) DESTDIR=$(BINDIR) #FLAGS=$(FLAGS) LDFLAGDET=$(LDFLAGDET) INCLUDES=$(INCLUDES)
@ -91,6 +117,26 @@ htmldoc:
make doc
$(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR))
cd manual && make html DESTDIR=$(DOCDIR)
detaildoc: createdocs docspdf docshtml removedocs
createdocs: $(LIBRARYDIR)/doxy.config
doxygen $(LIBRARYDIR)/doxy.config
docspdf:
cd slsDetectorPackageDocs/latex && make
$(shell test -d $(DETAILDOC) || mkdir -p $(DETAILDOC))
$(shell test -d $(DETAILDOC)/pdf || mkdir -p $(DETAILDOC)/pdf)
mv slsDetectorPackageDocs/latex/refman.pdf $(DETAILDOC)/pdf/slsDetectorPackageDocs.pdf
docshtml:
$(shell test -d $(DETAILDOC) || mkdir -p $(DETAILDOC))
$(shell test -d $(DETAILDOC)/html || mkdir -p $(DETAILDOC)/html)
$(shell test -d $(DETAILDOC)/html/slsDetectorPackageDocs && rm -r $(DETAILDOC)/html/slsDetectorPackageDocs)
mv slsDetectorPackageDocs/html $(DETAILDOC)/html/slsDetectorPackageDocs
removedocs:
rm -rf slsDetectorPackageDocs;
clean:
@ -103,7 +149,8 @@ clean:
cd $(CALWIZDIR) && $(MAKE) clean
cd manual && $(MAKE) clean
cd $(DOCDIR) && rm -rf *
rm -rf slsDetectorPackageDocs;
rm -rf $(DETAILDOC)
#install_lib:
@ -174,7 +221,6 @@ help:
@echo ""
@echo ""
@echo "Makefile variables"
@echo "REST=yes compile REST-aware Receiver (POCO and JsonBox libraries required)"
@echo "DEBUG=1,2 set debug level to 1 (VERBOSE) or 2 (VERYVERBOSE)"
@echo ""
@echo ""

View File

@ -5,9 +5,10 @@
CC = g++
CXX = $(CC)
ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
LDFLAGDET = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread
LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread
FLAGS= -Wall #-DEIGER_DEBUG2 -DEIGER_DEBUG -DEIGER_DEBUG3 #-DFIFO_DEBUG
LDFLAGDETONLY = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector
LDFLAGDET = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
FLAGS= -Wall -pthread #-DEIGER_DEBUG2
# -DVERBOSE
# Setting up the verbose flags
@ -19,26 +20,17 @@ ifeq ($(DEBUG),2)
endif
##############################################################
# EigerSLS specific. Set this to yes, if you want to compile
# EigerSLS code: in this case, you need also POCO and JsonBox
# libraries
# HDF5 specific. Set this to yes, if you want to compile
# HDF5 code: in this case, you need HDF5 libraries
##############################################################
REST = no
HDF5 = no
HDF5_DIR = /opt/hdf5v1.10.0
#POCODIR = /afs/psi.ch/user/s/sala/public/poco-slp_5.7-32bit
#JSONBOXDIR = /afs/psi.ch/user/s/sala/public/JsonBox-slp_5.7-32bit
POCODIR = /afs/psi.ch/user/s/sala/public/poco-slp_6.4-64bit
JSONBOXDIR = /afs/psi.ch/user/s/sala/public/JsonBox-slp_6.4-64bit
#POCODIR = /home/sala/Programs/poco-ubuntu_13.10-64bit
#JSONBOXDIR = /home/sala/Programs/JsonBox-ubuntu_13.10-64bit
RESTFLAGS = -L$(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -L$(JSONBOXDIR) -Wl,-rpath=$(JSONBOXDIR)/lib -lPocoNet -lPocoFoundation -lJsonBox
ifeq ($(REST),yes)
LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver $(RESTFLAGS) -DREST
INCLUDESRXR = $(EIGERFLAGS) -I$(POCODIR)/include -I$(JSONBOXDIR)/include
endif
ifeq ($(HDF5),yes)
LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L$(HDF5_DIR)/lib -Wl,-rpath=$(HDF5_DIR)/lib -lhdf5 -lhdf5_cpp -lsz -lz -DHDF5C -L/usr/lib64/ -pthread
INCLUDESRXR = -I$(HDF5_DIR)/include
endif
##############################################################
@ -55,6 +47,11 @@ ifeq ($(ROOTSLS),yes)
endif
define colorecho
@tput setaf 6
@echo $1
@tput sgr0
endef

View File

@ -1,42 +1,85 @@
# slsDetector package
### Documentation
Detailed documentation can be found on the [official site.](https://www.psi.ch/detectors/users-support)
### Binaries
Documentation to obtain the binaries via the conda package is available [here.](https://github.com/slsdetectorgroup/sls_detector_software)
## Installation
### Get source
The source code is organised into several submodules, and the top level module is
sls_detectors_package.
### Source code
One can also obtain the source code from this repository and compile while realizing the setup dependencies as required.
```
git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 3.1.0
```
$ git clone git@git.psi.ch:sls_detectors_software/sls_detectors_package.git
$ cd sls_detectors_package
$ ./checkout.sh
```
### Setup dependencies
The GUI client requires Qt 4.8 and Qwt 6.0
#### Setup dependencies
* Gui Client <br>
Requirements: Qt 4.8 and Qwt 6.0
```
export QTDIR=/usr/local/Trolltech/
export QWTDIR=/usr/local/qwt-6.0.1/
```
If either of them does not exist, the GUI client will not be built.
The calibration wizards require ROOT
* Calibration wizards<br>
Requirements: ROOT
```
export ROOTSYS=/usr/local/root-5.34
```
### Compile
Use cmake to create out-of-source builds, by creating an build folder parallel to source directory.
#### Compilation
Compiling can be done in two ways.
**1. Compile using script cmk.sh**<br>
After compiling, the libraries and executables will be found in `slsDetectorPackage/build/bin` directory<br>
Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]<br>
* -[no option]: only make<br>
* -c: Clean<br>
* -b: Builds/Rebuilds CMake files normal mode<br>
* -h: Builds/Rebuilds Cmake files with HDF5 package<br>
* -d: HDF5 Custom Directory<br>
* -t: Build/Rebuilds only text client<br>
* -r: Build/Rebuilds only receiver<br>
* -g: Build/Rebuilds only gui<br>
* -j: Number of threads to compile through<br>
For only make:
./cmk.sh
For make clean;make:
./cmk.sh -c
For using hdf5 without custom dir /blabla:
./cmk.sh -h -d /blabla
For rebuilding cmake without hdf5
./cmk.sh -b
For using multiple cores to compile faster:
./cmk.sh -j9<br>
For rebuilding only certain sections<br>
./cmk.sh -tg #only text client and gui<br>
./cmk.sh -r #only receiver<br>
**2. Compile without script**<br>
Use cmake to create out-of-source builds, by creating a build folder parallel to source directory.
```
$ cd ..
$ mkdir sls_detectors_package-build
$ cd sls_detectors_package-build
$ cmake ../sls_detectors_package
$ mkdir slsDetectorPackage-build
$ cd slsDetectorPackage-build
$ cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=OFF
$ make
```
The libraries and executables will be found at `bin` directory
Use the following as an example to compile statically and using specific hdf5 folder
```
$ HDF5_ROOT=/opt/hdf5v1.10.0 cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=ON
```
After compiling, the libraries and executables will be found at `bin` directory
```
$ ls bin/
gui_client libSlsDetector.a libSlsDetector.so libSlsReceiver.a libSlsReceiver.so

353
RELEASE.txt Normal file
View File

@ -0,0 +1,353 @@
SLS Detector Package 3.1.0 released on 2018-03-12
=================================================
INTRODUCTION
This document describes the differences between 3.1.0 and 3.0.0 releases.
The conda package of the binaries can be downloaded from
https://github.com/slsdetectorgroup/sls_detector_software.git
The Python interface to the software package (including the package) is at
https://github.com/slsdetectorgroup/sls_detector.git
Manual (both HTML and pdf versions) are provided in
manual/docs/
Documentation from Source Code can be found for the Command Line and C++ API in
html:
manual/docs/html/slsDetectorClientDocs/index.html
manual/docs/html/slsDetectorUsersDocs/index.html
pdf:
manual/docs/pdf/slsDetectorClientDocs.pdf
manual/docs/pdf/slsDetectorUsersDocs.pdf
Documentation to the python API is available at
https://slsdetectorgroup.github.io/sls_detector/
Example including binaries for detector and receiver user classes can be found in
manual/manual-api
User documentation can also be accessed directly at this location:
https://www.psi.ch/detectors/users-support
If you have any software related questions or comments, please send them to:
dhanya.thattil@psi.ch
anna.bergamaschi@psi.ch
If you have any python related questions or comments, please send them to:
erik.frojdh@psi.ch
CONTENTS
- Firmware Requirements
- Changes in User Interface
- New Features
- Resolved Issues
- Known Issues
Firmware Requirements
=====================
Please refer to the link below for more details on the firmware versions.
https://www.psi.ch/detectors/firmware.
Gotthard
========
Minimum compatible version : 11.01.2013
Latest version : 08.02.2018 (50um and 25um Master)
09.02.2018 (25 um Slave)
-Can not be upgraded remotely.
Eiger
=====
Minimum compatible version : 16
Latest version : 20
-Can be upgraded remotely via bit files.
Jungfrau
========
Minimum compatible version : 13.11.2017
Latest version : 13.11.2017
-Can be upgraded remotely via sls_detector_put programfpga <pof>.
Changes in User Interface
=========================
Client
------
1. Additional functions added for advanced users in users class:
(setSpeed, setClockDivider, setReadOutFlags, setDac, getADC,
setAllTrimbits, startReceiver, stopReceiver,
startAcquisition non blocking, setReceiverSilentMode, setHighVoltage,
enableDataStreamingToClient, enableDataStreamingFromReceiver,
setReceiverDataStreamingOutPort, setClientDataStreamingInPort)
2. Zmq set up for client and receiver are separated.
zmqport for client and rx_zmqport for receiver. By default, they are the
same for the slsDetectorGui to work.
3. Users example also works without config file, where detector already
configured in shared memory.
4. Use "sls_detector_get busy 0" to clear acquiring flag in shared memory
caused due to an earlier interrupted acquisition from Ctrl+C"
5. Set bit, clear bit, read register and write register cannot give -1 for
inconsistent values from multiple detectors. One has to check error from
API or read the values individually.
6. multiSlsDetector::char* getSettingsFile() function signature has been
changed to string getSettingsFile().
Receiver
--------
7. Modified the help manaual/main-api/mainReceiver.cpp to make it more
robust (handling child process exit) and flexible to determine upon
start up the number of receivers (child processes), the start TCP port
and whether to call back data.
detReceiver is now executed with [start tcp port] [number of receivers]
[1 for call back, 0 for none] as arguments.
By default, start tcp port is 1954, number of receivers is 1, and call
back is initiated.
8. rx_datastream to enable/disable data streaming in receiver. Using the GUI
or registering data call back in client automatically enables zmq in
receiver and client. "externalgui" is removed from the command line. Use
this command instead.
9. Rx_tcpport argument to the slsReceiver can be given using -t.
Eg. slsReceiver -t1955
New Features
============
Package
-------
1. In addition to the C++ API, the Python API is also now provided.
2. CMAKE now with debug flag and rpath, show warnings, compile only certain
components (such as receiver or gui)
3. One repository for entire package and made available at github.
4. One can do --version or -v to all the binaries to find out the release
version of the particular executable.
5. All the software version numbers have only date in format YYMMDD.
Client
------
6. Parallelized more commands to detector. Beneficial for large detectors.
(setTimer, setFileIndex, setOnline, setReceiverOnline, getReceiverStatus,
resetFramesCaught, setFrameIndex, setFileName, getFramesCaughtByReceiver,
setDynamicRange, setRateCorrection)
Option to also use "sls_detector_put threaded 0" to improve speed by
eliminating progress display during acquisition. Effective only for
large detectors.
Detector Server
---------------
7. (Eiger) Virtual class to execute on pc.
8. One can now read temperatures during acquisition. It goes via the stop
server.
9. (Jungfrau) One can start server in "debug" mode and then program the
new firmware via software command "sls_detector_put programfpga xx.pof".
10. (Jungfrau) Server can exit on start up if either the firmware or the
server is incompatible with each other.
11. (Jungfrau) One is able to set transmission delay (ms) of image for each
individual detector using "txndelay_frame" command. Beneficial for
large detectors.
12. (Jungfrau) One can set a threshold temperature (temp_threshold) and
enable the temperature control feature (temp_control). When the
temperature (temp_fpga) overshoots the threshold temperature, it will
set the temperature event (temp_event) and power off the chip. One must
then switch off the detector and check cooling. Switching back on starts
with defaults.
13. (25um Gotthard) Added start acquisition delay to master module.
14. (Gotthard) New constraints for firmware dated 08.02.2018 and 09.02.2018
(25 um Slave) include minimum exposure time is 186 ns and minimum
period is 1278 ns + current exposure time.
Receiver
--------
14. The detectorip and rx_udpip does not have to be in the same subnet anymore.
Add the following commands after rx_hostname in config file to overwrite
mac configuration:
rx_udpmac [router mac]
configuremac 0
15. Added silent mode to receiver using command r_silent [i] from client.
It might be beneficial for max frame rate applications.
16. Receiver print out can handle black or white backgrounds.
17. zmq package included updated to v4.0.8.
18. Zmq streaming from receiver also sends file index in json header.
Gui
---
19. If acquisition is done, but "stop dummy packet" to the gui was lost in
the network, stop acquisition command will restream it so that the gui
doesnt hang forever. This is used only for very fast detectors like
Moench.
Resolved Issues
===============
Client
------
1. gethostbyname used in connecting to sockets was not thread safe for
multiple detectors. Using getaddrinfo for stability in multi threaded
environment.
2. Updated writing content of config and parameter dump into files.
3. More locking to handle main and processing threads using the threadpool.
Removing unlock twice, which is undefined behavior.
4. (Jungfrau) adcphase returns the correct value, instead of -1.
Detector Server
---------------
4. (Eiger) The hardware MAC of the detector is used during configuration
and relayed back to client. Similarly, hardware IP for 1 Gbe data mode.
5. (Eiger) Status will return error if there was the unlikely trouble
reading status register in the front end board. Earlier, it would only
return idle.
6. (Jungfrau) patch server v3.0.0.6.3
Able to set settings, high voltage now correctly reads 0 when
switched off, dacs are properly set.
7. (Jungfrau) FPGA reset and programming FPGA firmware via software is done
properly
8. (Gotthard) patch server v3.0.0.5.1
Able to read temperature properly.
9. (Gotthard) butst mode if set too fast had unwanted behavior such as
sending same image continuously. Now it is handled to display error
and stop acquisition.
10. (Gotthard) completely removed the possibility to set timing modes
other than auto and trigger as they are not implemented anyway. Also
signal index 1, 2 and 3 are reserved and hence, cannot be configured for
an external trigger.
11. Non Mythen and non Eiger detectors can also now get settings file from
board.
12. (Gotthard) Did not get first few images initially after configuring MAC
of detector. Fixed.
Receiver
--------
12. Made it easier to disable the standard receiver and fixing bugs related
to the use of a custom one.
13. (Jungfrau) HDF5 dimensions (npixelsY) required for mapping fixed.
14. patch2-v3.0.0-slsReceiverSoftware.patch
x, y and z coordinates in the call backs and the files are hardcoded
for this release.
15. Rest implementation (not used by standard receiver) removed.
Gui
---
16. patch1-v3.0.0-slsDetectorGui.patch
(Eiger) In expert mode and in advanced tab, when trimbits
loaded are different for every pixel, the gui complains and sets
all trimbits to zero. This has been resolved. Now, the "Set All
Trimbits" field is just set to -1.
17. Fixed segmentation fault of xputsn properly.
18. Upon clicking on "Start", clears acquiring flag in shared memory
caused due to an earlier interrupted acquisition from Ctrl+C"
19. Fixed plotting twice caused due to unzooming the first time.
20. Removed option for compression in Gui as it is not available currently.
21. Can also show Jungfrau multi detector in x direction in gui.
22. Switching tabs sometimes results in delay and gates fields being incorrectly
enabled. Fixed.
Known Issues
============
Client
------
1. File name prefix can only be done at multi deector level. Changing at
individual detector level will not include scan or position variables.
Detector Server
---------------
2. Standard header fills x-coord in 1D. y-coord and z-coord is not
implemented (3D).
Receiver
--------
3. HDF5 compression and filters are not implemented yet.

View File

@ -1,15 +0,0 @@
#git clone $1@git.psi.ch:sls_det_software/sls_detectors_package.git slsDetectorsPackage
#cd slsDetectorsPackage
git clone $1@git.psi.ch:sls_detectors_software/sls_detector_software.git slsDetectorSoftware
git clone $1@git.psi.ch:sls_detectors_software/sls_detector_gui.git slsDetectorGui
git clone $1@git.psi.ch:sls_detectors_software/sls_receiver_software.git slsReceiverSoftware
git clone $1@git.psi.ch:sls_detectors_software/sls_detector_calibration.git slsDetectorCalibration
git clone $1@git.psi.ch:sls_detectors_software/sls_image_reconstruction.git slsImageReconstruction
git clone $1@git.psi.ch:sls_detectors_software/calibration_wizards.git calibrationWizards

193
cmk.sh Executable file
View File

@ -0,0 +1,193 @@
#!/bin/bash
BUILDDIR="build"
HDF5DIR="/opt/hdf5v1.10.0"
HDF5=0
COMPILERTHREADS=0
TEXTCLIENT=0
RECEIVER=0
GUI=0
CLEAN=0
REBUILD=0
CMAKE_PRE=""
CMAKE_POST=""
usage() { echo -e "
Usage: $0 [-c] [-b] [-h] [-d <HDF5 directory>] [-j]
-[no option]: only make
-c: Clean
-b: Builds/Rebuilds CMake files normal mode
-h: Builds/Rebuilds Cmake files with HDF5 package
-d: HDF5 Custom Directory
-t: Build/Rebuilds only text client
-r: Build/Rebuilds only receiver
-g: Build/Rebuilds only gui
-j: Number of threads to compile through
For only make:
./cmk.sh
For make clean;make:
./cmk.sh -c
For using hdf5 without default dir /opt/hdf5v1.10.0:
./cmk.sh -h
For using hdf5 without custom dir /blabla:
./cmk.sh -h -d /blabla
For rebuilding cmake without hdf5 (Use this if you had previously run with hdf5 and now you dont want it)
./cmk.sh -b
For using multiple cores to compile faster:
(all these options work)
./cmk.sh -j9
./cmk.sh -cj9 #with clean
./cmk.sh -hj9 #with hdf5
./cmk.sh -j9 -h #with hdf
For rebuilding only certain sections
./cmk.sh -tg #only text client and gui
./cmk.sh -r #only receiver
" ; exit 1; }
while getopts ":bchd:j:trg" opt ; do
case $opt in
b)
echo "Building of CMake files Required"
REBUILD=1
;;
c)
echo "Clean Required"
CLEAN=1
;;
h)
echo "Building of CMake files with HDF5 option Required"
HDF5=1
REBUILD=1
;;
d)
echo "New HDF5 directory: $OPTARG"
HDF5DIR=$OPTARG
;;
j)
echo "Number of compiler threads: $OPTARG"
COMPILERTHREADS=$OPTARG
;;
t)
echo "Compiling Options: Text Client"
TEXTCLIENT=1
REBUILD=1
;;
r)
echo "Compiling Options: Receiver"
RECEIVER=1
REBUILD=1
;;
g)
echo "Compiling Options: GUI"
GUI=1
REBUILD=1
;;
\?)
echo "Invalid option: -$OPTARG"
usage
exit 1
;;
:)
echo "Option -$OPTARG requires an argument."
usage
exit 1
;;
esac
done
if [ $TEXTCLIENT -eq 0 ] && [ $RECEIVER -eq 0 ] && [ $GUI -eq 0 ]; then
CMAKE_POST+=" -DUSE_TEXTCLIENT=ON -DUSE_RECEIVER=ON -DUSE_GUI=ON "
echo "Compile Option: TextClient, Receiver and GUI"
else
if [ $TEXTCLIENT -eq 1 ]; then
CMAKE_POST+=" -DUSE_TEXTCLIENT=ON "
echo "Compile Option: TextClient"
fi
if [ $RECEIVER -eq 1 ]; then
CMAKE_POST+=" -DUSE_RECEIVER=ON "
echo "Compile Option: Receiver"
fi
if [ $GUI -eq 1 ]; then
CMAKE_POST+=" -DUSE_GUI=ON "
echo "Compile Option: GUI"
fi
fi
#build dir doesnt exist
if [ ! -d "$BUILDDIR" ] ; then
echo "No Build Directory. Building of Cmake files required"
mkdir $BUILDDIR;
REBUILD=1
else
#rebuild not requested, but no makefile
if [ $REBUILD -eq 0 ] && [ ! -f "$BUILDDIR/Makefile" ] ; then
echo "No Makefile. Building of Cmake files required"
REBUILD=1
fi
fi
CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
#hdf5 rebuild
if [ $HDF5 -eq 1 ]; then
CMAKE_PRE+="HDF5_ROOT="$HDF5DIR
CMAKE_POST+=" -DUSE_HDF5=ON "
#normal mode rebuild
else
CMAKE_POST+=" -DUSE_HDF5=OFF "
fi
#enter build dir
cd $BUILDDIR;
echo "in "$PWD
#cmake
if [ $REBUILD -eq 1 ]; then
rm -f CMakeCache.txt
BUILDCOMMAND="$CMAKE_PRE cmake $CMAKE_POST .."
echo $BUILDCOMMAND
eval $BUILDCOMMAND
fi
#make clean
if [ $CLEAN -eq 1 ]; then
make clean;
fi
#make
if [ $COMPILERTHREADS -gt 0 ]; then
BUILDCOMMAND="make -j$COMPILERTHREADS"
echo $BUILDCOMMAND
eval $BUILDCOMMAND
else
make
fi

22
evalVersionVariables.sh Normal file
View File

@ -0,0 +1,22 @@
GITREPO1='git remote -v'
GITREPO2=" | grep \"fetch\" | cut -d' ' -f1"
BRANCH1='git branch -v'
BRANCH2=" | grep '*' | cut -d' ' -f2"
REPUID1='git log --pretty=format:"%H" -1'
AUTH1_1='git log --pretty=format:"%cn" -1'
AUTH1_2=" | cut -d' ' -f1"
AUTH2_1='git log --pretty=format:"%cn" -1'
AUTH2_2=" | cut -d' ' -f2"
FOLDERREV1='git log --oneline . ' #used for all the individual server folders
FOLDERREV2=" | wc -l" #used for all the individual server folders
REV1='git log --oneline '
REV2=" | wc -l"
GITREPO=`eval $GITREPO1 $GITREPO2`
BRANCH=`eval $BRANCH1 $BRANCH2`
REPUID=`eval $REPUID1`
AUTH1=`eval $AUTH1_1 $AUTH1_2`
AUTH2=`eval $AUTH2_1 $AUTH2_2`
REV=`eval $REV1 $REV2`
FOLDERREV=`eval $FOLDERREV1 $FOLDERREV2`

View File

@ -0,0 +1,33 @@
detsizechan 1024 512
#detetctor geometry, long side of the module first
hostname beb059+beb058+
#1Gb detector hostname for controls
0:rx_tcpport 1991
#tcpport for the first halfmodule
0:rx_udpport 50011
#udp port first quadrant, first halfmodule
0:rx_udpport2 50012
#udp port second quadrant, first halfmodule
0:rx_udpip 10.0.30.210
#udp IP of the receiver over 10Gb
0:detectorip 10.0.30.100
#first half module 10 Gb IP
1:rx_tcpport 1992
#tcpport for the second halfmodule
1:rx_udpport 50013
#udp port first quadrant, second halfmodule
1:rx_udpport2 50014
#udp port second quadrant, second halfmodule
1:rx_udpip 10.0.40.210
#udp IP of the receiver over 10Gb,
#can be the same or different from 0:rx_udpip
1:detectorip 10.0.40.101
#second half module 10 Gb IP
rx_hostname x12sa-vcons
#1Gb receiver pc hostname
outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
threaded 1

24
examples/eiger_1Gb.config Normal file
View File

@ -0,0 +1,24 @@
detsizechan 1024 512
#detetctor geometry, long side of the module first
hostname beb059+beb058+
#1Gb detector hostname for controls
0:rx_tcpport 1991
#tcpport for the first halfmodule
0:rx_udpport 50011
#udp port first quadrant, first halfmodule
0:rx_udpport2 50012
#udp port second quadrant, first halfmodule
1:rx_tcpport 1992
#tcpport for the second halfmodule
1:rx_udpport 50013
#udp port first quadrant, second halfmodule
1:rx_udpport2 50014
#udp port second quadrant, second halfmodule
rx_hostname x12sa-vcons
#1Gb receiver pc hostname
outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
threaded 1

View File

@ -1,5 +1,5 @@
type Gotthard+
0:hostname bchip007
hostname bchip007
#0:port 1952
#0:stopport 1953
#0:rx_tcpport 1956 must also have this in receiver config file
@ -10,9 +10,6 @@ type Gotthard+
0:caldir /home/l_maliakal_d/mySoft/newMythenSoftware/settingsdir/gotthard
0:ffdir /home/l_maliakal_d
0:extsig:0 off
0:extsig:1 off
0:extsig:2 off
0:extsig:3 off
#0:detectorip 129.129.202.9
0:detectormac 00:aa:bb:cc:dd:ee
0:rx_udpport 50004

18
examples/jungfrau.config Normal file
View File

@ -0,0 +1,18 @@
hostname bchip038+
settingsdir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
caldir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
lock 0
0:rx_udpport 50004
0:rx_udpip 10.1.1.100
0:detectorip 10.1.1.10
rx_hostname pcmoench01
powerchip 1
timing auto
outdir /external_pool/jungfrau_data/softwaretest
threaded 1

View File

@ -0,0 +1,30 @@
detsizechan 1024 1024
hostname bchip048+bchip052+
settingsdir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
caldir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
lock 0
0:rx_udpport 50004
0:rx_udpip 10.1.1.100
0:rx_udpmac F4:52:14:2F:32:00
0:detectorip 10.1.1.10
0:detectormac 00:aa:bb:cc:dd:33
1:rx_tcpport 1955
1:rx_udpport 50005
1:rx_udpip 10.1.1.100
1:rx_udpmac F4:52:14:2F:32:00
1:detectorip 10.1.1.11
1:detectormac 00:aa:bb:cc:dd:33
rx_hostname pcmoench01
powerchip 1
extsig:0 trigger_in_rising_edge
timing auto
outdir /external_pool/jungfrau_data/softwaretest
threaded 1

View File

@ -2,7 +2,6 @@
detsizechan 2560 1
#type Gotthard+
hostname bchip007+bchip009+
#0:hostname bchip007
@ -16,9 +15,6 @@ hostname bchip007+bchip009+
0:caldir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard
0:ffdir /home/l_msdetect
0:extsig:0 off
0:extsig:1 off
0:extsig:2 off
0:extsig:3 off
0:detectorip 10.1.1.2
#0:detectormac 00:aa:bb:cc:dd:ee
#0:rx_udpport 50001
@ -39,9 +35,6 @@ hostname bchip007+bchip009+
1:caldir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard
1:ffdir /home/l_msdetect
1:extsig:0 off
1:extsig:1 off
1:extsig:2 off
1:extsig:3 off
1:detectorip 10.1.2.2
#1:detectormac 00:aa:bb:cc:dd:ee
1:rx_udpport 50004

View File

@ -15,11 +15,11 @@ fout=$3
#dat=echo "date '+%Y%m%d'"
echo "in: $fin tmp: $ftmp out: $fout"
echo "Updating $fout"
#echo "in: $fin tmp: $ftmp out: $fout"
#awk 'NR==FNR {if ($3=="Date:") {l[FNR]=$4; gsub("-","",l[FNR]);} else { if (match($0,"Rev")) {l[FNR]=$(NF);} else {l[FNR]="\""$(NF)"\"";};};next} {$0=$1" "$2" "l[FNR]}1' $fin $ftmp > $fout
awk 'BEGIN {l[0]=0; "date +%Y%m%d" | getline l[1]; l[2]="\"/\""; l[3]="\"nobody\""; l[3]="\"nobody\""; l[4]="\"0000-0000-0000\"";} \
NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";};next;}
{if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];}}1' $fin $ftmp > $fout
NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";} else if (match($0,"Branch")) {l[5]="\""$(NF)"\"";};next;}
{if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];} else if (match($2,"BRANCH")) {$0=$1" "$2" "l[5];}}1' $fin $ftmp > $fout

View File

@ -1,8 +0,0 @@
#!/bin/bash
git $1
for i in sls*/; do
cd $i
echo $i
git $1
cd ..
done

View File

@ -1,11 +1,11 @@
DESTDIR?=../docs
DESTDIR?=docs
#manual-api manual-calwiz manual-client manual-gui manual-main
MAINDIRS= manual-main
MAINDIRS= manual-main manual-api manual-calwiz manual-client manual-gui
#manual-calwiz manual-calwiz manual-gui manual-client manual-api
CLEANDIRS=$(MAINDIRS:manual-%=clean-%)
PDFDIRS=$(MAINDIRS:manual-%=pdf-%)
@ -14,18 +14,18 @@ ALLDIRS=$(MAINDIRS:manual-%=all-%)
all: $(ALLDIRS)
$(shell test -d $(DESTDIR)/pdf && rm -fr $(DESTDIR)/pdf)
mv pdf $(DESTDIR)
$(shell test -d $(DESTDIR)/html && rm -fr $(DESTDIR)/html)
mv html $(DESTDIR)
# $(shell test -d $(DESTDIR)/pdf && rm -fr $(DESTDIR)/pdf)
# mv pdf $(DESTDIR)
# $(shell test -d $(DESTDIR)/html && rm -fr $(DESTDIR)/html)
# mv html $(DESTDIR)
pdf: $(PDFDIRS)
$(shell test -d $(DESTDIR)/pdf && rm -fr $(DESTDIR)/pdf)
mv pdf $(DESTDIR)
# $(shell test -d $(DESTDIR)/pdf && rm -fr $(DESTDIR)/pdf)
# mv pdf $(DESTDIR)
html: $(HTMLDIRS)
$(shell test -d $(DESTDIR)/html && rm -fr $(DESTDIR)/html)
mv html $(DESTDIR)
# $(shell test -d $(DESTDIR)/html && rm -fr $(DESTDIR)/html)
# mv html $(DESTDIR)
clean: $(CLEANDIRS)
rm -fr $(DESTDIR)/pdf
@ -45,7 +45,7 @@ clean-%:
cd $(@:clean-%=manual-%) && make clean
#<23><>$(@D)<29><> The directory part of the file name of the target, with the trailing slash removed. If the value of <20><>$@<40><> is dir/foo.o then <20><>$(@D)<29><> is dir. This value is . if <20><>$@<40><> does not contain a slash.
#<23><>$(@F)<29><> The file-within-directory part of the file name of the target. If the value of <20><>$@<40><> is dir/foo.o then <20><>$(@F)<29><> is foo.o. <20><>$(@F)<29><> is equivalent to <20><>$(notdir $@)<29><>.
#<23><>$(@D)<29><> The directory part of the file name of the target, with the trailing slash removed. If the value of <20><>$@<40><> is dir/foo.o then <20><>$(@D)<29><> is dir. This value is . if <20><>$@<40><> does not contain a slash.
#<23><>$(@F)<29><> The file-within-directory part of the file name of the target. If the value of <20><>$@<40><> is dir/foo.o then <20><>$(@F)<29><> is foo.o. <20><>$(@F)<29><> is equivalent to <20><>$(notdir $@)<29><>.

View File

@ -0,0 +1 @@
No implementation found for style `graphicx'

View File

@ -0,0 +1,30 @@
/* Century Schoolbook font is very similar to Computer Modern Math: cmmi */
.MATH { font-family: "Century Schoolbook", serif; }
.MATH I { font-family: "Century Schoolbook", serif; font-style: italic }
.BOLDMATH { font-family: "Century Schoolbook", serif; font-weight: bold }
/* implement both fixed-size and relative sizes */
SMALL.XTINY { font-size : xx-small }
SMALL.TINY { font-size : x-small }
SMALL.SCRIPTSIZE { font-size : smaller }
SMALL.FOOTNOTESIZE { font-size : small }
SMALL.SMALL { }
BIG.LARGE { }
BIG.XLARGE { font-size : large }
BIG.XXLARGE { font-size : x-large }
BIG.HUGE { font-size : larger }
BIG.XHUGE { font-size : xx-large }
/* heading styles */
H1 { }
H2 { }
H3 { }
H4 { }
H5 { }
/* mathematics styles */
DIV.displaymath { } /* math displays */
TD.eqno { } /* equation-number cells */
/* document-specific styles come next */

View File

@ -0,0 +1,84 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--Converted with LaTeX2HTML 2008 (1.71)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
<TITLE>Angular calibration wizard manual</TITLE>
<META NAME="description" CONTENT="Angular calibration wizard manual">
<META NAME="keywords" CONTENT="angularCalibrationHowTo">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
<LINK REL="next" HREF="node1.html">
</HEAD>
<BODY >
<!--Navigation Panel-->
<A NAME="tex2html6"
HREF="node1.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up_g.png">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev_g.png">
<BR>
<B> Next:</B> <A NAME="tex2html7"
HREF="node1.html">Introduction</A>
<BR>
<BR>
<!--End of Navigation Panel-->
<P>
<H1 ALIGN="CENTER">Angular calibration wizard manual</H1>
<DIV>
<P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
<P ALIGN="CENTER"><STRONG>March 12, 2018</STRONG></P>
</DIV>
<P>
<BR><HR>
<!--Table of Child-Links-->
<A NAME="CHILD_LINKS"></A>
<UL>
<LI><A NAME="tex2html8"
HREF="node1.html">Introduction</A>
<LI><A NAME="tex2html9"
HREF="node2.html">Data acquisition</A>
<UL>
<LI><A NAME="tex2html10"
HREF="node2.html#SECTION00021000000000000000">Software</A>
</UL>
<BR>
<LI><A NAME="tex2html11"
HREF="node3.html">Data analysis</A>
<UL>
<LI><A NAME="tex2html12"
HREF="node3.html#SECTION00031000000000000000">Software</A>
</UL>
<BR>
<LI><A NAME="tex2html13"
HREF="node4.html">Setup calibration files</A>
<LI><A NAME="tex2html14"
HREF="node5.html">About this document ...</A>
</UL>
<!--End of Table of Child-Links-->
<BR><HR>
<ADDRESS>
Thattil Dhanya
2018-03-12
</ADDRESS>
</BODY>
</HTML>

View File

@ -0,0 +1 @@
\relax

View File

@ -0,0 +1,236 @@
This is pdfTeXk, Version 3.141592-1.40.3 (Web2C 7.5.6) (format=latex 2014.12.17) 12 MAR 2018 15:45
entering extended mode
%&-line parsing enabled.
**./images.tex
(./images.tex
LaTeX2e <2005/12/01>
Babel <v3.8h> and hyphenation patterns for english, usenglishmax, dumylang, noh
yphenation, arabic, basque, bulgarian, coptic, welsh, czech, slovak, german, ng
erman, danish, esperanto, spanish, catalan, galician, estonian, farsi, finnish,
french, greek, monogreek, ancientgreek, croatian, hungarian, interlingua, ibyc
us, indonesian, icelandic, italian, latin, mongolian, dutch, norsk, polish, por
tuguese, pinyin, romanian, russian, slovenian, uppersorbian, serbian, swedish,
turkish, ukenglish, ukrainian, loaded.
(/usr/share/texmf/tex/latex/base/article.cls
Document Class: article 2005/09/16 v1.4f Standard LaTeX document class
(/usr/share/texmf/tex/latex/base/size10.clo
File: size10.clo 2005/09/16 v1.4f Standard LaTeX file (size option)
)
\c@part=\count79
\c@section=\count80
\c@subsection=\count81
\c@subsubsection=\count82
\c@paragraph=\count83
\c@subparagraph=\count84
\c@figure=\count85
\c@table=\count86
\abovecaptionskip=\skip41
\belowcaptionskip=\skip42
\bibindent=\dimen102
) (/usr/share/texmf/tex/latex/base/ifthen.sty
Package: ifthen 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
) (/usr/share/texmf/tex/latex/amsfonts/amssymb.sty
Package: amssymb 2002/01/22 v2.2d
(/usr/share/texmf/tex/latex/amsfonts/amsfonts.sty
Package: amsfonts 2001/10/25 v2.2f
\@emptytoks=\toks14
\symAMSa=\mathgroup4
\symAMSb=\mathgroup5
LaTeX Font Info: Overwriting math alphabet `\mathfrak' in version `bold'
(Font) U/euf/m/n --> U/euf/b/n on input line 132.
)) (/usr/share/texmf/tex/latex/graphics/graphicx.sty
Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
(/usr/share/texmf/tex/latex/graphics/keyval.sty
Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
\KV@toks@=\toks15
) (/usr/share/texmf/tex/latex/graphics/graphics.sty
Package: graphics 2006/02/20 v1.0o Standard LaTeX Graphics (DPC,SPQR)
(/usr/share/texmf/tex/latex/graphics/trig.sty
Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
) (/usr/share/texmf/tex/latex/config/graphics.cfg
File: graphics.cfg 2007/01/18 v1.5 graphics configuration of teTeX/TeXLive
)
Package graphics Info: Driver file: dvips.def on input line 90.
(/usr/share/texmf/tex/latex/graphics/dvips.def
File: dvips.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
))
\Gin@req@height=\dimen103
\Gin@req@width=\dimen104
) (/usr/share/texmf/tex/latex/tools/verbatim.sty
Package: verbatim 2003/08/22 v1.5q LaTeX2e package for verbatim enhancements
\every@verbatim=\toks16
\verbatim@line=\toks17
\verbatim@in@stream=\read1
) (/usr/share/texmf/tex/latex/graphics/color.sty
Package: color 2005/11/14 v1.0j Standard LaTeX Color (DPC)
(/usr/share/texmf/tex/latex/config/color.cfg
File: color.cfg 2007/01/18 v1.5 color configuration of teTeX/TeXLive
)
Package color Info: Driver file: dvips.def on input line 130.
(/usr/share/texmf/tex/latex/graphics/dvipsnam.def
File: dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
)) (/usr/share/texmf/tex/latex/base/inputenc.sty
Package: inputenc 2006/05/05 v1.1b Input encoding file
\inpenc@prehook=\toks18
\inpenc@posthook=\toks19
)
\sizebox=\box26
\lthtmlwrite=\write3
(./images.aux)
\openout1 = `images.aux'.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
latex2htmlLength hsize=349.0pt
latex2htmlLength vsize=633.0pt
latex2htmlLength hoffset=0.0pt
latex2htmlLength voffset=0.0pt
latex2htmlLength topmargin=0.0pt
latex2htmlLength topskip=0.00003pt
latex2htmlLength headheight=0.0pt
latex2htmlLength headsep=0.0pt
latex2htmlLength parskip=0.0pt plus 1.0pt
latex2htmlLength oddsidemargin=62.0pt
latex2htmlLength evensidemargin=62.0pt
LaTeX Font Info: Try loading font information for U+msa on input line 141.
(/usr/share/texmf/tex/latex/amsfonts/umsa.fd
File: umsa.fd 2002/01/19 v2.2g AMS font definitions
)
LaTeX Font Info: Try loading font information for U+msb on input line 141.
(/usr/share/texmf/tex/latex/amsfonts/umsb.fd
File: umsb.fd 2002/01/19 v2.2g AMS font definitions
)
l2hSize :tex2html_wrap_inline84:6.94444pt::0.0pt::5.47226pt.
[1
]
l2hSize :tex2html_wrap_inline86:7.33331pt::7.33331pt::24.82152pt.
[2
]
l2hSize :tex2html_wrap_inline88:6.59525pt::0.0pt::3.94516pt.
[3
]
l2hSize :tex2html_wrap_inline90:7.33331pt::7.33331pt::12.57195pt.
[4
]
l2hSize :displaymath18:22.88544pt::0.0pt::349.0pt.
[5
]
l2hSize :tex2html_wrap_inline94:8.76085pt::8.76085pt::12.72505pt.
[6
]
l2hSize :tex2html_wrap_inline96:8.76085pt::8.76085pt::31.20164pt.
[7
]
l2hSize :tex2html_wrap_inline98:8.26085pt::0.0pt::11.49947pt.
[8
]
l2hSize :tex2html_wrap_inline102:6.95831pt::6.95831pt::47.00348pt.
[9
]
l2hSize :tex2html_wrap_inline106:6.95831pt::6.95831pt::4.98616pt.
[10
]
l2hSize :tex2html_wrap_inline108:6.95831pt::6.95831pt::6.52551pt.
[11
]
l2hSize :tex2html_wrap_inline110:6.95831pt::6.95831pt::8.27783pt.
[12
]
l2hSize :tex2html_wrap_inline120:8.76085pt::8.76085pt::21.53073pt.
[13
]
File: enable_angcal.eps Graphic file (type eps)
<enable_angcal.eps>
l2hSize :tex2html_wrap330:378.81322pt::0.0pt::349.0pt.
[14
]
File: position_scan.eps Graphic file (type eps)
<position_scan.eps>
l2hSize :tex2html_wrap334:378.81322pt::0.0pt::349.0pt.
[15
]
File: setupAngcal.eps Graphic file (type eps)
<setupAngcal.eps>
l2hSize :tex2html_wrap340:444.03647pt::0.0pt::349.0pt.
[16
]
File: peakFit.eps Graphic file (type eps)
<peakFit.eps>
l2hSize :tex2html_wrap344:444.03647pt::0.0pt::349.0pt.
[17
]
File: angleFit.eps Graphic file (type eps)
<angleFit.eps>
l2hSize :tex2html_wrap348:444.03647pt::0.0pt::349.0pt.
[18
] (./images.aux) )
Here is how much of TeX's memory you used:
1145 strings out of 256217
14220 string characters out of 1917094
57024 words of memory out of 1500000
4454 multiletter control sequences out of 10000+200000
5339 words of font info for 22 fonts, out of 1200000 for 2000
645 hyphenation exceptions out of 8191
25i,6n,24p,212b,199s stack positions out of 5000i,500n,6000p,200000b,15000s
Output written on images.dvi (18 pages, 4432 bytes).

View File

@ -0,0 +1,116 @@
# LaTeX2HTML 2008 (1.71)
# Associate images original text with physical files.
$key = q/Theta_e;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="24" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img4.png"
ALT="$\Theta_e$">|;
$key = q/C_{center}^{i};MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="53" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img7.png"
ALT="$C_{center}^{i}$">|;
$key = q/i;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="10" HEIGHT="17" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img3.png"
ALT="$i$">|;
$key = q/mu;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="14" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img11.png"
ALT="$\mu$">|;
$key = q/Theta_o^i;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="24" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img6.png"
ALT="$\Theta_o^i$">|;
$key = q/includegraphics[width=textwidth]{enable_angcal.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="555" HEIGHT="603" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img14.png"
ALT="\includegraphics[width=\textwidth]{enable_angcal.eps}">|;
$key = q/p=50~mum;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="79" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img9.png"
ALT="$p=50&nbsp;\mu m$">|;
$key = q/_6;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="12" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img10.png"
ALT="$_6$">|;
$key = q/C_{peak};MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="43" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img2.png"
ALT="$C_{peak}$">|;
$key = q/includegraphics[width=textwidth]{peakFit.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="555" HEIGHT="707" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img17.png"
ALT="\includegraphics[width=\textwidth]{peakFit.eps}">|;
$key = q/pslashR^i;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="38" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img13.png"
ALT="$p/R^i$">|;
$key = q/includegraphics[width=textwidth]{setupAngcal.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="555" HEIGHT="707" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img16.png"
ALT="\includegraphics[width=\textwidth]{setupAngcal.eps}">|;
$key = q/pm;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="17" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img12.png"
ALT="$\pm$">|;
$key = q/includegraphics[width=textwidth]{angleFit.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="555" HEIGHT="707" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img18.png"
ALT="\includegraphics[width=\textwidth]{angleFit.eps}">|;
$key = q/{displaymath}Theta_e=Theta_o^i-arctanBig(frac{pcdot(C_{peak}-C_{center}^i)}{R^i}Big),{displaymath};MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="291" HEIGHT="41" BORDER="0"
SRC="|."$dir".q|img5.png"
ALT="\begin{displaymath}
\Theta_e=\Theta_o^i-\arctan\Big(\frac{p \cdot (C_{peak}-C_{center}^i)}{R^i}\Big),
\end{displaymath}">|;
$key = q/theta;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="12" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img1.png"
ALT="$\theta$">|;
$key = q/R^i;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="22" HEIGHT="16" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img8.png"
ALT="$R^i$">|;
$key = q/includegraphics[width=textwidth]{position_scan.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="555" HEIGHT="603" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img15.png"
ALT="\includegraphics[width=\textwidth]{position_scan.eps}">|;
1;

View File

@ -0,0 +1,255 @@
\batchmode
\documentclass{article}
\RequirePackage{ifthen}
\usepackage{amssymb}
\usepackage[dvips]{graphicx}
\usepackage{verbatim}
\usepackage[dvips]{color}
\pagecolor[gray]{.7}
\usepackage[]{inputenc}
\makeatletter
\makeatletter
\count@=\the\catcode`\_ \catcode`\_=8
\newenvironment{tex2html_wrap}{}{}%
\catcode`\<=12\catcode`\_=\count@
\newcommand{\providedcommand}[1]{\expandafter\providecommand\csname #1\endcsname}%
\newcommand{\renewedcommand}[1]{\expandafter\providecommand\csname #1\endcsname{}%
\expandafter\renewcommand\csname #1\endcsname}%
\newcommand{\newedenvironment}[1]{\newenvironment{#1}{}{}\renewenvironment{#1}}%
\let\newedcommand\renewedcommand
\let\renewedenvironment\newedenvironment
\makeatother
\let\mathon=$
\let\mathoff=$
\ifx\AtBeginDocument\undefined \newcommand{\AtBeginDocument}[1]{}\fi
\newbox\sizebox
\setlength{\hoffset}{0pt}\setlength{\voffset}{0pt}
\addtolength{\textheight}{\footskip}\setlength{\footskip}{0pt}
\addtolength{\textheight}{\topmargin}\setlength{\topmargin}{0pt}
\addtolength{\textheight}{\headheight}\setlength{\headheight}{0pt}
\addtolength{\textheight}{\headsep}\setlength{\headsep}{0pt}
\setlength{\textwidth}{349pt}
\newwrite\lthtmlwrite
\makeatletter
\let\realnormalsize=\normalsize
\global\topskip=2sp
\def\preveqno{}\let\real@float=\@float \let\realend@float=\end@float
\def\@float{\let\@savefreelist\@freelist\real@float}
\def\liih@math{\ifmmode$\else\bad@math\fi}
\def\end@float{\realend@float\global\let\@freelist\@savefreelist}
\let\real@dbflt=\@dbflt \let\end@dblfloat=\end@float
\let\@largefloatcheck=\relax
\let\if@boxedmulticols=\iftrue
\def\@dbflt{\let\@savefreelist\@freelist\real@dbflt}
\def\adjustnormalsize{\def\normalsize{\mathsurround=0pt \realnormalsize
\parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}%
\def\phantompar{\csname par\endcsname}\normalsize}%
\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}%
\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }%
\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }%
\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup %
\let\ifinner=\iffalse \let\)\liih@math }%
\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}%
\expandafter\box\next\egroup}%
\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}%
\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox
\ifdim\dimen0>.95\vsize
\lthtmltypeout{%
*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}%
\ht\sizebox.95\vsize \dp\sizebox\z@ \fi
\lthtmltypeout{l2hSize %
:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}%
\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist
\lthtmlmathtype{#1}\lthtmlvboxmathA}%
\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}%
\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup
\let\@savefreelist\@freelist \lthtmlhboxmathB}%
\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}%
\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox
\global\let\@freelist\@savefreelist}%
\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}%
\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}%
\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}%
\lthtmldisplayA{#1}\let\@eqnnum\relax}%
\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}%
\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB}
\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA
\vrule height1.5ex width0pt }%
\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}%
\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}%
\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
\expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline}
\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
\expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath}
\newcommand\lthtmlindisplaymathZ{\egroup %
\centerinlinemath\lthtmllogmath\lthtmlsetmath}
\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{%
\kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi
\ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{%
\kern.1em\kern0.8 pt\hbox{\hglue.17em\copy\sizebox\hglue0.8 pt}}\kern.3pt%
\ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.8 pt%
\ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
\def\centerinlinemath{%
\dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi
\advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1
\dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax}
\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize
\ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill
\else\expandafter\vss\fi}%
\providecommand{\selectlanguage}[1]{}%
\makeatletter \tracingstats = 1
\begin{document}
\pagestyle{empty}\thispagestyle{empty}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength hsize=\the\hsize}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength vsize=\the\vsize}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength hoffset=\the\hoffset}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength voffset=\the\voffset}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength topmargin=\the\topmargin}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength topskip=\the\topskip}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength headheight=\the\headheight}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength headsep=\the\headsep}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength parskip=\the\parskip}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength oddsidemargin=\the\oddsidemargin}\lthtmltypeout{}%
\makeatletter
\if@twoside\lthtmltypeout{latex2htmlLength evensidemargin=\the\evensidemargin}%
\else\lthtmltypeout{latex2htmlLength evensidemargin=\the\oddsidemargin}\fi%
\lthtmltypeout{}%
\makeatother
\setcounter{page}{1}
\onecolumn
% !!! IMAGES START HERE !!!
\stepcounter{section}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline84}%
$\theta$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline86}%
$C_{peak}$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline88}%
$i$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline90}%
$\Theta_e$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmldisplayA{displaymath18}%
\begin{displaymath}
\Theta_e=\Theta_o^i-\arctan\Big(\frac{p \cdot (C_{peak}-C_{center}^i)}{R^i}\Big),
\end{displaymath}%
\lthtmldisplayZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline94}%
$\Theta_o^i$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline96}%
$C_{center}^{i}$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline98}%
$R^i$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline102}%
$p=50~\mu m$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline106}%
$_6$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline108}%
$\mu$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline110}%
$\pm$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
\stepcounter{section}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline120}%
$p/R^i$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
\stepcounter{subsection}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap330}%
\includegraphics[width=\textwidth]{enable_angcal.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap334}%
\includegraphics[width=\textwidth]{position_scan.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
\stepcounter{section}
\stepcounter{subsection}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap340}%
\includegraphics[width=\textwidth]{setupAngcal.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap344}%
\includegraphics[width=\textwidth]{peakFit.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap348}%
\includegraphics[width=\textwidth]{angleFit.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
\stepcounter{section}
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 371 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 458 B

View File

@ -0,0 +1,84 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--Converted with LaTeX2HTML 2008 (1.71)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
<TITLE>Angular calibration wizard manual</TITLE>
<META NAME="description" CONTENT="Angular calibration wizard manual">
<META NAME="keywords" CONTENT="angularCalibrationHowTo">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
<LINK REL="next" HREF="node1.html">
</HEAD>
<BODY >
<!--Navigation Panel-->
<A NAME="tex2html6"
HREF="node1.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up_g.png">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev_g.png">
<BR>
<B> Next:</B> <A NAME="tex2html7"
HREF="node1.html">Introduction</A>
<BR>
<BR>
<!--End of Navigation Panel-->
<P>
<H1 ALIGN="CENTER">Angular calibration wizard manual</H1>
<DIV>
<P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
<P ALIGN="CENTER"><STRONG>March 12, 2018</STRONG></P>
</DIV>
<P>
<BR><HR>
<!--Table of Child-Links-->
<A NAME="CHILD_LINKS"></A>
<UL>
<LI><A NAME="tex2html8"
HREF="node1.html">Introduction</A>
<LI><A NAME="tex2html9"
HREF="node2.html">Data acquisition</A>
<UL>
<LI><A NAME="tex2html10"
HREF="node2.html#SECTION00021000000000000000">Software</A>
</UL>
<BR>
<LI><A NAME="tex2html11"
HREF="node3.html">Data analysis</A>
<UL>
<LI><A NAME="tex2html12"
HREF="node3.html#SECTION00031000000000000000">Software</A>
</UL>
<BR>
<LI><A NAME="tex2html13"
HREF="node4.html">Setup calibration files</A>
<LI><A NAME="tex2html14"
HREF="node5.html">About this document ...</A>
</UL>
<!--End of Table of Child-Links-->
<BR><HR>
<ADDRESS>
Thattil Dhanya
2018-03-12
</ADDRESS>
</BODY>
</HTML>

View File

@ -0,0 +1,30 @@
# LaTeX2HTML 2008 (1.71)
# Associate internals original text with physical files.
$key = q/fig:guiangcallog/;
$ref_files{$key} = "$dir".q|node2.html|;
$noresave{$key} = "$nosave";
$key = q/fig:guiposscan/;
$ref_files{$key} = "$dir".q|node2.html|;
$noresave{$key} = "$nosave";
$key = q/fig:peakfit/;
$ref_files{$key} = "$dir".q|node3.html|;
$noresave{$key} = "$nosave";
$key = q/eq:angcal/;
$ref_files{$key} = "$dir".q|node1.html|;
$noresave{$key} = "$nosave";
$key = q/fig:setangcal/;
$ref_files{$key} = "$dir".q|node3.html|;
$noresave{$key} = "$nosave";
$key = q/fig:anglefit/;
$ref_files{$key} = "$dir".q|node3.html|;
$noresave{$key} = "$nosave";
1;

View File

@ -0,0 +1,61 @@
# LaTeX2HTML 2008 (1.71)
# Associate labels original text with physical files.
$key = q/fig:guiangcallog/;
$external_labels{$key} = "$URL/" . q|node2.html|;
$noresave{$key} = "$nosave";
$key = q/fig:guiposscan/;
$external_labels{$key} = "$URL/" . q|node2.html|;
$noresave{$key} = "$nosave";
$key = q/fig:peakfit/;
$external_labels{$key} = "$URL/" . q|node3.html|;
$noresave{$key} = "$nosave";
$key = q/eq:angcal/;
$external_labels{$key} = "$URL/" . q|node1.html|;
$noresave{$key} = "$nosave";
$key = q/fig:setangcal/;
$external_labels{$key} = "$URL/" . q|node3.html|;
$noresave{$key} = "$nosave";
$key = q/fig:anglefit/;
$external_labels{$key} = "$URL/" . q|node3.html|;
$noresave{$key} = "$nosave";
1;
# LaTeX2HTML 2008 (1.71)
# labels from external_latex_labels array.
$key = q/fig:guiangcallog/;
$external_latex_labels{$key} = q|1|;
$noresave{$key} = "$nosave";
$key = q/fig:guiposscan/;
$external_latex_labels{$key} = q|2|;
$noresave{$key} = "$nosave";
$key = q/fig:peakfit/;
$external_latex_labels{$key} = q|4|;
$noresave{$key} = "$nosave";
$key = q/eq:angcal/;
$external_latex_labels{$key} = q|1|;
$noresave{$key} = "$nosave";
$key = q/fig:setangcal/;
$external_latex_labels{$key} = q|3|;
$noresave{$key} = "$nosave";
$key = q/fig:anglefit/;
$external_latex_labels{$key} = q|5|;
$noresave{$key} = "$nosave";
1;

View File

@ -0,0 +1,186 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--Converted with LaTeX2HTML 2008 (1.71)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
<TITLE>Introduction</TITLE>
<META NAME="description" CONTENT="Introduction">
<META NAME="keywords" CONTENT="angularCalibrationHowTo">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
<LINK REL="next" HREF="node2.html">
<LINK REL="previous" HREF="angularCalibrationHowTo.html">
<LINK REL="up" HREF="angularCalibrationHowTo.html">
<LINK REL="next" HREF="node2.html">
</HEAD>
<BODY >
<!--Navigation Panel-->
<A NAME="tex2html23"
HREF="node2.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<A NAME="tex2html21"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up.png"></A>
<A NAME="tex2html15"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev.png"></A>
<BR>
<B> Next:</B> <A NAME="tex2html24"
HREF="node2.html">Data acquisition</A>
<B> Up:</B> <A NAME="tex2html22"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<B> Previous:</B> <A NAME="tex2html16"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<BR>
<BR>
<!--End of Navigation Panel-->
<H1><A NAME="SECTION00010000000000000000">
Introduction</A>
</H1>
<P>
In order to convert from strip number to 2<IMG
WIDTH="12" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="img1.png"
ALT="$\theta$">-angle, an accurate angular calibration of the detector must be performed (for details see the paper Bergamaschi, A. et al. (2010). J. Synchrotron Rad. 17, 653-668).
<BR>
<P>
For this purpose, a series of patterns of a powder standard with symmetric peaks (e.g. silicon) must acquired while shifting the detector by an angular step of the order of about 2% of the module size. During the measurement, a strong intensity peak (e.g. Si(111)) should pass through the field of view of every module such that it can be used as a reference angular position to perform the calibration of the modules position.
<BR>
<P>
In a first step, the peak is fitted with a Gaussian in order to determine its position <IMG
WIDTH="43" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="img2.png"
ALT="$C_{peak}$"> in channel number for each of the acquired patterns.
<BR>
In a second step, for each module <IMG
WIDTH="10" HEIGHT="17" ALIGN="BOTTOM" BORDER="0"
SRC="img3.png"
ALT="$i$">, the encoder position <IMG
WIDTH="24" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="img4.png"
ALT="$\Theta_e$"> is fitted as a function of the peak position <IMG
WIDTH="43" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="img2.png"
ALT="$C_{peak}$"> according to:
<BR>
<DIV ALIGN="RIGHT">
<!-- MATH
\begin{equation}
\Theta_e=\Theta_o^i-\arctan\Big(\frac{p \cdot (C_{peak}-C_{center}^i)}{R^i}\Big),
\end{equation}
-->
<TABLE WIDTH="100%" ALIGN="CENTER">
<TR VALIGN="MIDDLE"><TD ALIGN="CENTER" NOWRAP><A NAME="eq:angcal"></A><IMG
WIDTH="291" HEIGHT="41" BORDER="0"
SRC="img5.png"
ALT="\begin{displaymath}
\Theta_e=\Theta_o^i-\arctan\Big(\frac{p \cdot (C_{peak}-C_{center}^i)}{R^i}\Big),
\end{displaymath}"></TD>
<TD WIDTH=10 ALIGN="RIGHT">
(1)</TD></TR>
</TABLE>
<BR CLEAR="ALL"></DIV><P></P>
where the parameters <IMG
WIDTH="24" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="img6.png"
ALT="$\Theta_o^i$"> is the angular offset with respect to the diffractometer zero position, <!-- MATH
$C_{center}^{i}$
-->
<IMG
WIDTH="53" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="img7.png"
ALT="$C_{center}^{i}$"> is the central channel and <IMG
WIDTH="22" HEIGHT="16" ALIGN="BOTTOM" BORDER="0"
SRC="img8.png"
ALT="$R^i$"> is the distance of the module <IMG
WIDTH="10" HEIGHT="17" ALIGN="BOTTOM" BORDER="0"
SRC="img3.png"
ALT="$i$"> from the diffractometer center while <IMG
WIDTH="79" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="img9.png"
ALT="$p=50~\mu m$"> is the strip pitch of the detector.
<BR>
Finally, the global offset of the detector system is precisely determined by refining a silicon pattern at a well-defined energy (i.e., knowing the position of the peak).
<P>
The same function of equation&nbsp;<A HREF="#eq:angcal">1</A>, with the parameters obtained from the calibration, is used in order to convert from channel number to 2<IMG
WIDTH="12" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="img1.png"
ALT="$\theta$">-angle.
<P>
The parallax at the borders of the modules due to the thickness of the silicon sensor is a function of the X-ray energy (higher energy X-rays are absorbed deeper inside the sensor) and is of the order of 0.2&nbsp;mdeg at 12&nbsp;keV and 0.5&nbsp;mdeg at 30&nbsp;keV.
<BR>
The differences in pixel size due to the different portion of solid angle covered by the strips on the border of the modules and the higher efficiency due to the longer path of the X-rays in the sensor are removed by the flat field correction. This also normalizes additional differences in pixel size between channels which are also present because of mismatches in the strip sensor fabrication and in fluctuations of the channels threshold level.
<P>
Patterns acquired at different detector positions are generally merged together in order to fill the gaps between the modules and correct possibly bad functioning channels. In this procedure the data from different positions which are closer than 4&nbsp;mdeg (the average pixel size) are averaged and the new position is set to the mean of the positions of the original points.
<P>
The position and width of the peaks results from a fit over several detector channels. Geometrical distortions might disturb this determination mainly because of errors in the angular calibration, fluctuations in the encoder position, variations between channels and parallax effects.
<BR>
The resolution in locating the peak center and determining its width and integrated intensity has been estimated by acquiring several patterns of a LaB<IMG
WIDTH="12" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="img10.png"
ALT="$_6$"> sample in a 300&nbsp;<IMG
WIDTH="14" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="img11.png"
ALT="$\mu$">m capillary with the detector shifted in 5&nbsp;mdeg steps between 30.4 and 36.5 degrees. The 16&nbsp;peaks acquired have been fitted with a Gaussian function plus background and the fluctuations on the fitted parameters have been calculated. The resulting average resolutions are 0.63<IMG
WIDTH="17" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="img12.png"
ALT="$\pm$">0.06&nbsp;mdeg for the peak center and 0.22<IMG
WIDTH="17" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="img12.png"
ALT="$\pm$">0.05&nbsp;mdeg for the peak Full-Width at Half-Maximum (FWHM) for an average peak FWHM of 27.0<IMG
WIDTH="17" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="img12.png"
ALT="$\pm$">2.5&nbsp;mdeg.
<BR>
These results show that the angular calibration allows a resolution in determining the peaks position and width which is appropriate for structural determination.
<P>
<HR>
<!--Navigation Panel-->
<A NAME="tex2html23"
HREF="node2.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<A NAME="tex2html21"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up.png"></A>
<A NAME="tex2html15"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev.png"></A>
<BR>
<B> Next:</B> <A NAME="tex2html24"
HREF="node2.html">Data acquisition</A>
<B> Up:</B> <A NAME="tex2html22"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<B> Previous:</B> <A NAME="tex2html16"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<!--End of Navigation Panel-->
<ADDRESS>
Thattil Dhanya
2018-03-12
</ADDRESS>
</BODY>
</HTML>

View File

@ -0,0 +1,217 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--Converted with LaTeX2HTML 2008 (1.71)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
<TITLE>Data acquisition</TITLE>
<META NAME="description" CONTENT="Data acquisition">
<META NAME="keywords" CONTENT="angularCalibrationHowTo">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
<LINK REL="next" HREF="node3.html">
<LINK REL="previous" HREF="node1.html">
<LINK REL="up" HREF="angularCalibrationHowTo.html">
<LINK REL="next" HREF="node3.html">
</HEAD>
<BODY >
<!--Navigation Panel-->
<A NAME="tex2html33"
HREF="node3.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<A NAME="tex2html31"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up.png"></A>
<A NAME="tex2html25"
HREF="node1.html">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev.png"></A>
<BR>
<B> Next:</B> <A NAME="tex2html34"
HREF="node3.html">Data analysis</A>
<B> Up:</B> <A NAME="tex2html32"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<B> Previous:</B> <A NAME="tex2html26"
HREF="node1.html">Introduction</A>
<BR>
<BR>
<!--End of Navigation Panel-->
<!--Table of Child-Links-->
<A NAME="CHILD_LINKS"><STRONG>Subsections</STRONG></A>
<UL>
<LI><A NAME="tex2html35"
HREF="node2.html#SECTION00021000000000000000">Software</A>
</UL>
<!--End of Table of Child-Links-->
<HR>
<H1><A NAME="SECTION00020000000000000000">
Data acquisition</A>
</H1>
<P>
The angular calibration consists in acquiring a set of diffraction patterns of a well known powder standard (e.g. Silicon) at different encoder positions. In order to facilitate the procedure, the sample should not emit fluorescent light and should present relatively symmetric peaks.
<BR>
During the measurement, a strong intensity peak (e.g. Si(111)) should pass through the field of view of every module such that it can be used as a reference angular position to perform the calibration of the modules position. In general the highest peak will be used for the calibration, but this is not necessary in case there would be e.g. geometrical limitations for shifting the detector.
<BR><B>Do not forget to properly position the beam stopper if the detector is scanned in front of the direct beam.</B>
<BR>
The detector should be shifted of an angular step of the order of about 2% of the module size, such that about 50 patterns can contribute to the fitting of the 3 parameters necessary for the angular calibration.
<BR>
<P>
All the angular calibration procedure should be acquired using a trimmed detector with the threshold set at half of the X-ray energy (Assuming no fluorescent element in the standard). A flat field should also be acquired in order to precisely correct the data, while the X-ray intensity should be kept lower than about 100&nbsp;kHz per strip in order to avoid the need for rate corrections.
<P>
A rough angular conversion file starting from a previous calibration or from the geometric characteristics of the mechanics is an advantage. The angular conversion file should contain a line for each module of the detector with its module number <IMG
WIDTH="10" HEIGHT="17" ALIGN="BOTTOM" BORDER="0"
SRC="img3.png"
ALT="$i$">, center <!-- MATH
$C_{center}^{i}$
-->
<IMG
WIDTH="53" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="img7.png"
ALT="$C_{center}^{i}$"> and error, conversion radius <IMG
WIDTH="38" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="img13.png"
ALT="$p/R^i$"> and error, offset <IMG
WIDTH="24" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
SRC="img6.png"
ALT="$\Theta_o^i$"> and error:
<PRE>
module 0 center 639.5 +- 0 conversion 6.56E-05 +- 0 offset 0 +- 0
</PRE>
Also the <I>global offset</I> value of the beamline should be approximately known i.e. the angular position of channel 0 of module 0 when the motor is set at 0.
<BR>
All the documentation assumes that the detector is oriented in the same direction as the encoder position i.e. large channel number at higher angles (both per module and absolute). If this is not the case, the <I>angular direction</I> should be set to -1.
<P>
<H2><A NAME="SECTION00021000000000000000">
Software</A>
</H2>
<P>
For the acquisition ot the data you need to install the slsDetector software package (please refere to separate documentation). The use of the GUI is optional and all operations can be performed also using the text client.
<BR>
<P>
Please make sure that you have edited the
<BR><I>slsDetectorSoftware/usersFunctions/angleFunction.h</I>
<BR>
in order to match the angular conversion for your geometry and
<BR><I>slsDetectorSoftware/usersFunctions/usersFunctions.cpp</I>
<BR>
in order to be able to move the detector and read out its position by using the slsDetector software.
<P>
In the following the command to acquire a dataset for the angular calibration with an exposure time of 1&nbsp;s, and position shift
<PRE>
#setup angular calibration log mode
&gt; sls_detector_put angcallog 1
#set exposure time to 1s
&gt; sls_detector_put exptime 1.
#setup threshold scan
&gt; sls_detector_put scan0script position
#setup the precision for the scan variable in the file name
&gt; sls_detector_put scan0prec 2
#set scan range between 20deg and -60deg, step of -0.1deg
# (at 12.4 keV the Si(111) peak is at approx 19deg
&gt; sls_detector_put scan0range 20 -60 -0.1
#acquire the data
&gt; sls_detector_acquire
#unset angular calibration log mode
&gt; sls_detector_put angcallog 0
</PRE>
<P>
With the GUI you can obtain the same results by clicking on the <I>Angular calibration</I> log button in the advanced tab (see figure&nbsp;<A HREF="#fig:guiangcallog">1</A>) and setting up the motor position scan in the Actions tab (see figure&nbsp;<A HREF="#fig:guiposscan">2</A>). The exposure time should also be set in the measurement tab.
<P>
Additional to the data files, the acquisition will produce a .angcal file containing an header and, for each step of the acquisition, the exect value of the motor position and the file name.
<BR>
In case you forgot to enable the angcallog flag in the software, you can produce the file with the syntax as follows, assuming that you know the exact values of your encoder for each frame:
<PRE>
type Mythen
maxmod 32
nmod 32
angconv /scratch/angcal20120422/ang.off
globaloff 5.088
fineoff 0.0
angdir 1
ffdir /scratch/angcal20120422/
flatfield flatfield_E12keV_T6keV_0.raw
badchannels /scratch/cal/bad.chans
19.99998 angcal_S20.00_0
19.90001 angcal_S19.90_0
19.79999 angcal_S19.80_0
19.70002 angcal_S19.70_0
......
</PRE>
<P>
<DIV ALIGN="CENTER"><A NAME="fig:guiangcallog"></A><A NAME="46"></A>
<TABLE>
<CAPTION ALIGN="BOTTOM"><STRONG>Figure 1:</STRONG>
Acquisition GUI window to enable the angular calibration log.</CAPTION>
<TR><TD><IMG
WIDTH="555" HEIGHT="603" ALIGN="BOTTOM" BORDER="0"
SRC="img14.png"
ALT="\includegraphics[width=\textwidth]{enable_angcal.eps}"></TD></TR>
</TABLE>
</DIV>
<P>
<DIV ALIGN="CENTER"><A NAME="fig:guiposscan"></A><A NAME="51"></A>
<TABLE>
<CAPTION ALIGN="BOTTOM"><STRONG>Figure 2:</STRONG>
Acquisition GUI window to setup the motor position scan.</CAPTION>
<TR><TD><IMG
WIDTH="555" HEIGHT="603" ALIGN="BOTTOM" BORDER="0"
SRC="img15.png"
ALT="\includegraphics[width=\textwidth]{position_scan.eps}"></TD></TR>
</TABLE>
</DIV>
<P>
<HR>
<!--Navigation Panel-->
<A NAME="tex2html33"
HREF="node3.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<A NAME="tex2html31"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up.png"></A>
<A NAME="tex2html25"
HREF="node1.html">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev.png"></A>
<BR>
<B> Next:</B> <A NAME="tex2html34"
HREF="node3.html">Data analysis</A>
<B> Up:</B> <A NAME="tex2html32"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<B> Previous:</B> <A NAME="tex2html26"
HREF="node1.html">Introduction</A>
<!--End of Navigation Panel-->
<ADDRESS>
Thattil Dhanya
2018-03-12
</ADDRESS>
</BODY>
</HTML>

View File

@ -0,0 +1,186 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--Converted with LaTeX2HTML 2008 (1.71)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
<TITLE>Data analysis</TITLE>
<META NAME="description" CONTENT="Data analysis">
<META NAME="keywords" CONTENT="angularCalibrationHowTo">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
<LINK REL="next" HREF="node4.html">
<LINK REL="previous" HREF="node2.html">
<LINK REL="up" HREF="angularCalibrationHowTo.html">
<LINK REL="next" HREF="node4.html">
</HEAD>
<BODY >
<!--Navigation Panel-->
<A NAME="tex2html44"
HREF="node4.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<A NAME="tex2html42"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up.png"></A>
<A NAME="tex2html36"
HREF="node2.html">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev.png"></A>
<BR>
<B> Next:</B> <A NAME="tex2html45"
HREF="node4.html">Setup calibration files</A>
<B> Up:</B> <A NAME="tex2html43"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<B> Previous:</B> <A NAME="tex2html37"
HREF="node2.html">Data acquisition</A>
<BR>
<BR>
<!--End of Navigation Panel-->
<!--Table of Child-Links-->
<A NAME="CHILD_LINKS"><STRONG>Subsections</STRONG></A>
<UL>
<LI><A NAME="tex2html46"
HREF="node3.html#SECTION00031000000000000000">Software</A>
</UL>
<!--End of Table of Child-Links-->
<HR>
<H1><A NAME="SECTION00030000000000000000">
Data analysis</A>
</H1>
<P>
The data analysis consists in fitting with a gaussian the selected peak of the powder pattern for each position in order to determine its position is channel number as a function of the encoder position.
<BR>
In a second step, for each module, the channel vs. encoder curve is fitted in order to extrapolate the three parameters necessary for the angular conversion and the result is written to file
<P>
<H2><A NAME="SECTION00031000000000000000">
Software</A>
</H2>
<P>
The software used for the angular calibration data analysis is based on root (see http://root.cern.ch).
<BR>
This can be downloaded as binary or installed from sources. The version of the software should not play an important role, but up to now everything has been implemented and tested using version 5.20.
<P>
To start the data analysis simply launch:
<PRE>
&gt; ./angularCalibrationWizard
</PRE>
<P>
<DIV ALIGN="CENTER"><A NAME="fig:setangcal"></A><A NAME="60"></A>
<TABLE>
<CAPTION ALIGN="BOTTOM"><STRONG>Figure 3:</STRONG>
Overview of the nagular calibration dataset.</CAPTION>
<TR><TD><IMG
WIDTH="555" HEIGHT="707" ALIGN="BOTTOM" BORDER="0"
SRC="img16.png"
ALT="\includegraphics[width=\textwidth]{setupAngcal.eps}"></TD></TR>
</TABLE>
</DIV>
<P>
To setup the angular calibration dataset, the .angcal file should be selected (or digited) and the load button should be pressed to confirm. The parameters of the angular calibration are then read to the file and the data loaded for a quick overview (see figure&nbsp;<A HREF="#fig:setangcal">3</A>).
<BR>
The software assumes that the data files (.raw) and the .encal file are in the same directory.
<BR>
A 2D color plot will show a rebinned overview of the dataset. The peak to be fitted should be visible as a high intensity diagonal line passing through all the channels.
<P>
<DIV ALIGN="CENTER"><A NAME="fig:peakfit"></A><A NAME="66"></A>
<TABLE>
<CAPTION ALIGN="BOTTOM"><STRONG>Figure 4:</STRONG>
Preview of the fitting of the Si(111) peak for one of the detector positions.</CAPTION>
<TR><TD><IMG
WIDTH="555" HEIGHT="707" ALIGN="BOTTOM" BORDER="0"
SRC="img17.png"
ALT="\includegraphics[width=\textwidth]{peakFit.eps}"></TD></TR>
</TABLE>
</DIV>
<P>
For a more detailed view of the data, one can select an angular calibration step from the combo box, select the plot mode (raw data or processed data as a function of channel number, processed angular converted data, flat field data, or again an overview of the whole dataset).
<BR>
By (right) clicking close to the axis you are able to zoom in/out, set the scale to logarithmic etc.
<BR>
<P>
If the bad channel list, angular conversion file or flat field file are changed compared to the acquisition, they can be reloaded by editing the correspondent text entries and pressing enter.
<P>
In particular, the angular converted data should be checked in order to view the position of the selected peak. In this case, the plot will be zoomed to the angular region slected in the minimum and maximum angle entries. By pressing fit, the fit of the peak in the selected angular range will be shown (see figure&nbsp;<A HREF="#fig:peakfit">4</A>). It is useful to check that it works properly in several positions such that then the sequential fitting on all steps can give good results.
<P>
To automatically fit all positions simply press <I>Proceed to Modules Calibration</I> and wait until all steps are fitted. This can take sometime, depending on the number of steps.
<P>
<DIV ALIGN="CENTER"><A NAME="fig:anglefit"></A><A NAME="73"></A>
<TABLE>
<CAPTION ALIGN="BOTTOM"><STRONG>Figure 5:</STRONG>
Window for fitting the angular calibration parameters of a module.</CAPTION>
<TR><TD><IMG
WIDTH="555" HEIGHT="707" ALIGN="BOTTOM" BORDER="0"
SRC="img18.png"
ALT="\includegraphics[width=\textwidth]{angleFit.eps}"></TD></TR>
</TABLE>
</DIV>
<P>
In the module calibration window (see figure&nbsp;<A HREF="#fig:anglefit">5</A>), you will be able to fit the channel number to encoder position curve to estimate the three angular calibration parameters for each module.
<BR>
The entries show the angular calibration parameters used for approximate angular conversion in the previous step of the calibration. These can be edited and will be used as start parameters for the fit.
By clicking on the check box next to the parameters, the selected parameter will be set and fixed during the fit. Often the center is used as a fix parameter.
<BR>
It is possible to navigate between modules by using the Previous and Next module buttons. To refit the current module (e.g. after changing one of the parameters) simply re-click on the module number.
<P>
After fitting all modules you can click on the <I>Write Angular Calibration</I> button, select the file name to write to and save the calibration angulat calibration data. Please note that the offset of module 0 will always be 0 and the other values will be rescaled to its value. Therefore the global offset of the steup will always need to be specified for a proper angular conversion unless the home of the encoder will not be redifined.
<P>
<HR>
<!--Navigation Panel-->
<A NAME="tex2html44"
HREF="node4.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<A NAME="tex2html42"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up.png"></A>
<A NAME="tex2html36"
HREF="node2.html">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev.png"></A>
<BR>
<B> Next:</B> <A NAME="tex2html45"
HREF="node4.html">Setup calibration files</A>
<B> Up:</B> <A NAME="tex2html43"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<B> Previous:</B> <A NAME="tex2html37"
HREF="node2.html">Data acquisition</A>
<!--End of Navigation Panel-->
<ADDRESS>
Thattil Dhanya
2018-03-12
</ADDRESS>
</BODY>
</HTML>

View File

@ -0,0 +1,68 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--Converted with LaTeX2HTML 2008 (1.71)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
<TITLE>Setup calibration files</TITLE>
<META NAME="description" CONTENT="Setup calibration files">
<META NAME="keywords" CONTENT="angularCalibrationHowTo">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
<LINK REL="next" HREF="node5.html">
<LINK REL="previous" HREF="node3.html">
<LINK REL="up" HREF="angularCalibrationHowTo.html">
<LINK REL="next" HREF="node5.html">
</HEAD>
<BODY >
<!--Navigation Panel-->
<A NAME="tex2html55"
HREF="node5.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<A NAME="tex2html53"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up.png"></A>
<A NAME="tex2html47"
HREF="node3.html">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev.png"></A>
<BR>
<B> Next:</B> <A NAME="tex2html56"
HREF="node5.html">About this document ...</A>
<B> Up:</B> <A NAME="tex2html54"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<B> Previous:</B> <A NAME="tex2html48"
HREF="node3.html">Data analysis</A>
<BR>
<BR>
<!--End of Navigation Panel-->
<H1><A NAME="SECTION00040000000000000000">
Setup calibration files</A>
</H1>
<P>
To use the generated angular calibration files, using the text client:
<PRE>
sls_detector_put angconv /scratch/ang_new.off
</PRE>
while for the GUI the file name should be specified in the configuration file (works also for the text client).
<BR><HR>
<ADDRESS>
Thattil Dhanya
2018-03-12
</ADDRESS>
</BODY>
</HTML>

View File

@ -0,0 +1,71 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--Converted with LaTeX2HTML 2008 (1.71)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
<TITLE>About this document ...</TITLE>
<META NAME="description" CONTENT="About this document ...">
<META NAME="keywords" CONTENT="angularCalibrationHowTo">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
<LINK REL="previous" HREF="node4.html">
<LINK REL="up" HREF="angularCalibrationHowTo.html">
</HEAD>
<BODY >
<!--Navigation Panel-->
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next_g.png">
<A NAME="tex2html61"
HREF="angularCalibrationHowTo.html">
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up.png"></A>
<A NAME="tex2html57"
HREF="node4.html">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev.png"></A>
<BR>
<B> Up:</B> <A NAME="tex2html62"
HREF="angularCalibrationHowTo.html">Angular calibration wizard manual</A>
<B> Previous:</B> <A NAME="tex2html58"
HREF="node4.html">Setup calibration files</A>
<BR>
<BR>
<!--End of Navigation Panel-->
<H1><A NAME="SECTION00050000000000000000">
About this document ...</A>
</H1>
<STRONG>Angular calibration wizard manual</STRONG><P>
This document was generated using the
<A HREF="http://www.latex2html.org/"><STRONG>LaTeX</STRONG>2<tt>HTML</tt></A> translator Version 2008 (1.71)
<P>
Copyright &#169; 1993, 1994, 1995, 1996,
<A HREF="http://cbl.leeds.ac.uk/nikos/personal.html">Nikos Drakos</A>,
Computer Based Learning Unit, University of Leeds.
<BR>
Copyright &#169; 1997, 1998, 1999,
<A HREF="http://www.maths.mq.edu.au/~ross/">Ross Moore</A>,
Mathematics Department, Macquarie University, Sydney.
<P>
The command line arguments were: <BR>
<STRONG>latex2html</STRONG> <TT>-split 4 angularCalibrationHowTo.tex</TT>
<P>
The translation was initiated by Thattil Dhanya on 2018-03-12
<BR><HR>
<ADDRESS>
Thattil Dhanya
2018-03-12
</ADDRESS>
</BODY>
</HTML>

View File

@ -0,0 +1 @@
No implementation found for style `graphicx'

View File

@ -0,0 +1,30 @@
/* Century Schoolbook font is very similar to Computer Modern Math: cmmi */
.MATH { font-family: "Century Schoolbook", serif; }
.MATH I { font-family: "Century Schoolbook", serif; font-style: italic }
.BOLDMATH { font-family: "Century Schoolbook", serif; font-weight: bold }
/* implement both fixed-size and relative sizes */
SMALL.XTINY { font-size : xx-small }
SMALL.TINY { font-size : x-small }
SMALL.SCRIPTSIZE { font-size : smaller }
SMALL.FOOTNOTESIZE { font-size : small }
SMALL.SMALL { }
BIG.LARGE { }
BIG.XLARGE { font-size : large }
BIG.XXLARGE { font-size : x-large }
BIG.HUGE { font-size : larger }
BIG.XHUGE { font-size : xx-large }
/* heading styles */
H1 { }
H2 { }
H3 { }
H4 { }
H5 { }
/* mathematics styles */
DIV.displaymath { } /* math displays */
TD.eqno { } /* equation-number cells */
/* document-specific styles come next */

View File

@ -0,0 +1,84 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--Converted with LaTeX2HTML 2008 (1.71)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
<TITLE>Energy calibration wizard manual</TITLE>
<META NAME="description" CONTENT="Energy calibration wizard manual">
<META NAME="keywords" CONTENT="energyCalibrationHowTo">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="energyCalibrationHowTo.css">
<LINK REL="next" HREF="node1.html">
</HEAD>
<BODY >
<!--Navigation Panel-->
<A NAME="tex2html9"
HREF="node1.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up_g.png">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev_g.png">
<BR>
<B> Next:</B> <A NAME="tex2html10"
HREF="node1.html">Introduction</A>
<BR>
<BR>
<!--End of Navigation Panel-->
<P>
<H1 ALIGN="CENTER">Energy calibration wizard manual</H1>
<DIV>
<P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
<P ALIGN="CENTER"><STRONG>March 12, 2018</STRONG></P>
</DIV>
<P>
<BR><HR>
<!--Table of Child-Links-->
<A NAME="CHILD_LINKS"></A>
<UL>
<LI><A NAME="tex2html11"
HREF="node1.html">Introduction</A>
<LI><A NAME="tex2html12"
HREF="node2.html">Data acquisition</A>
<UL>
<LI><A NAME="tex2html13"
HREF="node2.html#SECTION00021000000000000000">Software</A>
</UL>
<BR>
<LI><A NAME="tex2html14"
HREF="node3.html">Data analysis</A>
<UL>
<LI><A NAME="tex2html15"
HREF="node3.html#SECTION00031000000000000000">Software</A>
</UL>
<BR>
<LI><A NAME="tex2html16"
HREF="node4.html">Setup calibration files</A>
<LI><A NAME="tex2html17"
HREF="node5.html">About this document ...</A>
</UL>
<!--End of Table of Child-Links-->
<BR><HR>
<ADDRESS>
Thattil Dhanya
2018-03-12
</ADDRESS>
</BODY>
</HTML>

View File

@ -0,0 +1 @@
\relax

View File

@ -0,0 +1,443 @@
This is pdfTeXk, Version 3.141592-1.40.3 (Web2C 7.5.6) (format=latex 2014.12.17) 12 MAR 2018 15:45
entering extended mode
%&-line parsing enabled.
**./images.tex
(./images.tex
LaTeX2e <2005/12/01>
Babel <v3.8h> and hyphenation patterns for english, usenglishmax, dumylang, noh
yphenation, arabic, basque, bulgarian, coptic, welsh, czech, slovak, german, ng
erman, danish, esperanto, spanish, catalan, galician, estonian, farsi, finnish,
french, greek, monogreek, ancientgreek, croatian, hungarian, interlingua, ibyc
us, indonesian, icelandic, italian, latin, mongolian, dutch, norsk, polish, por
tuguese, pinyin, romanian, russian, slovenian, uppersorbian, serbian, swedish,
turkish, ukenglish, ukrainian, loaded.
(/usr/share/texmf/tex/latex/base/article.cls
Document Class: article 2005/09/16 v1.4f Standard LaTeX document class
(/usr/share/texmf/tex/latex/base/size10.clo
File: size10.clo 2005/09/16 v1.4f Standard LaTeX file (size option)
)
\c@part=\count79
\c@section=\count80
\c@subsection=\count81
\c@subsubsection=\count82
\c@paragraph=\count83
\c@subparagraph=\count84
\c@figure=\count85
\c@table=\count86
\abovecaptionskip=\skip41
\belowcaptionskip=\skip42
\bibindent=\dimen102
) (/usr/share/texmf/tex/latex/base/ifthen.sty
Package: ifthen 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
) (/usr/share/texmf/tex/latex/amsfonts/amssymb.sty
Package: amssymb 2002/01/22 v2.2d
(/usr/share/texmf/tex/latex/amsfonts/amsfonts.sty
Package: amsfonts 2001/10/25 v2.2f
\@emptytoks=\toks14
\symAMSa=\mathgroup4
\symAMSb=\mathgroup5
LaTeX Font Info: Overwriting math alphabet `\mathfrak' in version `bold'
(Font) U/euf/m/n --> U/euf/b/n on input line 132.
)) (/usr/share/texmf/tex/latex/graphics/graphicx.sty
Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
(/usr/share/texmf/tex/latex/graphics/keyval.sty
Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
\KV@toks@=\toks15
) (/usr/share/texmf/tex/latex/graphics/graphics.sty
Package: graphics 2006/02/20 v1.0o Standard LaTeX Graphics (DPC,SPQR)
(/usr/share/texmf/tex/latex/graphics/trig.sty
Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
) (/usr/share/texmf/tex/latex/config/graphics.cfg
File: graphics.cfg 2007/01/18 v1.5 graphics configuration of teTeX/TeXLive
)
Package graphics Info: Driver file: dvips.def on input line 90.
(/usr/share/texmf/tex/latex/graphics/dvips.def
File: dvips.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
))
\Gin@req@height=\dimen103
\Gin@req@width=\dimen104
) (/usr/share/texmf/tex/latex/tools/verbatim.sty
Package: verbatim 2003/08/22 v1.5q LaTeX2e package for verbatim enhancements
\every@verbatim=\toks16
\verbatim@line=\toks17
\verbatim@in@stream=\read1
) (/usr/share/texmf/tex/latex/graphics/color.sty
Package: color 2005/11/14 v1.0j Standard LaTeX Color (DPC)
(/usr/share/texmf/tex/latex/config/color.cfg
File: color.cfg 2007/01/18 v1.5 color configuration of teTeX/TeXLive
)
Package color Info: Driver file: dvips.def on input line 130.
(/usr/share/texmf/tex/latex/graphics/dvipsnam.def
File: dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
)) (/usr/share/texmf/tex/latex/base/inputenc.sty
Package: inputenc 2006/05/05 v1.1b Input encoding file
\inpenc@prehook=\toks18
\inpenc@posthook=\toks19
)
\sizebox=\box26
\lthtmlwrite=\write3
(./images.aux)
\openout1 = `images.aux'.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 116.
LaTeX Font Info: ... okay on input line 116.
latex2htmlLength hsize=349.0pt
latex2htmlLength vsize=633.0pt
latex2htmlLength hoffset=0.0pt
latex2htmlLength voffset=0.0pt
latex2htmlLength topmargin=0.0pt
latex2htmlLength topskip=0.00003pt
latex2htmlLength headheight=0.0pt
latex2htmlLength headsep=0.0pt
latex2htmlLength parskip=0.0pt plus 1.0pt
latex2htmlLength oddsidemargin=62.0pt
latex2htmlLength evensidemargin=62.0pt
LaTeX Font Info: Try loading font information for U+msa on input line 140.
(/usr/share/texmf/tex/latex/amsfonts/umsa.fd
File: umsa.fd 2002/01/19 v2.2g AMS font definitions
)
LaTeX Font Info: Try loading font information for U+msb on input line 140.
(/usr/share/texmf/tex/latex/amsfonts/umsb.fd
File: umsb.fd 2002/01/19 v2.2g AMS font definitions
)
l2hSize :tex2html_wrap_inline464:7.33331pt::7.33331pt::12.3681pt.
[1
]
l2hSize :tex2html_wrap_inline466:7.33331pt::7.33331pt::13.02087pt.
[2
]
l2hSize :tex2html_wrap_inline468:6.83331pt::0.0pt::25.4458pt.
[3
]
l2hSize :tex2html_wrap_inline470:6.83331pt::0.0pt::25.62634pt.
[4
]
l2hSize :tex2html_wrap_inline472:7.33331pt::7.33331pt::14.32782pt.
[5
]
! Undefined control sequence.
l.170 $CS={\begingroupN
_S\endgroup\over N_0}$%
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
misspelled it (e.g., `\hobx'), type `I' and the correct
spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Missing } inserted.
<inserted text>
}
l.170 $CS={\begingroupN_S\endgroup
\over N_0}$%
I've inserted something that you may have forgotten.
(See the <inserted text> above.)
With luck, this will get me unwedged. But if you
really didn't forget anything, try typing `2' now; then
my insertion and my current dilemma will both disappear.
! Missing $ inserted.
<inserted text>
$
l.170 $CS={\begingroupN_S\endgroup
\over N_0}$%
I've inserted something that you may have forgotten.
(See the <inserted text> above.)
With luck, this will get me unwedged. But if you
really didn't forget anything, try typing `2' now; then
my insertion and my current dilemma will both disappear.
! Missing } inserted.
<inserted text>
}
l.170 $CS={\begingroupN_S\endgroup
\over N_0}$%
I've inserted something that you may have forgotten.
(See the <inserted text> above.)
With luck, this will get me unwedged. But if you
really didn't forget anything, try typing `2' now; then
my insertion and my current dilemma will both disappear.
! Missing } inserted.
<inserted text>
}
l.170 $CS={\begingroupN_S\endgroup
\over N_0}$%
I've inserted something that you may have forgotten.
(See the <inserted text> above.)
With luck, this will get me unwedged. But if you
really didn't forget anything, try typing `2' now; then
my insertion and my current dilemma will both disappear.
! Extra \endgroup.
<recently read> \endgroup
l.170 $CS={\begingroupN_S\endgroup
\over N_0}$%
Things are pretty mixed up, but I think the worst is over.
! Missing $ inserted.
<inserted text>
$
l.170 $CS={\begingroupN_S\endgroup\over
N_0}$%
I've inserted a begin-math/end-math symbol since I think
you left one out. Proceed, with fingers crossed.
! Extra }, or forgotten $.
l.170 $CS={\begingroupN_S\endgroup\over N_0}
$%
I've deleted a group-closing symbol because it seems to be
spurious, as in `$x}$'. But perhaps the } is legitimate and
you forgot something else, as in `\hbox{$x}'. In such cases
the way to recover is to insert both the forgotten and the
deleted material, e.g., by typing `I$}'.
! Too many }'s.
\lthtmlinlinemathZ ->\egroup
\expandafter \ifdim \dp \sizebox >0pt \expandaf...
l.171 \lthtmlinlinemathZ
You've closed more groups than you opened.
Such booboos are generally harmless, so keep going.
l2hSize :tex2html_wrap_inline474:0.0pt::0.0pt::0.0pt.
[6
]
! Too many }'s.
l.172 \lthtmlcheckvsize\clearpage}
You've closed more groups than you opened.
Such booboos are generally harmless, so keep going.
l2hSize :tex2html_wrap_inline482:7.33331pt::7.33331pt::13.06606pt.
[7
]
l2hSize :tex2html_wrap_inline486:8.0pt::8.0pt::22.36813pt.
[8
]
l2hSize :tex2html_wrap_inline490:6.83331pt::0.0pt::19.3889pt.
[9
]
l2hSize :tex2html_wrap_inline492:7.33331pt::7.33331pt::11.40282pt.
[10
]
l2hSize :tex2html_wrap_inline494:7.33331pt::7.33331pt::51.00127pt.
[11
]
l2hSize :tex2html_wrap_inline131:7.96227pt::0.0pt::11.90631pt.
[12
]
l2hSize :tex2html_wrap_inline137:6.83331pt::0.0pt::9.05698pt.
[13
]
l2hSize :tex2html_wrap_inline141:8.0pt::8.0pt::46.60414pt.
[14
]
l2hSize :tex2html_wrap_inline143:6.83331pt::0.0pt::9.625pt.
[15
]
l2hSize :tex2html_wrap_inline147:7.33331pt::7.33331pt::13.97807pt.
[16
]
l2hSize :tex2html_wrap_inline149:7.33331pt::7.33331pt::13.66582pt.
[17
]
l2hSize :displaymath17:22.95789pt::0.0pt::349.0pt.
[18
]
l2hSize :tex2html_wrap_inline151:7.33331pt::7.33331pt::11.92157pt.
[19
]
l2hSize :tex2html_wrap_inline153:7.33331pt::7.33331pt::50.08467pt.
[20
]
l2hSize :tex2html_wrap_inline155:6.95831pt::6.95831pt::9.14589pt.
[21
]
l2hSize :tex2html_wrap_inline157:6.83331pt::0.0pt::7.73268pt.
[22
]
l2hSize :displaymath26:22.95789pt::0.0pt::349.0pt.
[23
]
l2hSize :tex2html_wrap_inline165:7.33331pt::7.33331pt::52.6679pt.
[24
]
l2hSize :tex2html_wrap_inline167:6.83331pt::0.0pt::8.40558pt.
[25
]
l2hSize :tex2html_wrap_inline169:6.83331pt::0.0pt::8.36252pt.
[26
]
l2hSize :tex2html_wrap_inline171:7.33331pt::7.33331pt::9.8542pt.
[27
]
l2hSize :displaymath34:13.49998pt::0.0pt::349.0pt.
[28
]
l2hSize :tex2html_wrap_inline175:6.59525pt::0.0pt::3.94516pt.
[29
]
l2hSize :tex2html_wrap_inline177:7.33331pt::7.33331pt::11.45708pt.
[30
]
l2hSize :tex2html_wrap_inline179:7.33331pt::7.33331pt::11.6918pt.
[31
]
l2hSize :tex2html_wrap_inline191:9.38889pt::9.38889pt::42.17287pt.
[32
]
File: fig4.eps Graphic file (type eps)
<fig4.eps>
l2hSize :tex2html_wrap559:338.53587pt::0.0pt::349.0pt.
[33
]
File: fig5.eps Graphic file (type eps)
<fig5.eps>
l2hSize :tex2html_wrap563:338.53587pt::0.0pt::349.0pt.
[34
]
File: fig7.eps Graphic file (type eps)
<fig7.eps>
l2hSize :tex2html_wrap585:347.15315pt::0.0pt::349.0pt.
[35
]
File: fig8.eps Graphic file (type eps)
<fig8.eps>
l2hSize :tex2html_wrap589:338.53587pt::0.0pt::349.0pt.
[36
]
File: GUI_Advanced.eps Graphic file (type eps)
<GUI_Advanced.eps>
l2hSize :tex2html_wrap595:378.81322pt::0.0pt::349.0pt.
[37
]
File: GUI_ThresholdScan.eps Graphic file (type eps)
<GUI_ThresholdScan.eps>
l2hSize :tex2html_wrap599:378.81322pt::0.0pt::349.0pt.
[38
]
File: addEnergy.eps Graphic file (type eps)
<addEnergy.eps>
l2hSize :tex2html_wrap605:436.2459pt::0.0pt::349.0pt.
[39
]
File: calibrateModule.eps Graphic file (type eps)
<calibrateModule.eps>
l2hSize :tex2html_wrap609:436.2459pt::0.0pt::349.0pt.
[40
] (./images.aux) )
Here is how much of TeX's memory you used:
1156 strings out of 256217
14369 string characters out of 1917094
57024 words of memory out of 1500000
4462 multiletter control sequences out of 10000+200000
5339 words of font info for 22 fonts, out of 1200000 for 2000
645 hyphenation exceptions out of 8191
25i,6n,24p,836b,199s stack positions out of 5000i,500n,6000p,200000b,15000s
Output written on images.dvi (40 pages, 9712 bytes).

View File

@ -0,0 +1,252 @@
# LaTeX2HTML 2008 (1.71)
# Associate images original text with physical files.
$key = q/CS=frac{N_S}{N_0};MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="71" HEIGHT="38" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img32.png"
ALT="$CS=\frac{N_S}{N_0}$">|;
$key = q/O;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="17" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img25.png"
ALT="$O$">|;
$key = q/N_gamma;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="25" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img17.png"
ALT="$N_\gamma$">|;
$key = q/E_t;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="22" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img10.png"
ALT="$E_t$">|;
$key = q/includegraphics[width=textwidth]{calibrateModule.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="555" HEIGHT="694" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img40.png"
ALT="\includegraphics[width=\textwidth]{calibrateModule.eps}">|;
$key = q/{displaymath}N_n(E_t)simfrac{T}{tau_s}DBig(frac{-E_t}{ENC}Big).{displaymath};MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="169" HEIGHT="41" BORDER="0"
SRC="|."$dir".q|img23.png"
ALT="\begin{displaymath}
N_n(E_t) \sim \frac{T}{\tau_s} D \Big(\frac{-E_t}{ENC} \Big).
\end{displaymath}">|;
$key = q/tau_s;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="18" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img21.png"
ALT="$\tau_s$">|;
$key = q/V_t;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="19" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img27.png"
ALT="$V_t$">|;
$key = q/ENC;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="44" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img3.png"
ALT="$ENC$">|;
$key = q/includegraphics[width=textwidth]{fig8.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="556" HEIGHT="539" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img36.png"
ALT="\includegraphics[width=\textwidth]{fig8.eps}">|;
$key = q/N_n;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="26" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img16.png"
ALT="$N_n$">|;
$key = q/T;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="16" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img22.png"
ALT="$T$">|;
$key = q/E_0;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="23" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img1.png"
ALT="$E_0$">|;
$key = q/G;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="17" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img26.png"
ALT="$G$">|;
$key = q/{displaymath}N_gamma(E_t)=frac{N_0}{2}cdotBig(1+C_sfrac{E_0-2E_t}{E_0}Big)DBig(frac{E_0-E_t}{ENC}Big),{displaymath};MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="335" HEIGHT="41" BORDER="0"
SRC="|."$dir".q|img18.png"
ALT="\begin{displaymath}
N_\gamma(E_t)=\frac{N_0}{2}\cdot\Big(1+C_s \frac{E_0-2E_t}{E_0}\Big)D \Big(\frac{E_0-E_t}{ENC} \Big),
\end{displaymath}">|;
$key = q/includegraphics[width=textwidth]{GUI_ThresholdScan.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="555" HEIGHT="603" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img38.png"
ALT="\includegraphics[width=\textwidth]{GUI_ThresholdScan.eps}">|;
$key = q/N_0;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="24" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img2.png"
ALT="$N_0$">|;
$key = q/N_S;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="27" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img5.png"
ALT="$N_S$">|;
$key = q/O_i;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="22" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img30.png"
ALT="$O_i$">|;
$key = q/E_f;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="25" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img7.png"
ALT="$E_f$">|;
$key = q/i;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="10" HEIGHT="17" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img29.png"
ALT="$i$">|;
$key = q/G_i;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="22" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img31.png"
ALT="$G_i$">|;
$key = q/includegraphics[width=textwidth]{fig7.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="556" HEIGHT="553" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img35.png"
ALT="\includegraphics[width=\textwidth]{fig7.eps}">|;
$key = q/D;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="18" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img13.png"
ALT="$D$">|;
$key = q/N_s=C_sN_0;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="83" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img20.png"
ALT="$N_s=C_s N_0$">|;
$key = q/E_0slash2;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="39" HEIGHT="32" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img8.png"
ALT="$E_0/2$">|;
$key = q/E_t=E_0slash2;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="78" HEIGHT="32" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img14.png"
ALT="$E_t=E_0/2$">|;
$key = q/includegraphics[width=textwidth]{fig4.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="556" HEIGHT="539" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img33.png"
ALT="\includegraphics[width=\textwidth]{fig4.eps}">|;
$key = q/includegraphics[width=textwidth]{GUI_Advanced.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="555" HEIGHT="603" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img37.png"
ALT="\includegraphics[width=\textwidth]{GUI_Advanced.eps}">|;
$key = q/includegraphics[width=textwidth]{addEnergy.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="555" HEIGHT="694" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img39.png"
ALT="\includegraphics[width=\textwidth]{addEnergy.eps}">|;
$key = q/C_s;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="23" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img19.png"
ALT="$C_s$">|;
$key = q/CS={begingroup{N_Sbegingroup{overN_0};MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="24" HEIGHT="11" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img6.png"
ALT="$CS={\begingroupN_S\endgroup\over N_0}$">|;
$key = q/CS=;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="45" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img4.png"
ALT="$CS=$">|;
$key = q/e^-;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="23" HEIGHT="19" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img12.png"
ALT="$e^-$">|;
$key = q/includegraphics[width=textwidth]{fig5.eps};AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="556" HEIGHT="539" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img34.png"
ALT="\includegraphics[width=\textwidth]{fig5.eps}">|;
$key = q/{displaymath}V_{t}=O+GcdotE_t.{displaymath};MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="111" HEIGHT="26" BORDER="0"
SRC="|."$dir".q|img28.png"
ALT="\begin{displaymath}
V_{t}=O+G \cdot E_t.
\end{displaymath}">|;
$key = q/Sigma>3ENC;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="85" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img11.png"
ALT="$\Sigma &gt;3ENC$">|;
$key = q/N;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="19" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img15.png"
ALT="$N$">|;
$key = q/Sigma>3,ENC;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="88" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
SRC="|."$dir".q|img24.png"
ALT="$\Sigma&gt;3 ENC$">|;
$key = q/Deltasim;MSF=1.6;AAT/;
$cached_env_img{$key} = q|<IMG
WIDTH="35" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
SRC="|."$dir".q|img9.png"
ALT="$\Delta \sim $">|;
1;

View File

@ -0,0 +1,391 @@
\batchmode
\documentclass{article}
\RequirePackage{ifthen}
\usepackage{amssymb}
\usepackage[dvips]{graphicx}
\usepackage{verbatim}
\usepackage[dvips]{color}
\pagecolor[gray]{.7}
\usepackage[]{inputenc}
\makeatletter
\makeatletter
\count@=\the\catcode`\_ \catcode`\_=8
\newenvironment{tex2html_wrap}{}{}%
\catcode`\<=12\catcode`\_=\count@
\newcommand{\providedcommand}[1]{\expandafter\providecommand\csname #1\endcsname}%
\newcommand{\renewedcommand}[1]{\expandafter\providecommand\csname #1\endcsname{}%
\expandafter\renewcommand\csname #1\endcsname}%
\newcommand{\newedenvironment}[1]{\newenvironment{#1}{}{}\renewenvironment{#1}}%
\let\newedcommand\renewedcommand
\let\renewedenvironment\newedenvironment
\makeatother
\let\mathon=$
\let\mathoff=$
\ifx\AtBeginDocument\undefined \newcommand{\AtBeginDocument}[1]{}\fi
\newbox\sizebox
\setlength{\hoffset}{0pt}\setlength{\voffset}{0pt}
\addtolength{\textheight}{\footskip}\setlength{\footskip}{0pt}
\addtolength{\textheight}{\topmargin}\setlength{\topmargin}{0pt}
\addtolength{\textheight}{\headheight}\setlength{\headheight}{0pt}
\addtolength{\textheight}{\headsep}\setlength{\headsep}{0pt}
\setlength{\textwidth}{349pt}
\newwrite\lthtmlwrite
\makeatletter
\let\realnormalsize=\normalsize
\global\topskip=2sp
\def\preveqno{}\let\real@float=\@float \let\realend@float=\end@float
\def\@float{\let\@savefreelist\@freelist\real@float}
\def\liih@math{\ifmmode$\else\bad@math\fi}
\def\end@float{\realend@float\global\let\@freelist\@savefreelist}
\let\real@dbflt=\@dbflt \let\end@dblfloat=\end@float
\let\@largefloatcheck=\relax
\let\if@boxedmulticols=\iftrue
\def\@dbflt{\let\@savefreelist\@freelist\real@dbflt}
\def\adjustnormalsize{\def\normalsize{\mathsurround=0pt \realnormalsize
\parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}%
\def\phantompar{\csname par\endcsname}\normalsize}%
\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}%
\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }%
\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }%
\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup %
\let\ifinner=\iffalse \let\)\liih@math }%
\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}%
\expandafter\box\next\egroup}%
\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}%
\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox
\ifdim\dimen0>.95\vsize
\lthtmltypeout{%
*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}%
\ht\sizebox.95\vsize \dp\sizebox\z@ \fi
\lthtmltypeout{l2hSize %
:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}%
\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist
\lthtmlmathtype{#1}\lthtmlvboxmathA}%
\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}%
\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup
\let\@savefreelist\@freelist \lthtmlhboxmathB}%
\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}%
\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox
\global\let\@freelist\@savefreelist}%
\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}%
\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}%
\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}%
\lthtmldisplayA{#1}\let\@eqnnum\relax}%
\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}%
\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB}
\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA
\vrule height1.5ex width0pt }%
\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}%
\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}%
\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
\expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline}
\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
\expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath}
\newcommand\lthtmlindisplaymathZ{\egroup %
\centerinlinemath\lthtmllogmath\lthtmlsetmath}
\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{%
\kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi
\ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{%
\kern.1em\kern0.8 pt\hbox{\hglue.17em\copy\sizebox\hglue0.8 pt}}\kern.3pt%
\ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.8 pt%
\ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
\def\centerinlinemath{%
\dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi
\advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1
\dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax}
\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize
\ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill
\else\expandafter\vss\fi}%
\providecommand{\selectlanguage}[1]{}%
\makeatletter \tracingstats = 1
\begin{document}
\pagestyle{empty}\thispagestyle{empty}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength hsize=\the\hsize}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength vsize=\the\vsize}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength hoffset=\the\hoffset}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength voffset=\the\voffset}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength topmargin=\the\topmargin}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength topskip=\the\topskip}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength headheight=\the\headheight}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength headsep=\the\headsep}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength parskip=\the\parskip}\lthtmltypeout{}%
\lthtmltypeout{latex2htmlLength oddsidemargin=\the\oddsidemargin}\lthtmltypeout{}%
\makeatletter
\if@twoside\lthtmltypeout{latex2htmlLength evensidemargin=\the\evensidemargin}%
\else\lthtmltypeout{latex2htmlLength evensidemargin=\the\oddsidemargin}\fi%
\lthtmltypeout{}%
\makeatother
\setcounter{page}{1}
\onecolumn
% !!! IMAGES START HERE !!!
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline464}%
$E_0$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline466}%
$N_0$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline468}%
$ENC$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline470}%
$CS=$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline472}%
$N_S$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline474}%
$CS={\begingroupN_S\endgroup\over N_0}$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline482}%
$E_f$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline486}%
$E_0/2$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline490}%
$\Delta \sim $%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline492}%
$E_t$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline494}%
$\Sigma >3ENC$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
\stepcounter{section}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline131}%
$e^-$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline137}%
$D$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline141}%
$E_t=E_0/2$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline143}%
$N$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline147}%
$N_n$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline149}%
$N_\gamma$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmldisplayA{displaymath17}%
\begin{displaymath}
N_\gamma(E_t)=\frac{N_0}{2}\cdot\Big(1+C_s \frac{E_0-2E_t}{E_0}\Big)D \Big(\frac{E_0-E_t}{ENC} \Big),
\end{displaymath}%
\lthtmldisplayZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline151}%
$C_s$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline153}%
$N_s=C_s N_0$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline155}%
$\tau_s$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline157}%
$T$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmldisplayA{displaymath26}%
\begin{displaymath}
N_n(E_t) \sim \frac{T}{\tau_s} D \Big(\frac{-E_t}{ENC} \Big).
\end{displaymath}%
\lthtmldisplayZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline165}%
$\Sigma>3\,ENC$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline167}%
$O$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline169}%
$G$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline171}%
$V_t$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmldisplayA{displaymath34}%
\begin{displaymath}
V_{t}=O+G \cdot E_t.
\end{displaymath}%
\lthtmldisplayZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline175}%
$i$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline177}%
$O_i$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline179}%
$G_i$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline191}%
$CS=\frac{N_S}{N_0}$%
\lthtmlinlinemathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap559}%
\includegraphics[width=\textwidth]{fig4.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap563}%
\includegraphics[width=\textwidth]{fig5.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap585}%
\includegraphics[width=\textwidth]{fig7.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap589}%
\includegraphics[width=\textwidth]{fig8.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
\stepcounter{section}
\stepcounter{subsection}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap595}%
\includegraphics[width=\textwidth]{GUI_Advanced.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap599}%
\includegraphics[width=\textwidth]{GUI_ThresholdScan.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
\stepcounter{section}
\stepcounter{subsection}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap605}%
\includegraphics[width=\textwidth]{addEnergy.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlpictureA{tex2html_wrap609}%
\includegraphics[width=\textwidth]{calibrateModule.eps}%
\lthtmlpictureZ
\lthtmlcheckvsize\clearpage}
\stepcounter{section}
\end{document}

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 259 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 263 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 262 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 468 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 B

View File

@ -0,0 +1,84 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--Converted with LaTeX2HTML 2008 (1.71)
original version by: Nikos Drakos, CBLU, University of Leeds
* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
* with significant contributions from:
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
<TITLE>Energy calibration wizard manual</TITLE>
<META NAME="description" CONTENT="Energy calibration wizard manual">
<META NAME="keywords" CONTENT="energyCalibrationHowTo">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="energyCalibrationHowTo.css">
<LINK REL="next" HREF="node1.html">
</HEAD>
<BODY >
<!--Navigation Panel-->
<A NAME="tex2html9"
HREF="node1.html">
<IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next"
SRC="file:/usr/share/latex2html/icons/next.png"></A>
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
SRC="file:/usr/share/latex2html/icons/up_g.png">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
SRC="file:/usr/share/latex2html/icons/prev_g.png">
<BR>
<B> Next:</B> <A NAME="tex2html10"
HREF="node1.html">Introduction</A>
<BR>
<BR>
<!--End of Navigation Panel-->
<P>
<H1 ALIGN="CENTER">Energy calibration wizard manual</H1>
<DIV>
<P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
<P ALIGN="CENTER"><STRONG>March 12, 2018</STRONG></P>
</DIV>
<P>
<BR><HR>
<!--Table of Child-Links-->
<A NAME="CHILD_LINKS"></A>
<UL>
<LI><A NAME="tex2html11"
HREF="node1.html">Introduction</A>
<LI><A NAME="tex2html12"
HREF="node2.html">Data acquisition</A>
<UL>
<LI><A NAME="tex2html13"
HREF="node2.html#SECTION00021000000000000000">Software</A>
</UL>
<BR>
<LI><A NAME="tex2html14"
HREF="node3.html">Data analysis</A>
<UL>
<LI><A NAME="tex2html15"
HREF="node3.html#SECTION00031000000000000000">Software</A>
</UL>
<BR>
<LI><A NAME="tex2html16"
HREF="node4.html">Setup calibration files</A>
<LI><A NAME="tex2html17"
HREF="node5.html">About this document ...</A>
</UL>
<!--End of Table of Child-Links-->
<BR><HR>
<ADDRESS>
Thattil Dhanya
2018-03-12
</ADDRESS>
</BODY>
</HTML>

View File

@ -0,0 +1,50 @@
# LaTeX2HTML 2008 (1.71)
# Associate internals original text with physical files.
$key = q/fig:modulecalibration/;
$ref_files{$key} = "$dir".q|node1.html|;
$noresave{$key} = "$nosave";
$key = q/eq:encal/;
$ref_files{$key} = "$dir".q|node1.html|;
$noresave{$key} = "$nosave";
$key = q/fig:guithrscan/;
$ref_files{$key} = "$dir".q|node2.html|;
$noresave{$key} = "$nosave";
$key = q/fig:thrscanfluo/;
$ref_files{$key} = "$dir".q|node1.html|;
$noresave{$key} = "$nosave";
$key = q/eq:noisescan/;
$ref_files{$key} = "$dir".q|node1.html|;
$noresave{$key} = "$nosave";
$key = q/eq:thrscan/;
$ref_files{$key} = "$dir".q|node1.html|;
$noresave{$key} = "$nosave";
$key = q/fig:calibratemodule/;
$ref_files{$key} = "$dir".q|node3.html|;
$noresave{$key} = "$nosave";
$key = q/fig:guiencallog/;
$ref_files{$key} = "$dir".q|node2.html|;
$noresave{$key} = "$nosave";
$key = q/fig:addenergy/;
$ref_files{$key} = "$dir".q|node3.html|;
$noresave{$key} = "$nosave";
$key = q/fig:thrscanexpl/;
$ref_files{$key} = "$dir".q|node1.html|;
$noresave{$key} = "$nosave";
$key = q/fig:expthrscan/;
$ref_files{$key} = "$dir".q|node1.html|;
$noresave{$key} = "$nosave";
1;

Some files were not shown because too many files have changed in this diff Show More