Skip to content

Commit

Permalink
Update doc for ObjCoordWorld/ObjMesInstr
Browse files Browse the repository at this point in the history
  • Loading branch information
jmmuller committed Jan 17, 2025
1 parent 0b9a7bd commit cce033e
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
23 changes: 11 additions & 12 deletions MMVII/Doc/CommandReferences/SysCo.tex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ \section{Introduction}
\item \textbf{Proj}: any georeferenced system supported by the \href{https://proj.org}{PROJ} library
\end{itemize}

When SysCo is known, its definition is recorded into the file \texttt{CurSysCo.xml}, in \texttt{Ori} and \texttt{PointsMeasure} directories.
When SysCo is known, its definition is recorded into the file \texttt{CurSysCo.xml}, in \texttt{Ori} and \texttt{ObjCoordWorld} directories.

%This file can be copied into \texttt{MMVII-PhgrProj/SysCo/} with a short name to be used in next commands.
%Example: copy \texttt{CurSysCo.xml} as \texttt{MMVII-PhgrProj/SysCo/MyCRS.xml}, to be able to use \texttt{MyCRS} as a SysCo name.
Expand Down Expand Up @@ -249,15 +249,15 @@ \subsection{3D points file}
\\

To import these coordinates in \CdPPP\ we use the \texttt{ImportGCP} command, where we give the text format
(additional\_info, name, x, y, z), the name of the resulting \texttt{PointsMeasure} and the coordinates SysCo.
(additional\_info, name, x, y, z), the name of the resulting \texttt{ObjCoordWorld} and the coordinates SysCo.
We also specify that the points that have '0' for their additional\_info are free points, that the sigma for
known points is 0.001m and that lines starting with '*' are comment lines.

\begin{lstlisting}
MMVII ImportGCP inputs/coords.txt ANXYZ InitL93 ChSys=[L93] AddInfoFree=0 Sigma=0.001 Comment=*
\end{lstlisting}

In the resulting file \texttt{MMVII-PhgrProj/PointsMeasure/InitL93/MesGCP-coords.xml},
In the resulting file \texttt{MMVII-PhgrProj/ObjCoordWorld/InitL93/MesGCP-coords.xml},
the points PtA and PtD have a set \texttt{\_\_Opt\_\_Sigma2} equivalent to $\sigma = 0.001 m$ ,
the points PtB and PtC have no \texttt{\_\_Opt\_\_Sigma2}, making them free points.

Expand Down Expand Up @@ -293,14 +293,14 @@ \subsection{Auto RTL SysCo}

\begin{comment}
\subsection{SysCo shortcut}
The SysCo file \texttt{MMVII-PhgrProj/PointsMeasure/InitRTL/CurSysCo.xml}, created by \texttt{ImportGCP}
The SysCo file \texttt{MMVII-PhgrProj/ObjCoordWorld/InitRTL/CurSysCo.xml}, created by \texttt{ImportGCP}
can be used to create a shortcut name for \texttt{RTL*657700*6860700*0*IGNF:LAMB93}.

We just have to copy it as \texttt{MMVII-PhgrProj/SysCo/RTL.xml} to be able to designate this SysCo
simply as \texttt{RTL} for the rest of the example.

\begin{lstlisting}
cp MMVII-PhgrProj/PointsMeasure/InitRTL/CurSysCo.xml MMVII-PhgrProj/SysCo/RTL.xml
cp MMVII-PhgrProj/ObjCoordWorld/InitRTL/CurSysCo.xml MMVII-PhgrProj/SysCo/RTL.xml
\end{lstlisting}
\end{comment}

Expand Down Expand Up @@ -367,25 +367,24 @@ \subsection{Adjustment}
\begin{verbatim}
== Mandatory unnamed args : ==
* string [Topo,In] :: Dir for Topo measures
* string [PointsMeasure,In] :: Dir for points initial coordinates
* string [Topo,Out] :: Dir for Topo measures output
* string [PointsMeasure,Out] :: Dir for points final coordinates
* std::vector<std::vector<std::string>> :: GCP ground coords and sigma factor,
SG=0 fix, SG<0 schurr elim, SG>0
and optional output dir [[Folder,SigG,FOut?],...]]
== Optional named args : ==
* [Name=GCPW] double :: Constrained GCP weight factor (default: 1)
* [Name=DataDir] string :: Default data directories ,[Default=Std]
* [Name=NbIter] int :: Number of iterations ,[Default=10]
* [Name=GCPFilter] string :: Pattern to filter GCP by name
* [Name=GCPFilterAdd] string :: Pattern to filter GCP by additional info
* [Name=GCPDirOut] string [PointsMeasure,Out] :: Dir for output GCP
* [Name=LVM] double :: Levenberg–Marquardt parameter (to have better conditioning
of least squares) ,[Default=0]
of least squares) ,[Default=0]
\end{verbatim}

In our example, the input topo directory is \texttt{Obs1} and the input PointsMeasure is \texttt{InitRTL}.
In our example, the input topo directory is \texttt{Obs1} and the input ObjCoordWorld is \texttt{InitRTL}.
We give output directories names for topo and points.
\begin{lstlisting}
MMVII TopoAdj Obs1 InitRTL Obs1_out FinalRTL
MMVII TopoAdj Obs1 Obs1_out [[InitRTL,1,FinalRTL]]
\end{lstlisting}

The final $\sigma_0$ value should be around 1 if everything goes well.
Expand Down
5 changes: 3 additions & 2 deletions MMVII/Doc/Generalities/ProjectManag.tex
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,9 @@ \section{General data organization}
\item for each kind of processing, there exist a subfolder corresponding to the "nature"
of the data stored;
\item in the example there is of folder for orientation {\tt Ori}, one for point measurement
{\tt PointsMeasure}, one fore handling meta data {\tt MetaData}, one for storing reports
\item in the example there is of folder for orientation {\tt Ori}, one for points 3d coordinates
{\tt ObjCoordWorld}, one for point measurement
{\tt ObjMesInstr}, one fore handling meta data {\tt MetaData}, one for storing reports
{\tt Reports}, all the name of this subfolder are defined by {\tt MMVII} and cannot be changed
by the user;
Expand Down
2 changes: 1 addition & 1 deletion MMVII/Doc/Methods/Line-Detection-Theory.tex
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ \section{The \PPP command }
\item for distorsion correction we will look for intrisic calibration in
folder {\tt MMVII-PhgrProj/Ori/BA\_311\_/} ;

\item the result will be stored in folder {\tt MMVII-PhgrProj/PointsMeasure/Fils};
\item the result will be stored in folder {\tt MMVII-PhgrProj/ObjMesInstr/Fils};
\end{itemize}

The result will be stored in two way :
Expand Down
10 changes: 5 additions & 5 deletions MMVII/Doc/Tutorial/UseCase01.tex
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ \subsubsection{Extract the target}
\end{lstlisting}

Note the parameter {\tt DiamMin=8} necessary here because downscaling has created relatively small targets.
The result are written in a subfolder of {\tt MMVII-PhgrProj/PointsMeasure/}, by default it's the subfolder
The result are written in a subfolder of {\tt MMVII-PhgrProj/ObjMesInstr/}, by default it's the subfolder
{\tt Std/}, that contains now $2$ files :

\begin{itemize}
Expand All @@ -382,13 +382,13 @@ \subsubsection{Extract the target}
\label{fig:CodeT:Panel}
\end{figure}

It's possible, to change the destination of result using parameter {\tt OutPointsMeasure}.
It's possible, to change the destination of result using parameter {\tt OutObjMesInstr}.
Using pattern, its possible to run the research on all the image of the dataset, computation will be parelized .
Like every command {\tt MMVII}, it's possible to restrict the number of processor using the optionnal parameter
{\tt NbProc} :

\begin{lstlisting}
MMVII CodedTargetCircExtract ".*_Scaled.tif" CERN_Nbb14_Freq14_Hamm1_Run1000_1000_FullSpecif.xml DiamMin=8 NbProc=2 OutPointsMeasure=Test
MMVII CodedTargetCircExtract ".*_Scaled.tif" CERN_Nbb14_Freq14_Hamm1_Run1000_1000_FullSpecif.xml DiamMin=8 NbProc=2 OutObjMesInstr=Test
\end{lstlisting}


Expand All @@ -413,7 +413,7 @@ \subsubsection{For one camera}
something like :

\begin{lstlisting}
cp Data-Aux/MesGCP-AICON-CERN-Pannel.xml MMVII-PhgrProj/PointsMeasure/Test/
cp Data-Aux/MesGCP-AICON-CERN-Pannel.xml MMVII-PhgrProj/ObjCoordWorld/Test/
\end{lstlisting}

And now we can write again:
Expand Down Expand Up @@ -613,7 +613,7 @@ \subsection{Complete the target}
validate the uncoded targets :

\begin{lstlisting}
MMVII CodedTargetCompleteUncoded .*_Scaled.tif BA 1.0 InPointsMeasure=Test
MMVII CodedTargetCompleteUncoded .*_Scaled.tif BA 1.0 InObjMesInstr=Test
\end{lstlisting}

All the measure are stored in the folder {\tt Completed} (by default). We can make a
Expand Down

0 comments on commit cce033e

Please sign in to comment.