Compare commits
1521 Commits
Author | SHA1 | Date | |
---|---|---|---|
c8cdbfc488 | |||
2f75143245 | |||
6f7c31b747 | |||
75c2d987c4 | |||
726f5eba29 | |||
4404ee717a | |||
54530ab103 | |||
6126780660 | |||
9b7f9b1be1 | |||
26c829d766 | |||
3fde5c5b55 | |||
3e5f546ebe | |||
08ecc1e52d | |||
8c1974b34e | |||
d89d349247 | |||
910961cf41 | |||
595b7aa5e8 | |||
f72ad4326f | |||
2306e44ae3 | |||
f36a12e454 | |||
5698da5f95 | |||
7300d73675 | |||
d4b467a641 | |||
7b71076180 | |||
9197d2b209 | |||
e094e41d89 | |||
512e1a3136 | |||
6d04c14bd6 | |||
64183d8d6a | |||
eb89d12f41 | |||
c477970cf0 | |||
03ae32dcf3 | |||
5a394c080f | |||
e631414526 | |||
d2bce7e372 | |||
f9b95b63eb | |||
c2db073d5e | |||
970d448e73 | |||
b236c14a66 | |||
80c0d4e10e | |||
46db575cc4 | |||
6f0c505c01 | |||
06d698166f | |||
5a139d70b5 | |||
33d1b11279 | |||
b163180d6f | |||
cab9dff225 | |||
7d8188fc11 | |||
64229ca32b | |||
4aa0d26f26 | |||
9f84bf7175 | |||
235002cdd4 | |||
c784f0f539 | |||
961489edb1 | |||
255931bbde | |||
781152a772 | |||
59cb9c84c2 | |||
d67b4765ea | |||
14c899e7cf | |||
b3d4e90f7f | |||
cedd275892 | |||
588037fd18 | |||
1700d9884a | |||
e0b8fb3609 | |||
b7f62fcd47 | |||
5b6ec303d7 | |||
cea6c30ded | |||
0781344117 | |||
63c130a380 | |||
7945d15beb | |||
287efde54a | |||
faa25b9e9f | |||
4e446f1f39 | |||
1b92b01a46 | |||
2a28333a96 | |||
4849063b6c | |||
830f92dedc | |||
87e8333dfd | |||
b3ccd5e1a1 | |||
f0ac49190a | |||
fa175ac934 | |||
0018fa46f8 | |||
c934e92a41 | |||
da4253fe13 | |||
3cab1bc0fe | |||
d74a8368b8 | |||
39ebd81230 | |||
823c855ef4 | |||
7fadf4feb4 | |||
f86578cfc3 | |||
a0512a01d5 | |||
bdd37fa7c2 | |||
a96a019435 | |||
dd3f4aa81d | |||
1102153d2b | |||
ab7e63c20f | |||
f1333c7a90 | |||
e77cdb35dd | |||
52b1e98726 | |||
df75fef6f6 | |||
44fdc46c11 | |||
147194e8af | |||
5cd020ae81 | |||
160fabe02c | |||
05055eb283 | |||
0dc1e10bd3 | |||
e38e500e16 | |||
134f13fc52 | |||
41fb6c26a2 | |||
90dd8e70e5 | |||
08e121c71f | |||
73fcef5f6d | |||
cb3b337a99 | |||
e9cc91698e | |||
6213b5e07a | |||
5d9a952316 | |||
8cc05c5848 | |||
08aacf76ac | |||
711e0d771e | |||
d69d69e892 | |||
07a120fc4a | |||
2fc98c7a54 | |||
3b6ead7783 | |||
11e8796847 | |||
40c96b5562 | |||
6bb7195a2c | |||
f79b009978 | |||
3259bfb008 | |||
934bc5b9db | |||
53423a42ac | |||
c2b1eef75c | |||
f5a86bbfe1 | |||
9af0ec74b6 | |||
45de361b22 | |||
260f237990 | |||
37dd5fb902 | |||
ecd0c810ca | |||
7c29327b47 | |||
c366e94a96 | |||
ca8cb33569 | |||
7db6b7bca8 | |||
7e16f3ebeb | |||
233c145791 | |||
d7cc9fc023 | |||
ed1135566a | |||
3595c586d4 | |||
11de3dfde2 | |||
14d227f8db | |||
6d11faed87 | |||
35fc52dae7 | |||
144bd7124b | |||
f6660c0dac | |||
73ac8bab38 | |||
d76568d6d9 | |||
72f47b2375 | |||
3114512c3f | |||
95254619c6 | |||
a0016cb005 | |||
0b140111b3 | |||
d7831f6c64 | |||
a97b725f43 | |||
69c71e48f6 | |||
54fc63dd55 | |||
5e9871720b | |||
55517e6d4c | |||
2853f97fe7 | |||
fc0f8ef9da | |||
99bf6446fe | |||
283dfa2b05 | |||
5316fed5d4 | |||
dda013a85b | |||
2eecf43fbb | |||
eba0fa277d | |||
e6e3561dcb | |||
e599bfe56f | |||
764becc271 | |||
7462d1002d | |||
b294b3e8b1 | |||
025e7b8f44 | |||
aa25d86310 | |||
a7551cca4e | |||
8e79f9094a | |||
2dece5c635 | |||
24db58e615 | |||
bab7d8e3fb | |||
2339fb2a0e | |||
378392c0f5 | |||
fcde40b854 | |||
ceed0eaa9b | |||
e3088d822f | |||
27ebd9c713 | |||
f33b3cdc79 | |||
b0ea458d3a | |||
7e2f2cd31b | |||
6cf7bf2e06 | |||
fc7ae98eee | |||
542dda8ece | |||
0f6cb4dc41 | |||
ecc970bc73 | |||
15aaa93130 | |||
34b659fa15 | |||
cf8b0de433 | |||
32c1a45e11 | |||
da1b6ad62d | |||
49d6dcb6e2 | |||
22ef1cee8b | |||
9d3fdaaadc | |||
06f84585af | |||
a970bacbe5 | |||
5be2979fff | |||
4765849613 | |||
05ed8dca4e | |||
4f600f3129 | |||
4b72d685f3 | |||
bbd7e7906a | |||
f735baf9d7 | |||
ad14381ab4 | |||
7702865409 | |||
2f8c1b453e | |||
883317dd28 | |||
8ed67119b9 | |||
f45e2b4ab9 | |||
abdf4b1ada | |||
228d624d8f | |||
e0c9805ee8 | |||
4eef81fbe9 | |||
301600e720 | |||
4d4e4a4ce7 | |||
ad3ac2cdee | |||
b10abd07ee | |||
e65b416215 | |||
24df69d57f | |||
183c306166 | |||
1dfdcfcb7e | |||
212218396a | |||
b78b8425fd | |||
12832a3a96 | |||
621b7cfb2a | |||
a67d9e60da | |||
d71008bd10 | |||
a154d0a088 | |||
c5262458d5 | |||
cb635d800a | |||
0ed82d4ef7 | |||
bdf9373e0d | |||
3f61206289 | |||
e19a27bf62 | |||
a1831c38ed | |||
c4b8c6385f | |||
f393751771 | |||
94ce042401 | |||
49b8024c43 | |||
8b39443197 | |||
dcce66ee9f | |||
563b1bb8b7 | |||
b4d9a6a09d | |||
51fd9ed423 | |||
23d73ae5ae | |||
8986b008dd | |||
30f1e6ad3f | |||
02cc284422 | |||
e6c0304af1 | |||
16fe4d305e | |||
68e9648854 | |||
0417a7e97d | |||
6653cc9cb1 | |||
a37bbc50fe | |||
5b01b4cbd8 | |||
d3a0319863 | |||
fdd19bc316 | |||
1152555663 | |||
9ae1289616 | |||
3baa677a2e | |||
516336963e | |||
99281e2690 | |||
501d2478a5 | |||
08b6eb78c5 | |||
d096a5efeb | |||
9f24bb0a98 | |||
173d8f740e | |||
16428f3828 | |||
1247f760f2 | |||
11475316fd | |||
a09c2e38a3 | |||
1c49fbb090 | |||
b5909044f6 | |||
62a88dadba | |||
e0bb7d74f4 | |||
d09a1a0a95 | |||
d38108e527 | |||
c9675d111a | |||
8f9c657fa0 | |||
c35203ebfb | |||
1069bf5979 | |||
cac913831c | |||
03e781a0ac | |||
a5a3d4bc78 | |||
bc70cc3a26 | |||
e024774323 | |||
bdcccb7732 | |||
5ff2e86060 | |||
70e193b0fd | |||
c3a9d3c342 | |||
d3c807975f | |||
1c5250ea7f | |||
7cb3b3f8de | |||
7cd35f24b8 | |||
28af3c2642 | |||
2bd8e6c166 | |||
ccdc7d22e9 | |||
3831896a78 | |||
9847729f3c | |||
0eff9e1401 | |||
4323a837ef | |||
649cb0aed9 | |||
8cf6e0cbd6 | |||
753290b228 | |||
d28f293485 | |||
da010a03d7 | |||
72b71f3fcd | |||
e4868671ae | |||
61897cbd41 | |||
9e8d3e598f | |||
252e924f92 | |||
fe2ba8621b | |||
b8bdbf4da6 | |||
5340b8ef24 | |||
807189a492 | |||
593f5b6c65 | |||
b029f1fa26 | |||
14546247e4 | |||
a74e8f68f7 | |||
a1936cb884 | |||
a36b715eab | |||
17c20748bc | |||
d5f8a1b4e7 | |||
70ce8c1653 | |||
5203a0d621 | |||
59ad15b54e | |||
afac5be3c3 | |||
688dd15fe9 | |||
98752e1cdb | |||
d59f419370 | |||
9ba3fb9279 | |||
50111bcea7 | |||
ab06c33107 | |||
10209b75df | |||
40210ae26f | |||
dd6301d66d | |||
b58c3e8951 | |||
85aa47b835 | |||
da9b0bdc0b | |||
258de4947a | |||
9197ab6e4b | |||
6c1c203782 | |||
721d2a30f2 | |||
72970c9669 | |||
b389402d64 | |||
0d2dd93498 | |||
fee6465213 | |||
8b02aa9e91 | |||
339956e5de | |||
deb59530ab | |||
ec5e779225 | |||
3878212ffd | |||
7649865a8f | |||
06cdf8ad92 | |||
28101bed22 | |||
1f6c289fd4 | |||
675d69392a | |||
61e7c0148f | |||
12e4530702 | |||
64c18469bd | |||
aa2c535b4f | |||
5849725b97 | |||
74f327a959 | |||
f67323d1cc | |||
de3bfd85a1 | |||
ac9d9f6a93 | |||
cef9ae39c3 | |||
d14234ee38 | |||
a4aa862ee4 | |||
0b017b886c | |||
7859df6aa3 | |||
ebe1ff4563 | |||
c3d6852f97 | |||
bacc4073f7 | |||
50b515f94d | |||
1e479a5c77 | |||
9322c176f2 | |||
639fdac232 | |||
7364f674ed | |||
a536f8ac9b | |||
76bd2c69bc | |||
77aa3fa215 | |||
bc6fc51f6a | |||
9fe7293dab | |||
3e417fdaa7 | |||
f8c90b6da6 | |||
b6e5fa1944 | |||
daff1c9a09 | |||
c7b345237a | |||
a12694b5d0 | |||
40ce08d33e | |||
19e77bf303 | |||
f95b9e8d8d | |||
9371208a2e | |||
472d96cd94 | |||
d48ca4a9fe | |||
1609f1d495 | |||
7a6b6e1fea | |||
1b6ca913b2 | |||
18c2b8d725 | |||
a29e70c52f | |||
98010057ce | |||
14eff53798 | |||
2cf150bb30 | |||
d2a2a2729e | |||
298663f143 | |||
5c23fd6502 | |||
2429af754f | |||
ef574e6620 | |||
0dd0486aa5 | |||
7196bfb9a5 | |||
459b588b9f | |||
8bf03a7712 | |||
4338217bda | |||
895f8ccf81 | |||
0cb5941fc4 | |||
f7bf1ae2f1 | |||
dde032acc8 | |||
23c5a73285 | |||
a654febb7e | |||
94b61ea2c4 | |||
aa190fda7a | |||
a6b917851c | |||
5198e67dbd | |||
897cbac27d | |||
ecf1e9fac1 | |||
618f6291cf | |||
3da6a6df65 | |||
e6bd874a88 | |||
5d04067973 | |||
c520f10409 | |||
1872deb1dd | |||
e6f475d7c4 | |||
aebc423fb2 | |||
08fda2b662 | |||
6af3a6d33a | |||
b11b2dcfa9 | |||
ee9996908a | |||
caf2548391 | |||
8778fa0aca | |||
3782a56ef2 | |||
e95b444908 | |||
d1ef6bf94b | |||
d15fd90e8d | |||
633284cbdd | |||
a3293f4335 | |||
3d0d86eb19 | |||
915e0d19ca | |||
44b8f482f0 | |||
e32a5263e8 | |||
e8d0bea1a0 | |||
1ecc194bf8 | |||
fbb8efa5f4 | |||
b78b2bb678 | |||
d9116ec0b9 | |||
b6f6122656 | |||
80c301f88e | |||
2feaa27c74 | |||
b398322fd2 | |||
66e0049ded | |||
7d48c2f8ee | |||
988baca7f6 | |||
afd2cd1923 | |||
2963d5c401 | |||
2f59d58a50 | |||
ca059db4e9 | |||
43a1d73522 | |||
87d539a040 | |||
3edac42ed3 | |||
17d26869b5 | |||
933d34590b | |||
eb57e3a1d3 | |||
2cc5557ec8 | |||
7f80b77060 | |||
ab4f364267 | |||
3a18a0a6cf | |||
fd03cf5b0f | |||
b3d6bc1800 | |||
0242db7e7a | |||
3aeb3f58d1 | |||
09a707d7ff | |||
41240ac135 | |||
f264691dc1 | |||
3854c82b90 | |||
92b4b3324e | |||
ac536ebdf7 | |||
061abf7be0 | |||
2d6e4c95a2 | |||
a87687199f | |||
d879379aa4 | |||
8fc3d97e78 | |||
beabd03be2 | |||
348a426242 | |||
68d6c514a9 | |||
834794ad98 | |||
59c0861131 | |||
6690335971 | |||
bc8c706150 | |||
e39bee0113 | |||
a4dc00b252 | |||
6438238b55 | |||
31589ce352 | |||
7602ffc5ac | |||
13078d0ef2 | |||
9f3468bd15 | |||
b50c1d966a | |||
65a91c519e | |||
0649626842 | |||
5958cf9278 | |||
e7f7e0f280 | |||
735b8ea206 | |||
56c504abbb | |||
4d6346e678 | |||
dc7e448759 | |||
f6e1c21137 | |||
8da5b8318f | |||
d2319459df | |||
03de29de90 | |||
d6bdbf8524 | |||
bb3e5351b4 | |||
4c0a16cd75 | |||
d6a4f83a99 | |||
e39d0aee56 | |||
29d66e455d | |||
1e849097ea | |||
e19d564364 | |||
7577d03e75 | |||
8c123982d2 | |||
6e876d79ee | |||
40a7b3983a | |||
4718378d0a | |||
24c305ec59 | |||
bf9905ad2a | |||
c4a242e10a | |||
1bf7b4a6a1 | |||
2f3dc8d109 | |||
7436d6c8d3 | |||
7e932bf84b | |||
b498043ea6 | |||
98e09b29d5 | |||
7aaf95a565 | |||
a51f4f1252 | |||
7b1f935da2 | |||
2d14da545d | |||
ce1ec97571 | |||
9150556209 | |||
3b684c4662 | |||
d00c837977 | |||
0ef52138e1 | |||
28211af5af | |||
536203b6dc | |||
65b4c69847 | |||
2ae5a959fe | |||
263d702535 | |||
7512f818cb | |||
25023f6971 | |||
61791c078c | |||
36802cdb14 | |||
e26cf3b673 | |||
aab62fccc1 | |||
73ce4abd58 | |||
c12b137b79 | |||
befdcf7f36 | |||
02f5c472a8 | |||
75ed2cd2e4 | |||
3be045f9b6 | |||
8fae982802 | |||
128ec88b5f | |||
d5fc158330 | |||
864e6e4c81 | |||
343d96ff16 | |||
9f152ce1f3 | |||
d1e3d50a87 | |||
a06f29f473 | |||
12348ac76c | |||
18422ce215 | |||
0e26734023 | |||
fd64ba289e | |||
e9343a5bd0 | |||
6f3898441e | |||
5b88203bd9 | |||
385e6714cc | |||
70bf6eb4cb | |||
ca855e6d39 | |||
2227265357 | |||
baee38802b | |||
1edb41242c | |||
397344a264 | |||
712c9a4524 | |||
e17e4c3171 | |||
b75985088d | |||
8bba57e77d | |||
7c1423d654 | |||
8388d1f503 | |||
6a41b5ce3a | |||
1c606df752 | |||
1e85482d09 | |||
a89847538d | |||
130f3d2e6f | |||
a351fa8f28 | |||
4825ace129 | |||
57fc89a6bb | |||
ba71529ff2 | |||
f49998ccd9 | |||
1fce54ec4b | |||
41f24489bc | |||
addf964901 | |||
bca7c649d7 | |||
1dd300f713 | |||
d5c310a2db | |||
747e9af431 | |||
9f91b78696 | |||
620f7651a0 | |||
d1eab6f750 | |||
4466213882 | |||
ca19993149 | |||
e29371ca8d | |||
c0a114345b | |||
386ef7766c | |||
375b1c9485 | |||
3439ccbec9 | |||
a0c9018455 | |||
f0431bd873 | |||
65d7922286 | |||
eb89e9bf96 | |||
9f733c1dfb | |||
59b5fe9424 | |||
16e4fbf8dd | |||
d40a2e0efa | |||
ab5229bcbf | |||
5eb8402742 | |||
585661412c | |||
dc5384f0f9 | |||
935fecefde | |||
20dc338c90 | |||
2c276db579 | |||
b14ea217ee | |||
da3ca9f306 | |||
a57e8edd88 | |||
ad64df01c7 | |||
8538604c0f | |||
d23c9d52ed | |||
2ac170db98 | |||
ab93835ce2 | |||
3b292bdeb6 | |||
43140811bd | |||
34908edd6a | |||
856ad76247 | |||
29f3387d73 | |||
4749e8c4e4 | |||
a1d325a115 | |||
3034cf87d0 | |||
447451231c | |||
0b45d73e0c | |||
7860637b46 | |||
c0bfe46aa1 | |||
26829585dc | |||
ea3c722552 | |||
c0a1f83691 | |||
4ecbfada5b | |||
d47abb140f | |||
fb3c903c04 | |||
6753f8ba6c | |||
db6947cc9c | |||
590fac9e07 | |||
400585be6a | |||
dcfa6fb100 | |||
39a20e1616 | |||
114c45c04a | |||
4159e83fd6 | |||
3a26c95c0d | |||
8c45f94496 | |||
f2f00fec06 | |||
e023cb186f | |||
7f58b77dfb | |||
fd4dd5b1e9 | |||
5d34358f44 | |||
8328b30cbd | |||
9c55cb4974 | |||
a0ad1fb3a3 | |||
2067f47f34 | |||
167a6cff3e | |||
d00df32e49 | |||
2cc11f1ff0 | |||
49ba893d7e | |||
46aeee00f1 | |||
5f0575236e | |||
45e0cf71eb | |||
bd228fac27 | |||
b7ca7f5319 | |||
11c9ab16f9 | |||
d1d530f0e7 | |||
e6d22a97e2 | |||
a0c014eb7d | |||
99037449f4 | |||
97260510f2 | |||
662f502d4c | |||
c5c23e73d5 | |||
70e4c6e2a2 | |||
23b415d837 | |||
428855d801 | |||
2e234f1bbd | |||
a79864a5ae | |||
1dee950870 | |||
51499fa503 | |||
dcf4d98a75 | |||
28e2ebf75a | |||
823d537825 | |||
d7137e0c75 | |||
2569ffbf10 | |||
b020270734 | |||
f647bdaa48 | |||
c1e735c1b4 | |||
4097c37b31 | |||
a89265faf8 | |||
8e0414d1b9 | |||
bbcf75bc09 | |||
065b4a8e0f | |||
2fca426ec0 | |||
bf89dd44f3 | |||
d9fcac0236 | |||
875ca44c0b | |||
4c9cc1b477 | |||
f340eef4bc | |||
f192164e32 | |||
c69ae52e76 | |||
7dee07b9c5 | |||
0e8d2de253 | |||
fd34bab34b | |||
2b0d07387a | |||
eb4ab306c7 | |||
32d32dbcdc | |||
7f256c868b | |||
06b9efd229 | |||
9ad0fd0bc9 | |||
7c9958db04 | |||
956625bb50 | |||
6d6133be59 | |||
bee751cebb | |||
fee95d228e | |||
ea0c436fc8 | |||
90fb8258ca | |||
dd1cf42a73 | |||
dda86cfe9b | |||
4f74f6d08f | |||
a3a30d9b50 | |||
2d962dfead | |||
b814515d0a | |||
db2fef5d69 | |||
0ae706d9a5 | |||
6693d08331 | |||
cf4498cf78 | |||
4903164f95 | |||
c127eebeaa | |||
ef257d12e7 | |||
363aa9124e | |||
7e0af1cc7c | |||
8872f86e31 | |||
52a9303a5e | |||
409519a3db | |||
4c4a26c0e3 | |||
70848c9891 | |||
e33ba2cd76 | |||
dedc00f1bd | |||
1af065fdb1 | |||
678ef89e17 | |||
dc70c45ef2 | |||
c0ec315b04 | |||
6fa4e4cef8 | |||
3886a0c9ad | |||
5b65d44303 | |||
23ddb3d4b5 | |||
e1c7176c00 | |||
53caebe0f3 | |||
739187943d | |||
a2210c0118 | |||
6d0f751104 | |||
fb0afc282d | |||
d24ab31d87 | |||
9255cdde8a | |||
7c344d4a39 | |||
3c6d572369 | |||
7ba90f98fc | |||
589a5c7852 | |||
0df4576874 | |||
7157b2817d | |||
82f503aa09 | |||
3da8bca462 | |||
9d4c14b724 | |||
6ff249c3f2 | |||
e12229633c | |||
b75dde4613 | |||
f6989d5539 | |||
7ff23b25b3 | |||
acfd9acc6c | |||
18d5fd5a35 | |||
1881cb0010 | |||
1420921291 | |||
aab56ea943 | |||
045a7cfcb1 | |||
92f988ddc1 | |||
79bce5e006 | |||
9c82a8f726 | |||
6812961836 | |||
003239cddd | |||
ce7386e230 | |||
fde4194f9b | |||
7f9ac86862 | |||
16a939c0c0 | |||
f4f03f659a | |||
4084e2c31e | |||
e417885459 | |||
65fd5a3057 | |||
1f138abac1 | |||
d2fd0cbee9 | |||
210bcb081d | |||
387b4ef457 | |||
673b7f1652 | |||
b6ae3300a9 | |||
c755a5b602 | |||
801817b749 | |||
1cddb9a542 | |||
72b71cd680 | |||
5388b54eff | |||
75b94e6614 | |||
4aa0c8e24e | |||
927e776353 | |||
36a200ceba | |||
0fe43c75f2 | |||
4d92744dea | |||
ae72df7b14 | |||
e814aee300 | |||
4f2af046d3 | |||
91588ecc21 | |||
d2767afa7c | |||
311059d748 | |||
40cb2993fb | |||
fe6e1c8868 | |||
eb78ae0fe1 | |||
8585a536ec | |||
338fb2af35 | |||
a6e520d969 | |||
eb32335194 | |||
10e57319bf | |||
a59309b13f | |||
f2f061ae18 | |||
d30a839eff | |||
948eb455e2 | |||
44bf4c52ed | |||
2e5f64d9bc | |||
0d92b11055 | |||
4260dc0baf | |||
0f302e3446 | |||
e54767b69d | |||
812606a7b4 | |||
fc025bd28b | |||
34f10b382e | |||
0b82aabd2b | |||
03a2f979a9 | |||
2aed12dcb9 | |||
96caf728c8 | |||
4669d408d4 | |||
c594870fdd | |||
34062b6e0b | |||
7cde5dbe38 | |||
bb817733ff | |||
7cf7d9eb79 | |||
907ab2f0bd | |||
d0b379a2d5 | |||
afc08f8c30 | |||
5a7800768b | |||
63c0fe863d | |||
fa79a36089 | |||
9bdb361d08 | |||
1a8b0692fe | |||
352ade6457 | |||
e51d178eaa | |||
0a446c425b | |||
6a8aad4c2b | |||
af98d2bb53 | |||
986826cbe9 | |||
e0d82ad92d | |||
663fd557ff | |||
5a8f30fee8 | |||
e8bb186ff8 | |||
ab27437604 | |||
1c3b9c603c | |||
c2f6e5b20c | |||
7e0481eeff | |||
2b3d2bb4d7 | |||
d8803ca5e4 | |||
7134d0d0ed | |||
2bd5386c29 | |||
c5ff578d10 | |||
6eb5167c70 | |||
5873b5c9a8 | |||
271664f577 | |||
f2be03be05 | |||
7e37a1da4b | |||
18f014fd9e | |||
11d58beec2 | |||
88b1a5c66a | |||
a250565f44 | |||
378f4f0891 | |||
45ee8b2a2b | |||
fda9c85bb3 | |||
862169e178 | |||
850ae77b43 | |||
e2832d2e1b | |||
092487c08e | |||
6b6ad6efe0 | |||
ae066fab93 | |||
41db424837 | |||
3a79f0ad9b | |||
15b86a50d5 | |||
5b0fd60775 | |||
90f899c936 | |||
a95e2efdb0 | |||
54d231d3c6 | |||
b78dcf869b | |||
bcea5a99a1 | |||
e6125c3c7f | |||
67cdfe8b41 | |||
c635b19941 | |||
5ff574b33f | |||
49378e6d09 | |||
aef462da32 | |||
1ba325e902 | |||
1c14b146a2 | |||
e95ffde95d | |||
4ed3859c75 | |||
069d044e17 | |||
c37d3feae9 | |||
c086e9c19f | |||
272167435d | |||
277dc2cfd9 | |||
be37e315c9 | |||
1510fa71d3 | |||
91f3db6691 | |||
56aa4be358 | |||
7099bc3286 | |||
35dcdd62c9 | |||
84b0f9a91b | |||
91fece87b2 | |||
05c5ad711b | |||
ad4fdcfa1a | |||
2efe9cd40b | |||
07594e0607 | |||
c4c063534e | |||
705e1a762c | |||
a8b41ca813 | |||
0de9682e72 | |||
ce0aa98b3f | |||
57fee3d5ef | |||
891e76af0a | |||
67e92fdf68 | |||
13186e1ee2 | |||
14f97cbc10 | |||
6d2072f198 | |||
a78bc86bca | |||
5e11e0a7db | |||
319d883880 | |||
2d52058a55 | |||
e5c84fd11c | |||
598d163173 | |||
6f09a5abff | |||
fbb04f5ebe | |||
0bea688a83 | |||
19d973f5d6 | |||
92d5143f81 | |||
6332025bbc | |||
bdccddfe97 | |||
a236a7a9aa | |||
72c4cbe871 | |||
7ffd9b87b8 | |||
a657bac1b1 | |||
f4e2b819d2 | |||
634fbc748e | |||
8fde83499e | |||
5e90386fda | |||
2116070f02 | |||
02c193118b | |||
33894509e6 | |||
b208acf4a0 | |||
02f4b5f546 | |||
b2513cad23 | |||
4f28df03ab | |||
a7dab9a257 | |||
ca756dbeee | |||
760ca98ee4 | |||
960dc5c62f | |||
03d9e1d182 | |||
25886044ab | |||
4dd7cafe32 | |||
f78a7b201b | |||
4e374eb2cd | |||
5b80ef6d04 | |||
cc5862533e | |||
d58dd1d035 | |||
3b497eca36 | |||
f4a11533be | |||
fe24c8fb86 | |||
608f292e4f | |||
9868ca3eca | |||
de3c62fea4 | |||
4b6144c489 | |||
4838d6c037 | |||
ec4be4f2c0 | |||
e93f53f459 | |||
efad86335f | |||
70c2165df4 | |||
c1ea73d21c | |||
181616fb67 | |||
ed8e41a02c | |||
37f881017a | |||
cda7814c21 | |||
c87cb5d051 | |||
70a55428bc | |||
8c0b4ac216 | |||
60292ca0f8 | |||
fecac2c4d2 | |||
9167d113dc | |||
04ebc85fcc | |||
de5986e5dd | |||
7cfc6a9fd9 | |||
e0c29190a2 | |||
ff7b6c5abe | |||
269227b093 | |||
355c0a8c11 | |||
be95de0963 | |||
0dd6567ce4 | |||
638a69ad23 | |||
7115ac19b6 | |||
b20f994ac4 | |||
4adf3e9385 | |||
ae13fbce72 | |||
68840b4544 | |||
e2af1de83f | |||
7156d2e7b3 | |||
e2d451a400 | |||
3189bd5359 | |||
c3fce9822f | |||
ca02a8fd72 | |||
3c3a5062bd | |||
edfa8493d8 | |||
52223e61d4 | |||
827ce17fac | |||
96700d42b4 | |||
56e61de863 | |||
2932a954ab | |||
de7bb0b979 | |||
6ef4aa9715 | |||
e333eb15cd | |||
80c8ff9f20 | |||
3da71c9274 | |||
3a887eb604 | |||
c6549694a8 | |||
b9cd0054a9 | |||
cf5137723d | |||
945a7ed10f | |||
5ef0012518 | |||
94e3874545 | |||
722fb58010 | |||
d63933b2de | |||
c6c0819a5e | |||
45681f86ce | |||
50c5c12523 | |||
4f773120b2 | |||
4ffefc99a2 | |||
16fc44b3ab | |||
e8cfadaae3 | |||
ac6720e27d | |||
65c76e10be | |||
ae7255953d | |||
0bbee8d91e | |||
24d6d2c24a | |||
28e9605ab7 | |||
6b28201f72 | |||
ae49c04dcd | |||
87abe15227 | |||
5f90db723c | |||
2ab90ae2ed | |||
4b7970c191 | |||
3cf092d058 | |||
0be51b69fb | |||
57537a350f | |||
2b030abf0d | |||
e8217b0867 | |||
83bb7c99ea | |||
24d0d776b7 | |||
f4b01bc18b | |||
509d81ba7d | |||
eaed8bab08 | |||
3c59b3b8dd | |||
2935722b98 | |||
af5f61bd95 | |||
8bc039c95f | |||
b0b3701fcf | |||
c489aeb9dc | |||
db983c5439 | |||
ca6fff9648 | |||
5de120f7e7 | |||
c21f7f371a | |||
03cc80dc3c | |||
413a944e70 | |||
25ece55d7f | |||
ca865a6636 | |||
4d493504e3 | |||
bb917b70f3 | |||
c0d0ebb104 | |||
f8060ef757 | |||
193139f06f | |||
f92a6e58d3 | |||
8e1a841b42 | |||
6a2c0ac86d | |||
9bb8a94c55 | |||
f8bb6a04a9 | |||
1e7932f09c | |||
02b6228856 | |||
bcf5e1fc0b | |||
3fb92aa9dd | |||
77d688e508 | |||
1ec3a69e29 | |||
3aeb15648c | |||
52e1bd32b9 | |||
aca3b4ca1b | |||
0c6fcc1186 | |||
92ae104f39 | |||
ae6884949b | |||
1a313e4d5d | |||
e8d83a085f | |||
c724756b5f | |||
ad3e3ce255 | |||
f084efd263 | |||
af079f3168 | |||
11943c4b5c | |||
389f356a3a | |||
0219d09067 | |||
df11f41416 | |||
97330b65ca | |||
eed951016b | |||
39847c5db6 | |||
12592c1206 | |||
cb90c3722d | |||
851914f0ae | |||
e85973ec8b | |||
7a30ab25bd | |||
5a45f15c7f | |||
558e5e2e9a | |||
82d21b6971 | |||
ccc60dacf4 | |||
517dfdf523 | |||
43ba40ec4c | |||
557d190236 | |||
5c6a99afca | |||
c98c5e469b | |||
d827ccc115 | |||
a40d18f8b2 | |||
0cd18a3b7a | |||
ebe01104e7 | |||
6b8b6b4b3d | |||
31026576f4 | |||
2c58bc6a5c | |||
3ed2bcf3fa | |||
8f1e8b1196 | |||
c0d6958e37 | |||
d2d2959237 | |||
c31ee2d76f | |||
dc318d3f47 | |||
429bf7f13d | |||
96ce9ed7c1 | |||
41288302f4 | |||
039092f292 | |||
fbee70818a | |||
5027f66d77 | |||
f5773de068 | |||
88b6fabb0d | |||
37dd32f1b0 | |||
5713cd6092 | |||
3174bd1c85 | |||
eb4da5ff0c | |||
98d5758ba1 | |||
c49c07b34a | |||
058fcd8aba | |||
699cce713b | |||
a88aa53d82 | |||
7fa13a5d5d | |||
56b420d68b | |||
efd49ae92a | |||
71204172df | |||
6cb387e3a8 | |||
05b32ce26c | |||
b920e52218 | |||
f07816a0d1 | |||
c7d4582efa | |||
77dc4d3d77 | |||
1d073b6897 | |||
56aaaf2e07 | |||
e360077e09 | |||
0fcf768772 | |||
a5f3de61a9 | |||
915fd41bf6 | |||
497f5289e6 | |||
8a8e76e839 | |||
086beea501 | |||
1a522c6696 | |||
91f8987b6c | |||
5771a3c722 | |||
9d8faae375 | |||
2ddf4117d0 | |||
68cbb63355 | |||
7df21e1790 | |||
c25239a398 | |||
04165a9da8 | |||
0bacb903ea | |||
a1fd34ebb6 | |||
126ad92ed8 | |||
e3667f6827 | |||
39560969f4 | |||
f1a77c4146 | |||
68b1959a85 | |||
931a5840e8 | |||
f430152f61 | |||
e0b886e2cc | |||
ef9fd77850 | |||
672c42a20e | |||
dbce25fdea | |||
a583f3d6e2 | |||
cf0ef68cda | |||
be6925c504 | |||
14bba171e7 | |||
1e50bc4cc0 | |||
374b07a126 | |||
460a44a9b1 | |||
f944d7cae4 | |||
b4309a9f60 | |||
539ab79e99 | |||
99dad79572 | |||
26f9b1ccbd | |||
da4ffb235c | |||
b03e35a8d6 | |||
f8c04a6a51 | |||
7033d43e61 | |||
bd9f19f6c7 | |||
a4c07ba9a0 | |||
4b9a8c1dad | |||
b05e9c194a | |||
c01931e5a6 | |||
7afbd8f0f0 | |||
b6eb4cbb61 | |||
21e1fcf693 | |||
cfff7969e3 | |||
6bfbb075c8 | |||
1a74ceca3e | |||
7990dd6f77 | |||
f4857355b6 | |||
81d68bebc6 | |||
8992d51787 | |||
e79827384a | |||
4905f49108 | |||
073d30bf61 | |||
3515951bb8 | |||
fde7ddf832 | |||
7a8d0b8dad | |||
56645a48af | |||
a7d3006cda | |||
c2624daa9a | |||
2126e2a723 | |||
c2980b3c44 | |||
ca358e4d17 | |||
22796d0d27 | |||
e6f1a90ed7 | |||
6a80bc5b54 | |||
0b6aeac364 | |||
5dd2f273fc | |||
ffd3cb6511 | |||
dfb8a1f7ad | |||
1ed4407c11 | |||
f7e4dbc99e | |||
57ae305c7d | |||
5d75d8371b | |||
bbbd4731d7 | |||
df01ca7e4b | |||
931e750d65 | |||
697fc5b85e | |||
cd86c708dc | |||
cffdf7fede | |||
c05b89a77d | |||
f66950d312 | |||
98cb8de478 | |||
1dc774d229 | |||
1c7ff1dd8c | |||
fe73e09aa4 | |||
b2caec384f | |||
1c221d5844 | |||
8b3864969c | |||
cbd1570a8c | |||
df71899244 | |||
48f853aa1a | |||
e2e25f6e62 | |||
68bbea17d1 | |||
2ec1e08081 | |||
3007694b77 | |||
c2af014dad | |||
a46a8cc686 | |||
9ab2c1eb1f | |||
84d07a3e0c | |||
8d6ceccf87 | |||
5176ad521f | |||
feb1ef4ea5 | |||
00e742e0e0 | |||
a95dbd2215 | |||
cbbdd8eeab | |||
8caab4e562 | |||
1537bb3298 | |||
cb7b8713cf | |||
3d8903b2da | |||
7f01ccc83f | |||
e1eba8dec3 | |||
3fbbeea434 | |||
47e5504203 | |||
d41abc2b1c | |||
b46da37932 | |||
d862f10d5c | |||
74ca3fcc9a | |||
73c97f1381 | |||
f516d24089 | |||
132a9bbfe9 | |||
e10bf9d897 | |||
c755a8974c | |||
0254ff0281 | |||
2465eafff0 | |||
5481e19709 | |||
5dbfbdb82b | |||
f74710998d | |||
db75f1c81e | |||
046ac97a9b | |||
b8f0dd5f38 | |||
0ea61a1e3f | |||
c012f2cda3 | |||
978af1009e | |||
39a985cbba | |||
06d60c981d | |||
0e2d0f07e8 | |||
e8e9e12302 | |||
781fea0a96 | |||
4aa73c607f | |||
a276b6b7f5 | |||
ea875a14f9 | |||
cb008bb700 | |||
4633c142a8 | |||
001d6415bf | |||
a182ca3660 | |||
bd363b2c93 | |||
205a3780d5 | |||
5e82b50a00 | |||
476f3162af | |||
b7291dffb9 | |||
15424149cd | |||
f53770a2fc | |||
0e9cf558b4 | |||
95bf19a417 | |||
8471765e30 | |||
6d7fb07a4c | |||
1e8c7bd637 | |||
a1fc93b398 | |||
0722ef3125 | |||
49b4ae2f56 | |||
e2d1d58acf | |||
44339d3b89 | |||
404bb4a653 | |||
066550d38c | |||
020eaded36 | |||
445da80df8 | |||
f937b8ca5d | |||
7901b6f463 | |||
e9f6dcf479 | |||
264485c8ff | |||
3525bb3f9f | |||
78d1504d66 | |||
c6cb499758 | |||
bc57ea5725 | |||
27f752ff9e | |||
b9275646ad | |||
9e2f2697c7 | |||
b6b0df62b6 | |||
0ba537e479 | |||
75ddf535dc | |||
b1de501bef | |||
0f3a63f101 | |||
3b4b2d707f | |||
f405aa1733 | |||
df0fdb7ecb | |||
91b7a87557 | |||
b401a6c33b | |||
faefcc4799 | |||
671587c029 | |||
fb0b0b96ec | |||
72d89fefc3 | |||
a11313fe96 | |||
aba3a67b80 | |||
2bb8fa596a | |||
bb52676f50 | |||
536f8937cb | |||
e8b14f8c8a | |||
aca09bcd4e | |||
fdb4fa28db | |||
93362963e2 | |||
33a7375c72 | |||
97bad0fcb9 | |||
059711af37 | |||
f0c5106764 | |||
4182615aa9 | |||
ff2c42e921 | |||
b9eb3d5a52 | |||
78078f4ef3 | |||
ea66f2d12f | |||
de16c2a7f1 | |||
911ff49238 | |||
6731c39ce2 | |||
81eade8ede | |||
4d5506a0a8 | |||
cad8ffc0c6 | |||
8ebbfbb84b | |||
2ef44ec70b | |||
978b54dff9 | |||
300b014f73 | |||
1e94ec0c6a | |||
86018684c9 | |||
300bf85dae | |||
0ff79b7d5a | |||
0dccd78567 | |||
0e4c7a9494 | |||
679e747b5c | |||
daaf13d99c | |||
50f8366bc2 | |||
f3bf331b5f | |||
73ec3903bf | |||
85cc0d8184 | |||
7e00d9f395 | |||
bd7f3567f8 | |||
bd0f72c60e | |||
2505369c08 | |||
ab4572f544 | |||
80fb0a99a8 | |||
bdff083402 | |||
053e05628f | |||
d8b0a13ee2 | |||
537260879a | |||
a7309be567 | |||
829ba49c1c | |||
fa6d18e9b2 | |||
fd42fad045 | |||
447c5bb8fe | |||
2024eb5d6e | |||
cf8b53adff | |||
3aac30b8ee | |||
3b07afe3fc | |||
d90db50a60 | |||
f12df80c5b | |||
936dfea8a7 | |||
9e21583331 | |||
19460a03f5 | |||
72c2fbee9c | |||
2cd38fefcd | |||
549e346ad4 | |||
54f92fb26c | |||
b260d08225 | |||
c89f6e649c | |||
5287441a65 | |||
9b3f4a3a66 | |||
1decd2dd89 | |||
d95aaa2089 | |||
01d54a7a4c | |||
70a7d83175 | |||
f6927ad1bf | |||
bd31ac1d52 | |||
b16d087fd1 | |||
3563f0deec | |||
adb5ab5ed1 | |||
abb5bfb6e4 | |||
987aeda6fb | |||
d847a289a4 | |||
66c488b79a | |||
aa99d289c3 | |||
bb9208f8ee | |||
3eea80a121 | |||
68b13a0ecd | |||
12cd3d07a2 | |||
ebf44704b2 | |||
d555bc6e75 | |||
b5f7dc29af | |||
b403aa20a6 | |||
33092b6d85 | |||
aaab8d697a | |||
8b8d8449f2 | |||
545c5530e3 | |||
ae48a0e251 | |||
62ba3838ef | |||
cdcb413241 | |||
f8b34a16dd | |||
a971d87008 | |||
aba3319427 | |||
d3200dc76f | |||
e7621a6cd0 | |||
d6793a0802 | |||
37ba8f9a71 | |||
cb879c61ca |
10
.gitignore
vendored
@ -1,17 +1,11 @@
|
||||
.cproject
|
||||
.project
|
||||
bin/
|
||||
calibrationWizards/
|
||||
slsDetectorGui/
|
||||
slsDetectorSoftware/
|
||||
slsReceiverSoftware/
|
||||
slsDetectorCalibration/
|
||||
slsImageReconstruction/
|
||||
.settings
|
||||
JCTBGui/
|
||||
*.aux
|
||||
*.log
|
||||
*.out
|
||||
*.toc
|
||||
build
|
||||
tests
|
||||
docs/
|
||||
RELEASE.txt
|
||||
|
45
.travis.yml
Normal file
@ -0,0 +1,45 @@
|
||||
sudo: false
|
||||
|
||||
language: cpp
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- os: linux
|
||||
env: CONDA_PY=3.6
|
||||
|
||||
dist: trusty
|
||||
|
||||
install:
|
||||
- sudo apt-get update
|
||||
- ldd --version
|
||||
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
|
||||
- bash miniconda.sh -b -p $HOME/miniconda
|
||||
- export PATH="$HOME/miniconda/bin:$PATH"
|
||||
- rm -f miniconda.sh
|
||||
- hash -r
|
||||
- conda config --set always_yes yes --set changeps1 no
|
||||
- conda config --add channels conda-forge
|
||||
- conda config --add channels slsdetectorgroup
|
||||
- conda update conda
|
||||
- conda update --all
|
||||
- conda install conda-build anaconda-client
|
||||
|
||||
# Useful for debugging any issues with conda
|
||||
- conda info -a
|
||||
|
||||
|
||||
# Replace dep1 dep2 ... with your dependencies
|
||||
- conda create -q -n test-environment python=$CONDA_PY
|
||||
- source activate test-environment
|
||||
- conda-build .
|
||||
|
||||
script:
|
||||
- echo "No test scripts to be run!"
|
||||
|
||||
|
||||
deploy:
|
||||
provider: script
|
||||
script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
|
||||
on:
|
||||
branch: 4.0.0
|
||||
|
@ -1,21 +1,57 @@
|
||||
cmake_minimum_required(VERSION 2.8)
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
|
||||
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)
|
||||
|
||||
|
||||
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++98 -Wno-misleading-indentation")
|
||||
else ()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++98")
|
||||
endif ()
|
||||
|
||||
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)
|
||||
add_subdirectory(manual/manual-api)
|
||||
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)
|
||||
|
103
Makefile
@ -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
|
||||
@ -18,23 +19,27 @@ RECEIVERDIR = $(LIBRARYRXRDIR)
|
||||
CALWIZDIR = $(WD)/calibrationWizards
|
||||
MANDIR = $(WD)/manual
|
||||
CALIBDIR = $(WD)/slsDetectorCalibration
|
||||
MANAPIDIR = $(MANDIR)/manual-api
|
||||
|
||||
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)
|
||||
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$(LIBRARYDIR)/sharedMemory -I$(ASM)
|
||||
|
||||
INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM)
|
||||
#LIBFLAGRXR +=
|
||||
|
||||
$(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 +47,62 @@ 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)'
|
||||
cd $(MANAPIDIR) && $(MAKE) slsMultiReceiver
|
||||
@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 +119,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 +151,9 @@ clean:
|
||||
cd $(CALWIZDIR) && $(MAKE) clean
|
||||
cd manual && $(MAKE) clean
|
||||
cd $(DOCDIR) && rm -rf *
|
||||
|
||||
rm -rf slsDetectorPackageDocs;
|
||||
rm -rf $(DETAILDOC)
|
||||
rm -rf $(MANAPIDIR)/slsMultiReceiver
|
||||
|
||||
|
||||
#install_lib:
|
||||
@ -174,7 +224,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 ""
|
||||
|
@ -5,40 +5,32 @@
|
||||
CC = g++
|
||||
CXX = $(CC)
|
||||
ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
|
||||
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 -DEIGER_DEBUG -DEIGER_DEBUG3 #-DFIFO_DEBUG
|
||||
FLAGS= -Wall -pthread #-DEIGER_DEBUG2
|
||||
# -DVERBOSE
|
||||
|
||||
# Setting up the verbose flags
|
||||
ifeq ($(DEBUG),1)
|
||||
FLAGS = -Wall -pthread -DVERBOSE
|
||||
FLAGS = -Wall -DVERBOSE
|
||||
endif
|
||||
ifeq ($(DEBUG),2)
|
||||
FLAGS = -Wall -pthread -DVERYVERBOSE
|
||||
FLAGS = -Wall -DVERYVERBOSE
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
89
README.md
@ -1,44 +1,91 @@
|
||||
# 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 for [lib](https://github.com/slsdetectorgroup/sls_detector_lib) and [gui](https://github.com/slsdetectorgroup/sls_detector_gui)
|
||||
|
||||
## 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
|
||||
|
||||
```
|
||||
$ 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
|
||||
* Advanced user 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>
|
||||
* -e: Debug mode
|
||||
|
||||
Basic Option:
|
||||
./cmk.sh -b
|
||||
|
||||
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
|
||||
sls_detector_acquire sls_detector_get slsDetectorGui sls_detector_help sls_detector_put slsReceiver
|
||||
sls_detector_acquire sls_detector_get slsDetectorGui sls_detector_help sls_detector_put slsReceiver slsMultiReceiver
|
||||
```
|
||||
|
565
RELEASE.txt
@ -1,135 +1,508 @@
|
||||
SLS Detector Package 2.3.0 released on 2017-03-23
|
||||
================================================================================
|
||||
|
||||
SLS Detector Package 4.0.0 released on 27.09.2018
|
||||
=================================================
|
||||
|
||||
|
||||
|
||||
INTRODUCTION
|
||||
|
||||
This document describes the differences between previous versions and 2.3.0 releases.
|
||||
This document describes the differences between 4.0.0 and 3.1.4 releases.
|
||||
|
||||
Manuals can be found under the 'manual' folder.
|
||||
|
||||
User documentation and other help can 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
|
||||
Download
|
||||
--------
|
||||
|
||||
The Source Code (Default C++ API):
|
||||
https://github.com/slsdetectorgroup/slsDetectorPackage
|
||||
|
||||
The Conda Lib Package:
|
||||
https://github.com/slsdetectorgroup/sls_detector_lib
|
||||
|
||||
The Conda GUI Package:
|
||||
https://github.com/slsdetectorgroup/sls_detector_gui
|
||||
|
||||
The Python Interface (including the package):
|
||||
https://github.com/slsdetectorgroup/sls_detector
|
||||
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
|
||||
Manual (HTML & PDF):
|
||||
https://www.psi.ch/detectors/documentation
|
||||
slsDetectorPackage/manual/docs/
|
||||
|
||||
Command Line Documentation:
|
||||
manual/docs/html/slsDetectorClientDocs/index.html
|
||||
manual/docs/pdf/slsDetectorClientDocs.pdf
|
||||
|
||||
C++ API Documentation:
|
||||
manual/docs/html/slsDetectorUsersDocs/index.html
|
||||
manual/docs/pdf/slsDetectorUsersDocs.pdf
|
||||
|
||||
C++ API Example:
|
||||
manual/manual-api/mainClient.cpp
|
||||
manual/manual-api/mainReceiver.cpp
|
||||
|
||||
Python API Documentation:
|
||||
https://slsdetectorgroup.github.io/sls_detector/
|
||||
|
||||
Further Documentation:
|
||||
https://www.psi.ch/detectors/users-support
|
||||
|
||||
|
||||
Support
|
||||
-------
|
||||
|
||||
General Software related:
|
||||
dhanya.thattil@psi.ch
|
||||
anna.bergamaschi@psi.ch
|
||||
|
||||
Python related:
|
||||
erik.frojdh@psi.ch
|
||||
|
||||
|
||||
|
||||
CONTENTS
|
||||
|
||||
- Changes in User Interface
|
||||
- New Features
|
||||
- Resolved Issues
|
||||
- Known Issues
|
||||
1. Firmware Requirements
|
||||
2. Changes in User Interface
|
||||
3. New/Modified Commands
|
||||
4. Other New Features
|
||||
5. Resolved Issues
|
||||
6. Known Issues
|
||||
7. Next Major Release Plans
|
||||
|
||||
|
||||
|
||||
1. Firmware Requirements
|
||||
========================
|
||||
|
||||
Changes in User Interface
|
||||
=========================
|
||||
Gotthard
|
||||
========
|
||||
Minimum compatible version : 11.01.2013
|
||||
Latest version : 08.02.2018 (50um and 25um Master)
|
||||
09.02.2018 (25 um Slave)
|
||||
Eiger
|
||||
=====
|
||||
Minimum compatible version : 22
|
||||
Latest version : 22
|
||||
|
||||
Jungfrau
|
||||
========
|
||||
Minimum compatible version : 15.06.2018
|
||||
Latest version : 15.06.2018
|
||||
|
||||
This release supports the following features:
|
||||
|
||||
Detector Upgrade
|
||||
================
|
||||
Gotthard Cannot be upgraded remotely. Requires programming via USB blaster
|
||||
Eiger Can be upgraded remotely via bit files
|
||||
Jungfrau Can be upgraded remotely using sls_detector_put programfpga <pof>
|
||||
|
||||
Instructions available at
|
||||
https://www.psi.ch/detectors/installation-instructions
|
||||
under Detector Upgrade -> [Detector Type] -> Firmware.
|
||||
|
||||
|
||||
Please refer to the link below for more details on the firmware versions.
|
||||
https://www.psi.ch/detectors/firmware.
|
||||
|
||||
|
||||
|
||||
|
||||
2. Changes in User Interface
|
||||
============================
|
||||
|
||||
Client
|
||||
------
|
||||
|
||||
1. Shared Memory:
|
||||
|
||||
POSIX shared memory has been implemented and they are typically created in
|
||||
/dev/shm/ folder.
|
||||
|
||||
A multiSlsDetector object will create a shared memory segment with naming style:
|
||||
slsDetectorPackage_x_[_z]
|
||||
and an slsDetector object will create a shared memory segment with naming style:
|
||||
slsDetectorPackage_x_sls_y[_z]
|
||||
|
||||
where
|
||||
x is the multi detector id
|
||||
y is the sls detector id
|
||||
z is the environment variable SLSDETNAME, if set.
|
||||
They can be deleted directly.
|
||||
|
||||
Environment variable SLSDETNAME included for user-friendliness
|
||||
of using 2 different detectors from the same client pc. One needn't use
|
||||
different multi detector id if the SLSDETNAME is different for both consoles.
|
||||
|
||||
Constructor will fail if shared memory size is different (different package
|
||||
releases/detectors). Loading config file cleans shared memory.
|
||||
|
||||
|
||||
2. Exceptions in constructors:
|
||||
|
||||
All constructors that have an error throws an exception. For this release,
|
||||
this is caught within the package and interfaced as error codes or messages
|
||||
to the users using command line or API.
|
||||
|
||||
As a result:
|
||||
- slsDetectorsUsers constructor signature now includes a success flag.
|
||||
- If one uses multiSlsDetector, slsDetector, ZmqSocket classes directly,
|
||||
catch exceptions from constructors.
|
||||
- In future releases, the exception will be thrown
|
||||
outside the package for the users to handle it.
|
||||
|
||||
|
||||
3. API Compatibility:
|
||||
|
||||
Client now checks API version of Detector Server - Client and Receiver - Client
|
||||
when connecting for the first time to detector server or receiver server
|
||||
and the online flags have not been set in shm.
|
||||
|
||||
Upon failure, error messages will ensue and further commands will not
|
||||
be executed. Detector servers referred to are only for Eiger, Jungfrau and Gotthard.
|
||||
|
||||
Previously, the detector server would exit on mismatched Firmware-Detector
|
||||
server mismatch. They now wait for client to ask for compatibility check,
|
||||
which is done the first time client connects to the detector and the
|
||||
online flag in shm has not been set.
|
||||
|
||||
|
||||
4. Commands "type", "id" and "replace" are removed.
|
||||
|
||||
|
||||
Receiver
|
||||
--------
|
||||
- The files will be written in this format in the default mode:
|
||||
* ASCII file header of 1024 bytes (only for EIGER detectors)
|
||||
* series of images, each preceded by a Standard Header image
|
||||
(header described below)
|
||||
--------
|
||||
|
||||
|
||||
- Stanard Header image header in file and call back
|
||||
arguments defined. It is in the following format defined as
|
||||
sls_detector_header defined in
|
||||
slsReceiverSoftware/include/sls_receiver_defs.h
|
||||
Mostly 0 if not applicatble or implemented, but updated in next release
|
||||
from firmware.
|
||||
1. Reciever Header Structure in file writing and call back:
|
||||
|
||||
sls_receiver_header structure added to sls_receiver_defs.h for image headers
|
||||
in file writing.
|
||||
|
||||
* Frame Number : 8 bytes # Image Number
|
||||
* Exposure Length : 4 bytes # sub frame number in 32 bit mode
|
||||
Eiger.
|
||||
* Packet Number : 4 bytes # Number of packets in an image
|
||||
* Bunch ID : 8 bytes # Bunch Id in beamline for jungfrau.
|
||||
* Timestamp : 8 bytes # Not implemened
|
||||
* Module Id : 2 bytes # Not implemented
|
||||
* X Coordinate : 2 bytes # Id of part of detector in 1D
|
||||
* Y Coordinate : 2 bytes # Not implemented
|
||||
* Z Coordinate : 2 bytes # Not implemented
|
||||
* Debug : 4 bytes # Not implemented
|
||||
* Round Robin Number : 2 bytes # Not implemented
|
||||
* Detector Type : 1 byte # Detector type defined by enum
|
||||
detectorType in slsReceiverSoftware
|
||||
/include/sls_receiver_defs.h
|
||||
* Header Version : 1 byte # 1
|
||||
|
||||
|
||||
|
||||
- The call back value for Start Acquisition Call back is insignificant at the
|
||||
moment and left for future use. Instead, the following rules apply:
|
||||
* If file write is enabled from the client, we will write the files.
|
||||
* If callbacks are registered, they will be called.
|
||||
For example, the user prefers to write the data himself, one must disable
|
||||
file write (so we dont write) and register the callbacks (so the user gets
|
||||
the data).
|
||||
#define MAX_NUM_PACKETS 512
|
||||
typedef std::bitset<MAX_NUM_PACKETS> sls_bitset;
|
||||
typedef struct {
|
||||
sls_detector_header detHeader; /**< is the detector header */
|
||||
sls_bitset packetsMask; /**< is the packets caught bit mask */
|
||||
} sls_receiver_header;
|
||||
|
||||
It includes the detector header structure + bitmask of 512 bits,
|
||||
where each bit represents a packet caught. This is useful in saving time
|
||||
in writing to file by not padding missing packets and still retaining useful data.
|
||||
|
||||
The binary and HDF5 writer version number changed from 1.0 to 2.0.
|
||||
The detector header version remains as 1.0.
|
||||
|
||||
registerCallBackRawDataReady modified to give this structure pointer,
|
||||
instead of individual structure member pointers.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
New Features
|
||||
============
|
||||
Eiger
|
||||
-----
|
||||
- Tau is moved to settings file, Gain and offset are removed from calibration
|
||||
file. Put settings only sets client variable, whereas putting threshold loads
|
||||
settings files to the server.
|
||||
2. ZmqSocket class:
|
||||
|
||||
- Mode argument in starting up receiver is removed. FlippedData command is used
|
||||
in config file to specify bottom.
|
||||
If one uses ZmqSocket.h, then the json header has to be parsed outside
|
||||
the class to allow the user to remove the restriction in extracting all data
|
||||
from the json header.
|
||||
|
||||
|
||||
3. Receiver Call back with modified size:
|
||||
|
||||
registerCallBackRawDataModifyReady call back that is similar to the receiver
|
||||
registerCallBackRawDataReady has been added to allow the call back to
|
||||
specify an updated size of image after call back. This is in view to process
|
||||
an image in call back (including extract only a region of the image) and
|
||||
provide this updated size in callback. This new resized/processed image
|
||||
will be written to file or streamed out via zmq. This is useful in ROI
|
||||
selection in the receiver.
|
||||
|
||||
This also means that the call back is now called before writing to file.
|
||||
|
||||
|
||||
|
||||
3. New/Modified Commands
|
||||
========================
|
||||
|
||||
Client
|
||||
------
|
||||
|
||||
1. add (modified):
|
||||
appends detector to end of multi detector list.
|
||||
|
||||
2. replace:
|
||||
sets hostname/ip address for a single detector.
|
||||
|
||||
3. user:
|
||||
get user details from shared memory.
|
||||
|
||||
4. checkdetversion:
|
||||
checks client version compatibility with detector server.
|
||||
|
||||
5. checkrecversion:
|
||||
checks client version compatibility with receiver server.
|
||||
|
||||
|
||||
Receiver
|
||||
--------
|
||||
- Image Reconstruction from the files are different as packet headers are not
|
||||
stored and a standard image header is used.
|
||||
--------
|
||||
|
||||
1. rx_zmqip:
|
||||
sets/gets the zmq (TCP) ip of the receiver from where data is streamed
|
||||
out from. (Eg. to the gui or intermediate process). By default, it is
|
||||
the same as the zmqip.
|
||||
|
||||
2. zmqip:
|
||||
sets/gets the zmq (TCP) ip, where client listens to, to reconstuct images.
|
||||
(Eg. from receiver or intermediate process). By default, it is the same
|
||||
as rx_zmqip.
|
||||
|
||||
3. rx_jsonaddheader:
|
||||
sets/gets additional json header to be streamed out with the zmq from
|
||||
receiver. Default is empty. Eg. p rx_jsonaddheader \"what\":\"nothing\"
|
||||
|
||||
4. r_discardpolicy:
|
||||
sets/gets the frame discard policy in the receiver.
|
||||
nodiscard - no discard (default),
|
||||
discardempty - discard only empty frames,
|
||||
discardpartial - discard any partial frame(fastest)
|
||||
|
||||
5. r_padding:
|
||||
sets/gets the frame padding in the receiver.
|
||||
0 does not pad partial frames(fastest),
|
||||
1 (default) pads partial frames.
|
||||
One can look at bitmask in the sls_receiver_header to process the unpadded
|
||||
partial frames later.
|
||||
|
||||
6. activate (modified):
|
||||
Extra option added to pad or unpad images in receivers when deactivated.
|
||||
activate i [padding option], where i is activate/deactivate and padding
|
||||
option is "padding" (default) or "nopadding".
|
||||
|
||||
7. rx_udpsocksize:
|
||||
sets/gets the UDP socket buffer size. Already attempts to set by default
|
||||
to 100mb, 2gb for Jungfrau. Does not remember custom values in client
|
||||
shared memory, so must be initialized each time after setting receiver
|
||||
hostname in config file.
|
||||
|
||||
8. rx_realudpsocksize:
|
||||
gets the actual UDP socket buffer size. Usually double the set udp socket
|
||||
buffer size due to kernel bookkeeping.
|
||||
|
||||
9. r_framesperfile:
|
||||
sets/gets the frames per file in receiver. 0 means infinite or all frames
|
||||
in a single file. Default of Eiger changed from 2k to 10k.
|
||||
|
||||
|
||||
Eiger Specific
|
||||
--------------
|
||||
|
||||
General
|
||||
-------
|
||||
|
||||
- Users folder that gives an example on how to user the slsDetectorUsers and
|
||||
slsReceiverUsers class.
|
||||
|
||||
- Data is streamed from Receiver to Gui via ZMQ if gui call back defined.
|
||||
1. status trigger:
|
||||
To trigger internally via software, one can use "status trigger".
|
||||
|
||||
2. subdeadtime:
|
||||
sets/gets sub frame dead time in s in 32 bit mode. Subperiod is set in
|
||||
the detector by subexptime + subdeadtime. This value is normally a
|
||||
constant set by an expert catered to individual detector modules in the
|
||||
config file. Receiver files writes master file metadata subperiod
|
||||
instead of subdeadtime.
|
||||
|
||||
3. gappixels:
|
||||
enables/disables gap pixels in system (detector & receiver). 1 sets,
|
||||
0 unsets. In Receiver, 4 bit gap pixels mode is not implemented, but is
|
||||
implemented in client data call back. Gap pixels are at module level
|
||||
and not at multi module level.
|
||||
|
||||
4. measuredperiod:
|
||||
gets the measured frame period (time between last frame and the previous
|
||||
one) in s. Makes sense only for acquisitions of more than 1 frame.
|
||||
|
||||
5. measuredsubperiod:
|
||||
gets the measured subframe period (time between last subframe and the
|
||||
previous one) in s in 32 bit mode.
|
||||
|
||||
6. flags(modified):
|
||||
extra flags "nooverflow" (default) and "overflow" for sub images in 32
|
||||
bit mode. If set to overflow, it will set MSB of pixel data high if
|
||||
there was any saturation in any of the sub images 32 bit mode.
|
||||
|
||||
|
||||
Jungfrau Specific
|
||||
-----------------
|
||||
|
||||
1. storagecells:
|
||||
sets/gets number of additional storage cells per acquisition. For very
|
||||
advanced users only. Range: 0-15. Default: 0.
|
||||
The #images = #frames * #cycles * (#storagecells +1).
|
||||
|
||||
2. storage_start:
|
||||
sets/gets the storage cell that stores the first acquisition of the series.
|
||||
For very advanced users only. Range: 0-15. Default: 15(0xf).
|
||||
|
||||
|
||||
|
||||
Resolved Issues
|
||||
4. Other New Features
|
||||
=====================
|
||||
|
||||
Client
|
||||
------
|
||||
|
||||
1. (Jungfrau & Gotthard) Settingsdir and caldir is removed from config file.
|
||||
Default dacs are stored in detector server. Hence, these folders
|
||||
are also removed from slsDetectorPackage/settingsdir. Eiger and Mythen
|
||||
continue to have them.
|
||||
|
||||
2. Depending on 1d position of detectors and detsizechan in config file,
|
||||
row and column (previously xcoord and ycoord) are given to detector
|
||||
servers (Eiger and Jungfrau) to encode into the udp header.
|
||||
|
||||
3. (Eiger) Setting threshold energy changes such as CAL dac is irrelevant
|
||||
when interpolating between two energies and VRS dac is interpolated, not copied.
|
||||
|
||||
4. Users API updated with the following functions:
|
||||
- setReceiverFramesDiscardPolicy
|
||||
- setReceiverPartialFramesPadding
|
||||
- setReceiverFramesPerFile
|
||||
- sendSoftwareTrigger
|
||||
- setSubFrameExposureDeadTime
|
||||
- setSubFrameExposureTime
|
||||
- enableGapPixels
|
||||
- getMeasuredPeriod
|
||||
- getMeasuredSubFramePeriod
|
||||
- setOverflowMode
|
||||
- setNumberOfStorageCells
|
||||
- setStoragecellStart
|
||||
- setThresholdEnergy (overloaded)
|
||||
- resetFramesCaughtInReceiver
|
||||
- setReceiverFifoDepth
|
||||
- setFlowControl10G
|
||||
- setTenGigabitEthernet
|
||||
- getNMods
|
||||
- setReceiverDataStreamingOutIP
|
||||
- setClientDataStreamingInIP
|
||||
|
||||
SlsReceiver
|
||||
-----------
|
||||
|
||||
1. slsMultiReceiver executable added that creates multiple receiver child processes.
|
||||
./slsMultiReceiver [start_tcp_port] [num_receivers] [1 for call back, 0 for none]
|
||||
|
||||
2. Default row and column (previously xcoord and ycoord) are hardcoded
|
||||
for missing packets. (Eiger and Jungfrau)
|
||||
|
||||
|
||||
Gui
|
||||
---
|
||||
|
||||
1. (Jungfrau) Gain plot included. Option under 2D options in Plot tab.
|
||||
|
||||
2. Option to maintain aspect ratio
|
||||
|
||||
3. Start and Stop separated to prevent multiple click syndrome.
|
||||
|
||||
|
||||
Detector Server
|
||||
---------------
|
||||
|
||||
1. (Jungfrau) To use programfpga command, one must start server with -update
|
||||
mode and then restart server without -update mode.
|
||||
|
||||
2. (Jungfrau) ASIC Timer configured at server start up and changed a few
|
||||
startup values for firmware v0.7 such as adc phase, ADC_PORT_INVERT_VAL
|
||||
and ADC offset half speed value.
|
||||
|
||||
3. (Jungfrau) Minimum exposure time of 50 ns was implemented.
|
||||
|
||||
4. (Eiger and Jungfrau) They can be configured to have x and y coord values
|
||||
of the detector in their udp header.
|
||||
|
||||
|
||||
|
||||
|
||||
5. Resolved Issues
|
||||
==================
|
||||
|
||||
Client
|
||||
------
|
||||
memory leak for multi threading
|
||||
|
||||
1. Compiler flag -std=c++98 enforced. Debug flag removed.
|
||||
|
||||
2. If trimen gives different list from different detectors, it returns a -1.
|
||||
|
||||
3. Version format for each submodule of the package changed to just date YYMMDD.
|
||||
Users class fixed to give correct version, instead of -1.
|
||||
|
||||
4. Getting settings in users class gave -1. Fixed now.
|
||||
|
||||
5. (Jungfrau) Programming FPGA now creates the rawbin file from pof in tmp
|
||||
rather than source file location (for permission issues).
|
||||
|
||||
6. (Gotthard) ROI segmentation fault fixed.
|
||||
|
||||
Receiver
|
||||
--------
|
||||
|
||||
1. Silent feature of receiver fixed.
|
||||
|
||||
2. Socket descriptor misused earlier for success flag, instead exceptions
|
||||
used that are handled inside the package.
|
||||
|
||||
3. Global optind variable initialized to instantiate multiple receivers
|
||||
in same process. Also removed static members to enable this feature.
|
||||
|
||||
4. Socket buffer size attempts to set for each acquiistion and provide
|
||||
warning if no capabilities. Warnings can be removed using instruction with
|
||||
error provided. Default Jungfrau UDP socket buffer size if 2 GB, default is
|
||||
100 MB.
|
||||
|
||||
5. Refactored code a bit for performance and robustness, blocking push
|
||||
in buffer between listener and dataprocessor
|
||||
|
||||
|
||||
Detector Server
|
||||
---------------
|
||||
|
||||
1. (Jungfrau) Stop server also mapped during a reset. Reading power status
|
||||
instead of user input register for power.
|
||||
|
||||
2. (Eiger) Bug fix for saving trimbits to file (Advanced users).
|
||||
|
||||
3. (Gotthard 25um) config.txt is not read again after detector startup,
|
||||
no matter the number of times the detector server is restarted.
|
||||
|
||||
|
||||
6. Known Issues
|
||||
===============
|
||||
|
||||
Eiger
|
||||
-----
|
||||
- Frame and packet counters in server to check delays were buggy.
|
||||
|
||||
|
||||
Known Issues
|
||||
============
|
||||
- X, Y and Z Coordinates do not exactly define the position of the
|
||||
detector in 3d. This will be defined in the next release. Other header
|
||||
parameters will be complete in the next release.
|
||||
Receiver
|
||||
--------
|
||||
|
||||
- Too many split files per detector especially for Eiger. Next Release will
|
||||
have a HDF5 version, with virtual file mapping all the split files in an
|
||||
acquisition.
|
||||
1. HDF5 compression and filters are not implemented yet.
|
||||
|
||||
- This version is tested only for Eiger and Jungfrau.
|
||||
|
||||
Detector Server
|
||||
---------------
|
||||
|
||||
1. (Eiger) Registers mapped differently between firmware v20 and v22.
|
||||
So, please ensure correct on-board server before switching between
|
||||
firmware versions. Else one cannot ping it anymore. Will need to flash firmware
|
||||
again to recover.
|
||||
|
||||
2. (Gotthard) To switch back to all ADC from single ADC ROI, one must take
|
||||
even number of images for the receiver to understand complete images.
|
||||
This will be fixed in the next firmware upgrade.
|
||||
|
||||
|
||||
|
||||
7. Next Major Release Plans
|
||||
===========================
|
||||
|
||||
Client
|
||||
------
|
||||
|
||||
1. Exceptions thrown to the user to be handled.
|
||||
|
||||
2. Compilation using c++11.
|
||||
|
||||
3. Support of Mythen II restricted to this major and its minor releases.
|
||||
|
||||
4. Restructuring and refactoring of client code.
|
||||
|
||||
|
||||
|
||||
|
17
checkout.sh
@ -1,17 +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
|
||||
|
||||
#git clone git@git.psi.ch:sls_detectors_software/tests.git tests
|
@ -1 +1 @@
|
||||
for i in seq `ipcs -m | cut -d ' ' -f1`; do ipcrm -M $i; done;
|
||||
rm /dev/shm/slsDetectorPackage*;
|
||||
|
204
cmk.sh
Executable file
@ -0,0 +1,204 @@
|
||||
#!/bin/bash
|
||||
BUILDDIR="build"
|
||||
HDF5DIR="/opt/hdf5v1.10.0"
|
||||
HDF5=0
|
||||
COMPILERTHREADS=0
|
||||
TEXTCLIENT=0
|
||||
RECEIVER=0
|
||||
GUI=0
|
||||
DEBUG=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
|
||||
-e: Debug mode
|
||||
|
||||
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:trge" 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
|
||||
;;
|
||||
e)
|
||||
echo "Compiling Options: Debug"
|
||||
DEBUG=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
|
||||
|
||||
#Debug
|
||||
if [ $DEBUG -eq 1 ]; then
|
||||
CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
|
||||
echo "Debug Option enabled"
|
||||
fi
|
||||
|
||||
|
||||
#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
@ -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`
|
||||
|
33
examples/eiger_10Gb.config
Normal 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
@ -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
|
@ -1,18 +1,11 @@
|
||||
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
|
||||
0:settingsdir /home/l_maliakal_d/mySoft/newMythenSoftware/settingsdir/gotthard
|
||||
0:angdir 1.000000
|
||||
0:moveflag 0.000000
|
||||
0:lock 0
|
||||
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
|
||||
@ -23,7 +16,6 @@ type Gotthard+
|
||||
master -1
|
||||
sync none
|
||||
outdir /bigRAID/datadir_gotthard/rec_test_data
|
||||
ffdir /home/l_maliakal_d
|
||||
headerbefore none
|
||||
headerafter none
|
||||
headerbeforepar none
|
||||
@ -32,4 +24,4 @@ badchannels none
|
||||
angconv none
|
||||
globaloff 0.000000
|
||||
binsize 0.001000
|
||||
threaded 1
|
||||
|
||||
|
15
examples/jungfrau.config
Normal file
@ -0,0 +1,15 @@
|
||||
hostname bchip038+
|
||||
|
||||
0:rx_udpport 50004
|
||||
0:rx_udpip 10.1.1.100
|
||||
0:detectorip 10.1.1.10
|
||||
rx_hostname pcmoench01
|
||||
|
||||
powerchip 1
|
||||
|
||||
#extsig:0 trigger_in_rising_edge
|
||||
#timing trigger
|
||||
|
||||
outdir /external_pool/jungfrau_data/softwaretest
|
||||
|
||||
|
25
examples/jungfrau_two.config
Normal file
@ -0,0 +1,25 @@
|
||||
detsizechan 1024 1024
|
||||
hostname bchip048+bchip052+
|
||||
|
||||
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 trigger
|
||||
|
||||
outdir /external_pool/jungfrau_data/softwaretest
|
||||
|
||||
|
@ -2,23 +2,17 @@
|
||||
|
||||
detsizechan 2560 1
|
||||
|
||||
#type Gotthard+
|
||||
hostname bchip007+bchip009+
|
||||
|
||||
#0:hostname bchip007
|
||||
#0:port 1952
|
||||
#0:stopport 1953
|
||||
#0:rx_tcpport 1956
|
||||
0:settingsdir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard
|
||||
0:angdir 1.000000
|
||||
0:moveflag 0.000000
|
||||
0:lock 0
|
||||
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
|
||||
@ -32,16 +26,11 @@ hostname bchip007+bchip009+
|
||||
#1:port 1952
|
||||
#1:stopport 1953
|
||||
1:rx_tcpport 1957
|
||||
1:settingsdir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard
|
||||
1:angdir 1.000000
|
||||
1:moveflag 0.000000
|
||||
1:lock 0
|
||||
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
|
||||
@ -63,4 +52,4 @@ badchannels none
|
||||
angconv none
|
||||
globaloff 0.000000
|
||||
binsize 0.001000
|
||||
threaded 1
|
||||
|
||||
|
@ -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
|
||||
|
@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
git $1
|
||||
for i in sls*/; do
|
||||
cd $i
|
||||
echo $i
|
||||
git $1
|
||||
cd ..
|
||||
done
|
@ -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><>.
|
||||
|
||||
|
||||
|
1
manual/docs/html/angularCalibrationHowTo/WARNINGS
Normal file
@ -0,0 +1 @@
|
||||
No implementation found for style `graphicx'
|
@ -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 */
|
@ -0,0 +1,84 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
|
||||
<!--Converted with LaTeX2HTML 2012 (1.2)
|
||||
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 v2012">
|
||||
<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>September 28, 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-09-28
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
1
manual/docs/html/angularCalibrationHowTo/images.aux
Normal file
@ -0,0 +1 @@
|
||||
\relax
|
232
manual/docs/html/angularCalibrationHowTo/images.log
Normal file
@ -0,0 +1,232 @@
|
||||
This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 28 SEP 2018 11:35
|
||||
entering extended mode
|
||||
restricted \write18 enabled.
|
||||
%&-line parsing enabled.
|
||||
**./images.tex
|
||||
(./images.tex
|
||||
LaTeX2e <2011/06/27>
|
||||
Babel <v3.8m> and hyphenation patterns for english, dumylang, nohyphenation, lo
|
||||
aded.
|
||||
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/base/article.cls
|
||||
Document Class: article 2007/10/19 v1.4h Standard LaTeX document class
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/base/size10.clo
|
||||
File: size10.clo 2007/10/19 v1.4h 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/texlive/texmf-dist/tex/latex/base/ifthen.sty
|
||||
Package: ifthen 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
|
||||
) (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amssymb.sty
|
||||
Package: amssymb 2013/01/14 v3.01 AMS font symbols
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amsfonts.sty
|
||||
Package: amsfonts 2013/01/14 v3.01 Basic AMSFonts support
|
||||
\@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 106.
|
||||
)) (/usr/share/texlive/texmf-dist/tex/latex/graphics/graphicx.sty
|
||||
Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/graphics/keyval.sty
|
||||
Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
|
||||
\KV@toks@=\toks15
|
||||
) (/usr/share/texlive/texmf-dist/tex/latex/graphics/graphics.sty
|
||||
Package: graphics 2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/graphics/trig.sty
|
||||
Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
|
||||
) (/usr/share/texlive/texmf-dist/tex/latex/latexconfig/graphics.cfg
|
||||
File: graphics.cfg 2010/04/23 v1.9 graphics configuration of TeX Live
|
||||
)
|
||||
Package graphics Info: Driver file: dvips.def on input line 91.
|
||||
(/usr/share/texlive/texmf-dist/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/texlive/texmf-dist/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/texlive/texmf-dist/tex/latex/graphics/color.sty
|
||||
Package: color 2005/11/14 v1.0j Standard LaTeX Color (DPC)
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/latexconfig/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/texlive/texmf-dist/tex/latex/graphics/dvipsnam.def
|
||||
File: dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
|
||||
)) (/usr/share/texlive/texmf-dist/tex/latex/base/inputenc.sty
|
||||
Package: inputenc 2008/03/30 v1.1d 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/texlive/texmf-dist/tex/latex/amsfonts/umsa.fd
|
||||
File: umsa.fd 2013/01/14 v3.01 AMS symbols A
|
||||
)
|
||||
LaTeX Font Info: Try loading font information for U+msb on input line 141.
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsb.fd
|
||||
File: umsb.fd 2013/01/14 v3.01 AMS symbols B
|
||||
)
|
||||
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:
|
||||
1150 strings out of 495064
|
||||
14686 string characters out of 3182224
|
||||
55704 words of memory out of 3000000
|
||||
4358 multiletter control sequences out of 15000+200000
|
||||
5339 words of font info for 22 fonts, out of 3000000 for 9000
|
||||
14 hyphenation exceptions out of 8191
|
||||
25i,6n,26p,206b,199s stack positions out of 5000i,500n,10000p,200000b,50000s
|
||||
|
||||
Output written on images.dvi (18 pages, 4432 bytes).
|
116
manual/docs/html/angularCalibrationHowTo/images.pl
Normal file
@ -0,0 +1,116 @@
|
||||
# LaTeX2HTML 2012 (1.2)
|
||||
# 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 \mu m$">|;
|
||||
|
||||
$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/_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/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/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/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/{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="15" 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="17" 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;
|
||||
|
255
manual/docs/html/angularCalibrationHowTo/images.tex
Normal 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}
|
BIN
manual/docs/html/angularCalibrationHowTo/img1.png
Normal file
After Width: | Height: | Size: 195 B |
BIN
manual/docs/html/angularCalibrationHowTo/img10.png
Normal file
After Width: | Height: | Size: 185 B |
BIN
manual/docs/html/angularCalibrationHowTo/img11.png
Normal file
After Width: | Height: | Size: 206 B |
BIN
manual/docs/html/angularCalibrationHowTo/img12.png
Normal file
After Width: | Height: | Size: 157 B |
BIN
manual/docs/html/angularCalibrationHowTo/img13.png
Normal file
After Width: | Height: | Size: 331 B |
BIN
manual/docs/html/angularCalibrationHowTo/img14.png
Normal file
After Width: | Height: | Size: 28 KiB |
BIN
manual/docs/html/angularCalibrationHowTo/img15.png
Normal file
After Width: | Height: | Size: 27 KiB |
BIN
manual/docs/html/angularCalibrationHowTo/img16.png
Normal file
After Width: | Height: | Size: 61 KiB |
BIN
manual/docs/html/angularCalibrationHowTo/img17.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
manual/docs/html/angularCalibrationHowTo/img18.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
manual/docs/html/angularCalibrationHowTo/img2.png
Normal file
After Width: | Height: | Size: 314 B |
BIN
manual/docs/html/angularCalibrationHowTo/img3.png
Normal file
After Width: | Height: | Size: 176 B |
BIN
manual/docs/html/angularCalibrationHowTo/img4.png
Normal file
After Width: | Height: | Size: 242 B |
BIN
manual/docs/html/angularCalibrationHowTo/img5.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
manual/docs/html/angularCalibrationHowTo/img6.png
Normal file
After Width: | Height: | Size: 271 B |
BIN
manual/docs/html/angularCalibrationHowTo/img7.png
Normal file
After Width: | Height: | Size: 352 B |
BIN
manual/docs/html/angularCalibrationHowTo/img8.png
Normal file
After Width: | Height: | Size: 234 B |
BIN
manual/docs/html/angularCalibrationHowTo/img9.png
Normal file
After Width: | Height: | Size: 428 B |
84
manual/docs/html/angularCalibrationHowTo/index.html
Normal file
@ -0,0 +1,84 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
|
||||
<!--Converted with LaTeX2HTML 2012 (1.2)
|
||||
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 v2012">
|
||||
<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>September 28, 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-09-28
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
30
manual/docs/html/angularCalibrationHowTo/internals.pl
Normal file
@ -0,0 +1,30 @@
|
||||
# LaTeX2HTML 2012 (1.2)
|
||||
# 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;
|
||||
|
61
manual/docs/html/angularCalibrationHowTo/labels.pl
Normal file
@ -0,0 +1,61 @@
|
||||
# LaTeX2HTML 2012 (1.2)
|
||||
# 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 2012 (1.2)
|
||||
# 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;
|
||||
|
186
manual/docs/html/angularCalibrationHowTo/node1.html
Normal file
@ -0,0 +1,186 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
|
||||
<!--Converted with LaTeX2HTML 2012 (1.2)
|
||||
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 v2012">
|
||||
<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="15" 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="17" 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 <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="15" 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 mdeg at 12 keV and 0.5 mdeg at 30 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 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 <IMG
|
||||
WIDTH="14" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
|
||||
SRC="img11.png"
|
||||
ALT="$\mu$">m capillary with the detector shifted in 5 mdeg steps between 30.4 and 36.5 degrees. The 16 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 mdeg for the peak center and 0.22<IMG
|
||||
WIDTH="17" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
|
||||
SRC="img12.png"
|
||||
ALT="$\pm$">0.05 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 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-09-28
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
217
manual/docs/html/angularCalibrationHowTo/node2.html
Normal file
@ -0,0 +1,217 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
|
||||
<!--Converted with LaTeX2HTML 2012 (1.2)
|
||||
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 v2012">
|
||||
<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 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 s, and position shift
|
||||
<PRE>
|
||||
#setup angular calibration log mode
|
||||
> sls_detector_put angcallog 1
|
||||
#set exposure time to 1s
|
||||
> sls_detector_put exptime 1.
|
||||
#setup threshold scan
|
||||
> sls_detector_put scan0script position
|
||||
#setup the precision for the scan variable in the file name
|
||||
> 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
|
||||
> sls_detector_put scan0range 20 -60 -0.1
|
||||
#acquire the data
|
||||
> sls_detector_acquire
|
||||
#unset angular calibration log mode
|
||||
> 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 <A HREF="#fig:guiangcallog">1</A>) and setting up the motor position scan in the Actions tab (see figure <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-09-28
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
186
manual/docs/html/angularCalibrationHowTo/node3.html
Normal file
@ -0,0 +1,186 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
|
||||
<!--Converted with LaTeX2HTML 2012 (1.2)
|
||||
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 v2012">
|
||||
<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>
|
||||
> ./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 <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 <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 <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-09-28
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
68
manual/docs/html/angularCalibrationHowTo/node4.html
Normal file
@ -0,0 +1,68 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
|
||||
<!--Converted with LaTeX2HTML 2012 (1.2)
|
||||
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 v2012">
|
||||
<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-09-28
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
71
manual/docs/html/angularCalibrationHowTo/node5.html
Normal file
@ -0,0 +1,71 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
|
||||
<!--Converted with LaTeX2HTML 2012 (1.2)
|
||||
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 v2012">
|
||||
<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 2012 (1.2)
|
||||
<P>
|
||||
Copyright © 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 © 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-09-28
|
||||
<BR><HR>
|
||||
<ADDRESS>
|
||||
Thattil Dhanya
|
||||
2018-09-28
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
1
manual/docs/html/energyCalibrationHowTo/WARNINGS
Normal file
@ -0,0 +1 @@
|
||||
No implementation found for style `graphicx'
|
@ -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 */
|
@ -0,0 +1,84 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
|
||||
<!--Converted with LaTeX2HTML 2012 (1.2)
|
||||
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 v2012">
|
||||
<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>September 28, 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-09-28
|
||||
</ADDRESS>
|
||||
</BODY>
|
||||
</HTML>
|
1
manual/docs/html/energyCalibrationHowTo/images.aux
Normal file
@ -0,0 +1 @@
|
||||
\relax
|
439
manual/docs/html/energyCalibrationHowTo/images.log
Normal file
@ -0,0 +1,439 @@
|
||||
This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 28 SEP 2018 11:35
|
||||
entering extended mode
|
||||
restricted \write18 enabled.
|
||||
%&-line parsing enabled.
|
||||
**./images.tex
|
||||
(./images.tex
|
||||
LaTeX2e <2011/06/27>
|
||||
Babel <v3.8m> and hyphenation patterns for english, dumylang, nohyphenation, lo
|
||||
aded.
|
||||
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/base/article.cls
|
||||
Document Class: article 2007/10/19 v1.4h Standard LaTeX document class
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/base/size10.clo
|
||||
File: size10.clo 2007/10/19 v1.4h 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/texlive/texmf-dist/tex/latex/base/ifthen.sty
|
||||
Package: ifthen 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
|
||||
) (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amssymb.sty
|
||||
Package: amssymb 2013/01/14 v3.01 AMS font symbols
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amsfonts.sty
|
||||
Package: amsfonts 2013/01/14 v3.01 Basic AMSFonts support
|
||||
\@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 106.
|
||||
)) (/usr/share/texlive/texmf-dist/tex/latex/graphics/graphicx.sty
|
||||
Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/graphics/keyval.sty
|
||||
Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
|
||||
\KV@toks@=\toks15
|
||||
) (/usr/share/texlive/texmf-dist/tex/latex/graphics/graphics.sty
|
||||
Package: graphics 2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/graphics/trig.sty
|
||||
Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
|
||||
) (/usr/share/texlive/texmf-dist/tex/latex/latexconfig/graphics.cfg
|
||||
File: graphics.cfg 2010/04/23 v1.9 graphics configuration of TeX Live
|
||||
)
|
||||
Package graphics Info: Driver file: dvips.def on input line 91.
|
||||
(/usr/share/texlive/texmf-dist/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/texlive/texmf-dist/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/texlive/texmf-dist/tex/latex/graphics/color.sty
|
||||
Package: color 2005/11/14 v1.0j Standard LaTeX Color (DPC)
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/latexconfig/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/texlive/texmf-dist/tex/latex/graphics/dvipsnam.def
|
||||
File: dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
|
||||
)) (/usr/share/texlive/texmf-dist/tex/latex/base/inputenc.sty
|
||||
Package: inputenc 2008/03/30 v1.1d 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/texlive/texmf-dist/tex/latex/amsfonts/umsa.fd
|
||||
File: umsa.fd 2013/01/14 v3.01 AMS symbols A
|
||||
)
|
||||
LaTeX Font Info: Try loading font information for U+msb on input line 140.
|
||||
(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsb.fd
|
||||
File: umsb.fd 2013/01/14 v3.01 AMS symbols B
|
||||
)
|
||||
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:
|
||||
1161 strings out of 495064
|
||||
14835 string characters out of 3182224
|
||||
55704 words of memory out of 3000000
|
||||
4366 multiletter control sequences out of 15000+200000
|
||||
5339 words of font info for 22 fonts, out of 3000000 for 9000
|
||||
14 hyphenation exceptions out of 8191
|
||||
25i,6n,26p,836b,199s stack positions out of 5000i,500n,10000p,200000b,50000s
|
||||
|
||||
Output written on images.dvi (40 pages, 9712 bytes).
|
252
manual/docs/html/energyCalibrationHowTo/images.pl
Normal file
@ -0,0 +1,252 @@
|
||||
# LaTeX2HTML 2012 (1.2)
|
||||
# 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="15" 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="514" HEIGHT="654" 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="15" 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="15" 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="514" HEIGHT="654" 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="12" 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="15" 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 >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>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;
|
||||
|
391
manual/docs/html/energyCalibrationHowTo/images.tex
Normal 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}
|
BIN
manual/docs/html/energyCalibrationHowTo/img1.png
Normal file
After Width: | Height: | Size: 249 B |
BIN
manual/docs/html/energyCalibrationHowTo/img10.png
Normal file
After Width: | Height: | Size: 231 B |
BIN
manual/docs/html/energyCalibrationHowTo/img11.png
Normal file
After Width: | Height: | Size: 489 B |
BIN
manual/docs/html/energyCalibrationHowTo/img12.png
Normal file
After Width: | Height: | Size: 176 B |
BIN
manual/docs/html/energyCalibrationHowTo/img13.png
Normal file
After Width: | Height: | Size: 216 B |
BIN
manual/docs/html/energyCalibrationHowTo/img14.png
Normal file
After Width: | Height: | Size: 405 B |
BIN
manual/docs/html/energyCalibrationHowTo/img15.png
Normal file
After Width: | Height: | Size: 213 B |
BIN
manual/docs/html/energyCalibrationHowTo/img16.png
Normal file
After Width: | Height: | Size: 242 B |
BIN
manual/docs/html/energyCalibrationHowTo/img17.png
Normal file
After Width: | Height: | Size: 240 B |
BIN
manual/docs/html/energyCalibrationHowTo/img18.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img19.png
Normal file
After Width: | Height: | Size: 238 B |
BIN
manual/docs/html/energyCalibrationHowTo/img2.png
Normal file
After Width: | Height: | Size: 249 B |
BIN
manual/docs/html/energyCalibrationHowTo/img20.png
Normal file
After Width: | Height: | Size: 451 B |
BIN
manual/docs/html/energyCalibrationHowTo/img21.png
Normal file
After Width: | Height: | Size: 199 B |
BIN
manual/docs/html/energyCalibrationHowTo/img22.png
Normal file
After Width: | Height: | Size: 199 B |
BIN
manual/docs/html/energyCalibrationHowTo/img23.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img24.png
Normal file
After Width: | Height: | Size: 491 B |
BIN
manual/docs/html/energyCalibrationHowTo/img25.png
Normal file
After Width: | Height: | Size: 217 B |
BIN
manual/docs/html/energyCalibrationHowTo/img26.png
Normal file
After Width: | Height: | Size: 223 B |
BIN
manual/docs/html/energyCalibrationHowTo/img27.png
Normal file
After Width: | Height: | Size: 226 B |
BIN
manual/docs/html/energyCalibrationHowTo/img28.png
Normal file
After Width: | Height: | Size: 507 B |
BIN
manual/docs/html/energyCalibrationHowTo/img29.png
Normal file
After Width: | Height: | Size: 176 B |
BIN
manual/docs/html/energyCalibrationHowTo/img3.png
Normal file
After Width: | Height: | Size: 342 B |
BIN
manual/docs/html/energyCalibrationHowTo/img30.png
Normal file
After Width: | Height: | Size: 238 B |
BIN
manual/docs/html/energyCalibrationHowTo/img31.png
Normal file
After Width: | Height: | Size: 243 B |
BIN
manual/docs/html/energyCalibrationHowTo/img32.png
Normal file
After Width: | Height: | Size: 456 B |
BIN
manual/docs/html/energyCalibrationHowTo/img33.png
Normal file
After Width: | Height: | Size: 8.0 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img34.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img35.png
Normal file
After Width: | Height: | Size: 8.6 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img36.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img37.png
Normal file
After Width: | Height: | Size: 16 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img38.png
Normal file
After Width: | Height: | Size: 15 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img39.png
Normal file
After Width: | Height: | Size: 16 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img4.png
Normal file
After Width: | Height: | Size: 296 B |
BIN
manual/docs/html/energyCalibrationHowTo/img40.png
Normal file
After Width: | Height: | Size: 18 KiB |
BIN
manual/docs/html/energyCalibrationHowTo/img5.png
Normal file
After Width: | Height: | Size: 260 B |
BIN
manual/docs/html/energyCalibrationHowTo/img6.png
Normal file
After Width: | Height: | Size: 216 B |
BIN
manual/docs/html/energyCalibrationHowTo/img7.png
Normal file
After Width: | Height: | Size: 248 B |
BIN
manual/docs/html/energyCalibrationHowTo/img8.png
Normal file
After Width: | Height: | Size: 334 B |
BIN
manual/docs/html/energyCalibrationHowTo/img9.png
Normal file
After Width: | Height: | Size: 226 B |