tikz-palattice (25feb15)

git-svn-id: svn://tug.org/texlive/trunk@36382 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 25 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/tikz-palattice/elsa.tex b/Master/texmf-dist/doc/latex/tikz-palattice/elsa.tex
index fa71259bdcb..061a3dc40b1 100644
--- a/Master/texmf-dist/doc/latex/tikz-palattice/elsa.tex
+++ b/Master/texmf-dist/doc/latex/tikz-palattice/elsa.tex
@@ -35,7 +35,7 @@
 \tikzset{biggestlabel/.style={font=\bfseries\Huge,scale=2.5, align=center}}
 \tikzset{biglabel/.style={font=\bfseries\Huge,scale=2, align=center}}
 \tikzset{mediumlabel/.style={font=\huge,scale=2, align=center}}
-\tikzset{smalllabel/.style={font=\Large,scale=2, align=center}}
+\tikzset{smalllabel/.style={font=\Large,scale=2.2, align=center}}
 
 
 
@@ -54,7 +54,7 @@
 % "switch labels off":
 %\setlabelcolor{white}
 
-\drawrule{(58,-7)}[5][2][0.2]
+\drawrule{(58,-7)}[5][3][0.3]
 \setangle{180}
 \start{(0,0)}
 
@@ -62,7 +62,8 @@
 %LINAC2
 %-----------------------------------
 \turnlabels
-\source{\IfLanguageName{ngerman}{Quelle}{Source} pol. $e^-$}{1}
+\source{}{1}
+\savecoordinate{PolQ}[center]
 \drift{2.5}
 \drift{0.5} % wand
 \source{}{0.2}
@@ -94,12 +95,13 @@
 \quadrupole{Q8}{\quadl}
 \drift{3}
 \savecoordinate{BoosterInj}
-% \begin{fade}[0]
-%   \drift{30}
-% \end{fade}
-%text
+
+%title
 \node[mediumlabel, anchor=north, yshift=-1cm] at (L2label)
 {LINAC 2\\{\Large \SI{26}{\MeV}}};
+\node[smalllabel, anchor=west, xshift=4mm] at (PolQ)
+{\IfLanguageName{ngerman}{Quelle}{Source of} pol.
+  $e^-$};
 
 
 %-----------------------------------
@@ -111,9 +113,7 @@
 \drift{0.44}
 \quadrupole{Q7}{\quadl}
 \drift{0.2}
-%\turnlabels
 \quadrupole{Q6}{\quadl}
-%\turnlabels
 \drift{0.35}
 \dipole{M2}{0.3}{45}
 \drift{1.1}
@@ -151,7 +151,8 @@
 \drift{1.3}
 \rotate{180}
 \source{}{0.5}
-%text
+
+%title
 \node[mediumlabel, xshift=-1cm, anchor=east] at (L1label)
 {LINAC 1\\{\Large \SI{20}{\MeV}}};
 
@@ -167,13 +168,11 @@
 \quadrupole{QT1}{\quadl}
 \drift{0.2}
 \quadrupole{QT2}{\quadl}
-\drift{0.7}
+\drift{0.45}
 \turnlabels
 \savecoordinate{bestrahlung}
-\def\bestrl{0.25}
-\drift{\bestrl}
-\draw [fill=none] (bestrahlung) +(-\bestrl,-\bestrl) rectangle +(\bestrl,\bestrl);
-%text
+\beamdump{}{0.5}
+%title
 \node[smalllabel, yshift=5mm, anchor=east, text width=3cm] at (bestrahlung)
 {\IfLanguageName{ngerman}{Bestrahlungs\-platz}{irradiation area}};
 
@@ -242,8 +241,10 @@
 \dipole{M12}{4.0056}{-30}[s][0.6]
 \drift{0.46725}
 \end{scope}
+
 %title
-\path (links) -- (rechts) node[midway,biggestlabel, text width=6cm] {Booster- Synchrotron\\{\SIrange{0.5}{1.2}{\GeV}}};
+\path (links) -- (rechts) node[midway,biggestlabel, text width=6cm] {Booster-
+  Synchrotron\\{\SIrange{0.5}{1.2}{\GeV}}}; %\\{\it\SI{120}{\GeV\per\s}}
 
 
 
@@ -359,7 +360,7 @@
 \rotatelabels{-72}[east]
 \quadrupole{QD7}{0.4997}
 \drift{0.41215}
-\kicker{MSE23}{0.90027}%{-4.86172}
+\kicker{MSE23}{0.90027}
 \savecoordinate{ELSA_extract_neu}
 \drift{0.04893}
 \rotatelabels{0}
@@ -490,7 +491,7 @@
 \quadrupole{QD23}{0.4997}
 
 \drift{0.21}
-\kicker{MSE23}{0.9}%{-5.00994}
+\kicker{MSE23}{0.9}
 \savecoordinate{ELSA_extract}
 \drift{0.3}
 
@@ -548,7 +549,7 @@
 
 %title - aligned between M29 and QF14 via \savecoordinate
 \draw[draw=none] (links) -- (rechts) node[midway, biggestlabel]
-{ELSA Stretcherring\\{\SIrange{0.5}{3.2}{\GeV}}};
+{ELSA Stretcherring\\{\SIrange{0.5}{3.2}{\GeV}}}; %\\{\it\SI{6}{\GeV\per\s}}
 
 
 %-----------------------
@@ -565,9 +566,10 @@
   \drift{3.9}
   \beamdump{}{0.25}[0.25]
 \end{scope}
-%label
+%title
 \node[smalllabel, anchor=east, text width=4cm] at (comptonlabel)
 {Compton-\\{Polarimeter}};
+
 %------------------------------
 % Syli-Beamline (Streak-Kamera)
 %------------------------------
@@ -579,7 +581,7 @@
   \savecoordinate{sylilabel}
   \beamdump{}{1.25}[0.5]
 \end{scope}
-% label
+% title
 \node[smalllabel, anchor=west, yshift=1cm, text width=4cm] at (sylilabel)
 {\IfLanguageName{ngerman}{Synchrotronlicht}{synchrotron light}\\\IfLanguageName{ngerman}{Diagnoseplatz}{diagnostic area}};
 
@@ -589,7 +591,6 @@
 %-----------------------
 \goto{ELSA_extract}
 \turnlabels
-%\setangle{195-5.00994}
 \rotate{-8}
 \drift{0.2}
 %----
@@ -663,7 +664,6 @@
 %BGO-OD
 %-------------------
   \goto{MB1}
-  %\setangle{175}
   \rotate{-10.8-11}
   \turnlabels
   \drift{1.03}                                                               
@@ -694,7 +694,7 @@
   \beamdump{\IfLanguageName{ngerman}{Photonenkamera}{photon camera}}{0.4}[0.2]
   \end{scope}
 
-  % label
+  % title
   \node[mediumlabel, anchor=east, yshift=-0.7cm, xshift=-0.3cm] at (BGOlabel) {BGO-OD};
 
 
@@ -722,7 +722,7 @@
 \savecoordinate{NEWSFlabel}
 \drift{2.77607}
 \beamdump{}{0.4}
-  % title
+  %title
   \node[smalllabel, anchor=north, yshift=-5mm, text width=4.5cm] at (NEWSFlabel)
   {\IfLanguageName{ngerman}{Messplatz für}{area
       for}\\\IfLanguageName{ngerman}{Detektortests}{detector