Commit 65d4cc40 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

merger mmtest and pztest

parents 9214fee6 c41a1913
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)

export VERSION_MAJOR=1
export VERSION_MINOR=0
export VERSION_RELEASE=1
export VERSION_RELEASE=5

git_rev=$(shell git rev-parse --short HEAD 2> /dev/null)
ifeq "$(git_rev)" ""
+13 −13
Original line number Diff line number Diff line
@@ -12,51 +12,51 @@ with the center (0,0,0) at the sample position, see Fig.~\ref{fig:ella_top_view}
	the NSE Laboratory Frame. The frame center is at the sample position.
	Two NSE carriers are shown in blue. L1 - is the source to sample distance
	and L2 is the distance from the sample to the detector.
	The polar angle $\phi$ is measured with respect to the x-axis
	and the center of the of the detector is denoted by $\phi_0$}
	The polar angle $\varphi$ is measured with respect to the x-axis
	and the center of the of the detector is denoted by $\varphi_0$ (scattering angle).}
	\label{fig:ella_top_view}
\end{figure}
The x-axis is horizontal and points downstream from the source toward
sample. The z-axis is vertical pointing up, and the y-axis is
horizontal completing the right handed coordinate system.
The polar angle $\phi$ is measured with respect to the x-axis (polar
The polar angle $\varphi$ is measured with respect to the x-axis (polar
axis) and the azimuthal angle $\theta$ is measured in the y-z plane
with 0 coinciding with the y-axis and clockwise direction when looking
with $0^{\circ}$ coinciding with the y-axis and clockwise direction when looking
downstream with the neutron flux direction.


\subsection{The Detector Coordinate System}
The NSE detector can rotate in horizontal plane (x-y) around the
sample position from $\phi_0=[0,\phi_0^{max}]$, where $\phi_0^{max}$ is instrument specific.
sample position from $\varphi_0=[0,\varphi_0^{max}]$, where $\varphi_0^{max}$ is instrument specific.
\begin{figure}[h!]
	\centering
	\includegraphics[height=7cm]{detector_view}
	\caption[The detector view of the NSE Laboratory Frame]{The detector view of the NSE
	Laboratory Frame.  The spectrometer detector is at the straight configuration,  i.e.
	$\phi_0 = 0$. Neutron flux is pointing out of the page. Each detector pixel is labeled by a pair of indices $(i,j)$.
	$\varphi_0 = 0$. Neutron flux is pointing out of the page. Each detector pixel is labeled by a pair of indices $(i,j)$.
	The horizontal index $i$ is parallel to y-axis and the vertical index $j$ is anti-parallel to the z-axis.}
  \label{fig:ella_detector_view}
\end{figure}
The NSE detector pixels are labeled by a pair of integer indices $(i,j)$
that run from $(1,1)$ to $(NI, NJ)$, where in a typical configuration $NI=NJ=32$.
that run from $(1,1)$ to $(N_i, N_j)$, where in a typical configuration $N_i=N_j=32$.
The horizontal index $i$ is running parallel to the y-axis and the vertical one $j$
is running anti-parallel to the z-axis. The coordinates of
the center of a (i,j) pixel when the detector is at $\phi_0=0$ are given by
the center of a (i,j) pixel when the detector is at $\varphi_0=0$ are given by
\begin{subequations}
\label{eq:pixel_coordinates}
\begin{eqnarray}
  x_C & = & L2                       \\
  y_C & = & +(i-(NI+1)/2)\times W \\
  z_C & = & -(j-(NJ+1)/2) \times H
  y_C & = & +(i-(N_i+1)/2)\times W \\
  z_C & = & -(j-(N_j+1)/2) \times H
\end{eqnarray}
\end{subequations}
where W and H are pixel width and height.
And when the detector is rotated by the angle $\phi_0$ around the sample, the coordinates of the pixel (i,j) are now given
And when the detector is rotated by the angle $\varphi_0$ around the sample, the coordinates of the pixel (i,j) are now given
\begin{subequations}
\label{eq:pixel_coordinates_rotated}
\begin{eqnarray}
  x_R & = & x_C\cos\phi_0 - y_C\sin\phi_0 \\
  y_R & = & x_C\sin\phi_0 + y_C\cos\phi_0 \\
  x_R & = & x_C\cos\varphi_0 - y_C\sin\varphi_0 \\
  y_R & = & x_C\sin\varphi_0 + y_C\cos\varphi_0 \\
  z_R & = & z_C
\end{eqnarray}
\end{subequations}
+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ Throughout the document the following priorities are assumed:

\include{whatabout4pointecho_ins}

\include{reduction_parameters}

\end{appendices}


+245 B (8.5 KiB)
Loading image diff...
+57 −50
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
   viewBox="0 0 744.09448819 1052.3622047"
   id="svg11822"
   version="1.1"
   inkscape:version="0.91 r13725"
   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
   sodipodi:docname="detector_view.svg"
   inkscape:export-filename="./detector_view.png"
   inkscape:export-xdpi="90"
@@ -144,15 +144,15 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1.1164682"
     inkscape:cx="180.6899"
     inkscape:cx="256.35886"
     inkscape:cy="866.22383"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="true"
     inkscape:window-width="1920"
     inkscape:window-height="1176"
     inkscape:window-width="1440"
     inkscape:window-height="855"
     inkscape:window-x="0"
     inkscape:window-y="24"
     inkscape:window-y="1"
     inkscape:window-maximized="1">
    <inkscape:grid
       type="xygrid"
@@ -186,45 +186,48 @@
       inkscape:connector-curvature="0" />
    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="466.45511"
       y="420.22876"
       id="text12520"
       sodipodi:linespacing="125%"><tspan
       id="text12520"><tspan
         sodipodi:role="line"
         id="tspan12522"
         x="466.45511"
         y="420.22876">y</tspan></text>
         y="420.22876"
         style="font-size:40px;line-height:1.25">y</tspan></text>
    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:27.16168594px;line-height:50%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="189.94298"
       y="223.67485"
       id="text12512-6"
       sodipodi:linespacing="50%"><tspan
       id="text12512-6"><tspan
         sodipodi:role="line"
         id="tspan12514-7"
         x="189.94298"
         y="223.67485">Detector</tspan></text>
         y="223.67485"
         style="font-size:27.16168594px;line-height:0.5">Detector</tspan></text>
    <flowRoot
       xml:space="preserve"
       id="flowRoot12787"
       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:40px;line-height:125%;letter-spacing:0px;word-spacing:0px"><flowRegion
       style="font-style:normal;font-weight:normal;line-height:0.01%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
         id="flowRegion12789"><rect
           id="rect12791"
           width="320"
           height="300"
           x="60"
           y="262.36221" /></flowRegion><flowPara
         id="flowPara12793" /></flowRoot>    <text
         id="flowPara12793"
         style="font-size:40px;line-height:1.25"> </flowPara></flowRoot>    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:40px;line-height:100%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;text-anchor:start;text-align:start;writing-mode:lr;"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="460"
       y="282.36221"
       id="text12795"
       sodipodi:linespacing="100%"><tspan
       id="text12795"><tspan
         sodipodi:role="line"
         id="tspan12799" /></text>
         id="tspan12799"
         x="460"
         y="282.36221"
         style="font-size:40px;line-height:1"> </tspan></text>
    <rect
       style="fill:#00dceb;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:0.52999997"
       id="rect14042"
@@ -234,48 +237,52 @@
       y="282.36221" />
    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:14.99228764px;line-height:50%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="241.85669"
       y="276.86221"
       id="text14044"
       sodipodi:linespacing="50%"><tspan
       id="text14044"><tspan
         sodipodi:role="line"
         id="tspan14046"
         x="241.85669"
         y="276.86221">i=1</tspan></text>
         y="276.86221"
         style="font-size:17.50000005px;line-height:0.5">i=1</tspan></text>
    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:14.99228764px;line-height:50%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="405.85669"
       y="274.86221"
       id="text14044-9"
       sodipodi:linespacing="50%"><tspan
       id="text14044-9"><tspan
         sodipodi:role="line"
         id="tspan14046-3"
         x="405.85669"
         y="274.86221">i=NI</tspan></text>
         y="274.86221"
         style="font-size:17.50000005px;line-height:0.5">i=N<tspan
   style="font-size:17.50000005px;baseline-shift:sub"
   id="tspan61">i</tspan>  </tspan></text>
    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:14.99228764px;line-height:50%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="207.85669"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="204.49788"
       y="295.86221"
       id="text14044-3"
       sodipodi:linespacing="50%"><tspan
       id="text14044-3"><tspan
         sodipodi:role="line"
         id="tspan14046-4"
         x="207.85669"
         y="295.86221">j=1</tspan></text>
         x="204.49788"
         y="295.86221"
         style="font-size:17.5px;line-height:0.5">j=1</tspan></text>
    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:14.99228764px;line-height:50%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="202.85669"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="194.45967"
       y="472.36221"
       id="text14044-3-6"
       sodipodi:linespacing="50%"><tspan
       id="text14044-3-6"><tspan
         sodipodi:role="line"
         id="tspan14046-4-1"
         x="202.85669"
         y="472.36221">j=NJ</tspan></text>
         x="194.45967"
         y="472.36221"
         style="font-size:17.5px;line-height:0.5">j=N<tspan
   style="font-size:64.99999762%;baseline-shift:sub"
   id="tspan65">j</tspan> </tspan></text>
    <path
       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker12709)"
       d="m 340,382.3622 50,-55"
@@ -288,37 +295,37 @@
       inkscape:connector-curvature="0" />
    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:14.99228764px;line-height:50%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="384.85669"
       y="321.86221"
       id="text14044-1"
       sodipodi:linespacing="50%"><tspan
       id="text14044-1"><tspan
         sodipodi:role="line"
         id="tspan14046-7"
         x="384.85669"
         y="321.86221">(i,j)</tspan></text>
         y="321.86221"
         style="font-size:14.99228764px;line-height:0.5">(i,j)</tspan></text>
    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:29.65064621px;line-height:50%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="449.03372"
       y="320.13779"
       id="text14194"
       sodipodi:linespacing="50%"
       transform="scale(0.86818894,1.151823)"><tspan
         sodipodi:role="line"
         id="tspan14196"
         x="449.03372"
         y="320.13779">θ</tspan></text>
         y="320.13779"
         style="font-size:29.65064621px;line-height:0.5">θ</tspan></text>
    <text
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="358.20862"
       y="226.70377"
       id="text4227"
       sodipodi:linespacing="125%"><tspan
       id="text4227"><tspan
         sodipodi:role="line"
         id="tspan4229"
         x="358.20862"
         y="226.70377">z</tspan></text>
         y="226.70377"
         style="font-size:40px;line-height:1.25">z</tspan></text>
  </g>
</svg>
Loading