From 3bed403437bb4390a0ce532cc73f72106a6dc81a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 8 Nov 2023 22:01:10 +0100
Subject: [PATCH] detector1.ps now with Helvetica

---
 Doc/PhysRef/fig/drawing/detector1.ps | 71 +++++++++++++++++++---------
 1 file changed, 48 insertions(+), 23 deletions(-)

diff --git a/Doc/PhysRef/fig/drawing/detector1.ps b/Doc/PhysRef/fig/drawing/detector1.ps
index 7f641bc3d10..2341dbd4b4c 100644
--- a/Doc/PhysRef/fig/drawing/detector1.ps
+++ b/Doc/PhysRef/fig/drawing/detector1.ps
@@ -1,3 +1,16 @@
+%!PS-Adobe-1.0 EPSF-1.0
+
+newpath
+16 35 moveto
+587 35 lineto
+587 515 lineto
+16 515 lineto
+closepath
+1 1 1 setrgbcolor  % Set color to white
+fill               % Fill the path with white color
+
+%%Comment: Bounding box extracted by bboxx
+%%+:       A program by Dov Grobgeld 2003
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  FRIDA: fast reliable interactive data analysis                           %%
 %%  wups11a.ps: graphic macros                                               %%
@@ -393,7 +406,7 @@ WuGdict11a begin
    } def
 
 % we assume that image scripts are Latin1 encoded
-/Palatino-Roman        /MyFont             ISOLatin1Encoding ReEncode
+/Helvetica        /MyFont             ISOLatin1Encoding ReEncode
 
 
 %% Preset standard styles:
@@ -1599,18 +1612,13 @@ WuGdict11a begin
 
 %%  Position and scale:
 
-12 dup autolabel defsiz
+11.8 dup autolabel defsiz
 1 dup stdred
-3.4 -12 setnewpage newpage
+3. -12 setnewpage newpage
 
 1 1 language
 1 1 InfSet % plot fnam, info
 
-%%  Clear frame:
-
-Resets
-BoxBackground
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Mark "ecu", end of the customization section
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1683,7 +1691,7 @@ np -.2 -.3 mv 0 0 li .2 -.3 li st
 /d2da  .833 def
 /d2ahi d2da 4 mul def
 /d2alo d2da -2 mul def
-/d2x  10 def
+/d2x  12 def
 
 % frame
 np
@@ -1717,12 +1725,12 @@ black 1.5 [] lset
 np d2x d2phi -1.3 mul 0 p mv d2x d2phi 1.3 mul 0 p li st
 { d2x d2phi 1.3 mul 0 p offset
   np -.27 -.22 mv 0 0 li -.28 +.18 li st
- .2 .05 {()(j)g()(f)sb()} textLM } G
+ .2 .05 {()(j)g(, q)(y)sb()} textLM } G
 % detector alpha axis
 np d2x 0 d2alo d2da sub p mv d2x 0 d2ahi d2da add p li st
 { d2x 0 d2ahi d2da add p offset
   np -.27 -.2 mv 0 0 li .27 -.2 li st
- 0 .2 {()(a)g()(f)sb()} textCB } G
+ 0 .2 {()(a)g(, q)(z)sb()} textCB } G
 
 % labels
 { % pop
@@ -1749,19 +1757,36 @@ np d2x 0 d2alo d2da sub p mv d2x 0 d2ahi d2da add p li st
 
 % x axis
 black
-.5 [] lset np 4.5 0 0 p mv 6 0 0 p li st
-.5 [.1 .2] lset np 4.8 0 0 p mv d2x 0 0 p li st
+.5 [] lset np 4.6 0 0 p mv 8 0 0 p li st
+.5 [.12 .12] lset np 5.2 0 0 p mv d2x 0 0 p li st
 
-% scattered
+% scattered in xy plane
 /scphi d2phi .875 mul def
-/scalp d2ahi .375 mul def
-siemensred 1.5 [] lset
-np
-0 0 0 p mv
-d2x scphi scalp p li st
-siemensred .5 [.1 .1] lset
-np
-0 0 0 p mv
-d2x scphi 0 p li st
+/scalp d2ahi .625 mul def
+105   0  23 setRGBcolor
+/cfm { .63 mul } def
+.5 [] lset np 0 0 0 p mv d2x cfm scphi cfm 0 p li st
+.5 [.12 .18] lset np 0 0 0 p mv d2x scphi 0 p li st
+/cfm { .63 mul } def
+/ptfr
+
+% true scattering vector
+165   0  33 setRGBcolor
+/cfm { .83 mul } def
+1.5 [] lset np 0 0 0 p mv d2x cfm scphi cfm scalp cfm p li st
+1.5 [.18 .12] lset np 0 0 0 p mv d2x scphi scalp p li st
+
+% angle in xy plane
+0 102 153 setRGBcolor 1 [] lset
+{  5.5 0 0 p offset
+   np 0 0 mv 0 5 5 -90 -76 arc st
+   black
+   1 -.2 {()(j)g()(f)sb()} textCM } G
+{ /cfm { .53 mul } def
+   d2x cfm scphi cfm 0 p offset
+   np 0 0 mv -6 0 6 0 11.5 arc st
+   black
+   .4 .5 {()(a)g()(f)sb()} textCM } G
+
 
 end
-- 
GitLab