Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

Commit 2d6b7151 authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Updating the Moment analysis of 3M Jaune data

parent bb923bb4
......@@ -283,6 +283,24 @@ int main(int argc, char** argv)
std::cout << "<<RESULT>> moment xyyy: " << m_xyyy << std::endl;
std::cout << "<<RESULT>> moment yyyy: " << m_yyyy << std::endl;
#endif
file << "\\mu_0 = " << m_0 << std::endl;
file << "\\mu_x = " << m_x << std::endl;
file << "\\mu_y = " << m_y << std::endl;
file << "\\mu_{xx} = " << m_xx << std::endl;
file << "\\mu_{xy} = " << m_xy << std::endl;
file << "\\mu_{yy} = " << m_yy << std::endl;
file << "\\mu_{xxx} = " << m_xxx << std::endl;
file << "\\mu_{xxy} = " << m_xxy << std::endl;
file << "\\mu_{xyy} = " << m_xyy << std::endl;
file << "\\mu_{yyy} = " << m_yyy << std::endl;
#ifdef NOT
file << "\\mu_{xxxx} = " << m_xxxx << std::endl;
file << "\\mu_{xxxy} = " << m_xxxy << std::endl;
file << "\\mu_{xxyy} = " << m_xxyy << std::endl;
file << "\\mu_{xyyy} = " << m_xyyy << std::endl;
file << "\\mu_{yyyy} = " << m_yyyy << std::endl;
#endif
#else
// Options
bool with_cosine = args.is_defined("cosine");
......
<?xml version="1.0"?>
<alta>
<!-- This script file compute the fitting of the retro-reflecting materials
present in the ALTA library. This script file should be executed in
the sources directory of repository as all directories are relative.
It is also necessary to create a results/3d/retro directory to store
the resulting fits and exports to BRDF-explorer and matlab.
-->
<configuration>
<parameter name="lib-dir" value="./build" />
</configuration>
<!-- Compute the moments on the 15 degrees data slice -->
<action name="data2moments">
<!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_inci-15_BRDF_2D_retro_lobe.alta" />
<output name="./results/3d/retro/3M_jaune_inc-15.mnt" />
<!-- Define the data interpolant to use -->
<plugin type="data" name="data_interpolant" />
<!-- Parameters -->
</action>
<!-- Compute the moments on the 30 degrees data slice -->
<action name="data2moments">
<!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_inci-30_BRDF_2D_retro_lobe.alta" />
<output name="./results/3d/retro/3M_jaune_inc-30.mnt" />
<!-- Define the data interpolant to use -->
<plugin type="data" name="data_interpolant" />
<!-- Parameters -->
</action>
<!-- Compute the moments on the 60 degrees data slice -->
<action name="data2moments">
<!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR_inci-60_BRDF_2D_retro_lobe.alta" />
<output name="./results/3d/retro/3M_jaune_inc-60.mnt" />
<!-- Define the data interpolant to use -->
<plugin type="data" name="data_interpolant" />
<!-- Parameters -->
</action>
<!-- Convert the data from a TV_PROJ_DPHI parametrization to a TK_PROJ_DPHI one -->
<action name="data2data">
<!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR__clusterized_BRDF_retro_lobe.alta" />
<output name="/tmp/3M_jaune_inc-15.alta" />
<!-- Parameters -->
<parameter name="param" value="SCHLICK_TL_TK_PROJ_DPHI" />
<parameter name="min" value="[0.2, -2, -2]" />
<parameter name="max" value="[0.3, 2, 2]" />
</action>
<!-- Compute the moments on the 15 degrees data slice -->
<action name="data2moments">
<!-- Input and output arguments of the action -->
<input name="/tmp/3M_jaune_inc-15.alta" />
<output name="./results/3d/retro/3M_jaune_inc-15_TK.mnt" />
<!-- Define the data interpolant to use -->
<plugin type="data" name="data_interpolant" />
<!-- Parameters -->
<parameter name="dim" value="[1, 2]" />
</action>
<!-- Convert the data from a TV_PROJ_DPHI parametrization to a TK_PROJ_DPHI one -->
<action name="data2data">
<!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR__clusterized_BRDF_retro_lobe.alta" />
<output name="/tmp/3M_jaune_inc-30.alta" />
<!-- Parameters -->
<parameter name="param" value="SCHLICK_TL_TK_PROJ_DPHI" />
<parameter name="min" value="[0.5, -2, -2]" />
<parameter name="max" value="[0.6, 2, 2]" />
</action>
<!-- Compute the moments on the 15 degrees data slice -->
<action name="data2moments">
<!-- Input and output arguments of the action -->
<input name="/tmp/3M_jaune_inc-30.alta" />
<output name="./results/3d/retro/3M_jaune_inc-30_TK.mnt" />
<!-- Define the data interpolant to use -->
<plugin type="data" name="data_interpolant" />
<!-- Parameters -->
<parameter name="dim" value="[1, 2]" />
</action>
<!-- Convert the data from a TV_PROJ_DPHI parametrization to a TK_PROJ_DPHI one -->
<action name="data2data">
<!-- Input and output arguments of the action -->
<input name="../papers/retro/mesures/original/3M_jaune/3d/633nm/Fichiers\ definitifs/densify_helmholtz/3M_jaune_3D+3DS+3DR__clusterized_BRDF_retro_lobe.alta" />
<output name="/tmp/3M_jaune_inc-60.alta" />
<!-- Parameters -->
<parameter name="param" value="SCHLICK_TL_TK_PROJ_DPHI" />
<parameter name="min" value="[0.9, -2, -2]" />
<parameter name="max" value="[1.1, 2, 2]" />
</action>
<!-- Compute the moments on the 15 degrees data slice -->
<action name="data2moments">
<!-- Input and output arguments of the action -->
<input name="/tmp/3M_jaune_inc-60.alta" />
<output name="./results/3d/retro/3M_jaune_inc-60_TK.mnt" />
<!-- Define the data interpolant to use -->
<plugin type="data" name="data_interpolant" />
<!-- Parameters -->
<parameter name="dim" value="[1, 2]" />
</action>
</alta>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment