Skip to content

Commit

Permalink
cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
jmmuller committed Sep 25, 2024
1 parent 3d888d8 commit 06e24bd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
6 changes: 3 additions & 3 deletions MMVII/Doc/Programmer/NonLinearOptim.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1410,14 +1410,14 @@ \subsubsection{Topo survey equations}
The transformation from RTL to instrument local frame is:

\begin{equation}
T_{Instr} = R_{RTL \rightarrow Instr} \cdot (T_{RTL} - O_{RTL})
T_{Instr} = R_{RTL \rightarrow Instr} \cdot (T_{RTL} - S_{RTL})
\end{equation}

Where:

\begin{itemize}
\item $T_{Instr}$: target point in instrument local frame
\item $O_{RTL}$: station origin point in RTL SysCo
\item $S_{RTL}$: station origin point in RTL SysCo
\item $T_{RTL}$: target point in RTL SysCo
\item $R_{RTL \rightarrow Instr}$: rotation from RTL to instrument frame
\end{itemize}
Expand All @@ -1432,7 +1432,7 @@ \subsubsection{Topo survey equations}

\item {\tt cFormulaTopoHz}: $$ residual = \arctan\left(T_{Instr_X}, T_{Instr_Y}\right) - l $$
\item {\tt cFormulaTopoZen}:
$$ ref = 0.12 . \frac { hz\_dist\_ellips\left( T, O \right) }
$$ ref = 0.12 . \frac { hz\_dist\_ellips\left( T, S \right) }
{ 2 . earth\_radius} $$
$$ d_{hz} = \| T_{Instr_X}, T_{Instr_Y} \| $$
$$ residual = \arctan\left(d_{hz}, T_{Instr_Z}\right) - ref - l $$
Expand Down
3 changes: 0 additions & 3 deletions MMVII/apib11/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ PYBIND_INCLUDES=$(shell python3 -m pybind11 --includes)
MMV2_LIBNAME=P2007
MMV2_LIB=${MMV2_BINDIR}/lib${MMV2_LIBNAME}.a
MMV1_LIBS=${MMV1_LIBDIR}/libelise.a ${MMV1_LIBDIR}/libANN.a
## MacOS : may be -lstdc++fs should be replaced by -lc++experimental
EXT_LIBS=-lpthread -lX11 -lstdc++fs


# =========== Compiler & Flags
CXX=g++
Expand Down
2 changes: 1 addition & 1 deletion MMVII/apib11/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
ext_modules = [
Pybind11Extension("_MMVII",
all_cpp_api_files,
libraries = ['X11', 'Xext', 'm', 'dl', 'pthread', 'stdc++fs', 'gomp'],
libraries = ['X11', 'Xext', 'm', 'dl', 'pthread', 'stdc++fs', 'gomp', 'proj'],
library_dirs = [],
include_dirs = ['/usr/local/include', '.', '..', '../include/', '../ExternalInclude/eigen-3.4.0'],
language = 'c++',
Expand Down

0 comments on commit 06e24bd

Please sign in to comment.