Commit 4c4c71d3427ffc07d52e59c7eb46cfeb5505568e
1 parent
3e2c4550
Exists in
master
and in
98 other branches
Add test for #5689
Showing
7 changed files
with
191 additions
and
0 deletions
Show diff stats
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease2/MexPlot/content.txt
0 → 100644
... | ... | @@ -0,0 +1,43 @@ |
1 | +!1 : #5689 : Bug d'affichage lors d'un plot de MEX ELS | |
2 | + | |
3 | +!define path {../test/FitNesseRoot/ReleaseS/TmaAmda/ReLease2/MexPlot/} | |
4 | +!define workingPath {./PlotFitnesseResults/TMA_5689/} | |
5 | + | |
6 | +!2 Description de l'anomalie | |
7 | + | |
8 | +Bug d'affichage (remonté par Vincent) lors d'un plot de MEX ELS sur l'intervalle de temps: [20/02/07,26/02/07] | |
9 | + | |
10 | +!2 Description de la correction | |
11 | + | |
12 | +Correction de la synchronisation des données obtenus après resampling | |
13 | + | |
14 | +!2 Tests | |
15 | + | |
16 | +!3 Initialisation de l'espace de travail | |
17 | + | |
18 | +!|script|TestAmdaCommandLine| | |
19 | +|note|!- Suppression des éventuels résultats précédents générés -!| | |
20 | +|execute|rm|command|./plot_*|args| | |
21 | +|execute|rm -rf |command|${workingPath}|args| | |
22 | +|note|!- Création du répertoire de stockage des résultats -!| | |
23 | +|execute|mkdir -p |command|${workingPath}|args| | |
24 | + | |
25 | +!3 Exécution des scripts | |
26 | + | |
27 | +!|script|TestAmdaCommandLine| | |
28 | +|note|!-Plot de MEX ELS sur [20/02/07,26/02/07]-!| | |
29 | +|check|execute|amdaXMLRequestorTool|command|${path}request_5689_00.xml|args|0| | |
30 | +|note|!-Vérification de la présence du fichier et renommage du fichier pour comparaison complémentaire -!| | |
31 | +|check|execute|!-ls -!|command| plot_*.png |args|0| | |
32 | +|check|execute|mv|command|./plot_*.png ${workingPath}/plot_5689_00.png|args|0| | |
33 | +|note|!-Copie de la référence -!| | |
34 | +|check|execute|cp|command|${path}/plot_5689_00_REF.png ./${workingPath}|args|0| | |
35 | +|note|!-Génération fichier de différences graphiques entre image produite et image de référence-!| | |
36 | +|check|compare|${workingPath}/plot_5689_00_REF.png|Img1|${workingPath}/plot_5689_00.png|Img2|${workingPath}/diff_5689_00.png|ImgDiff|0| | |
37 | +|note|!-Comparaison de l'image produite et de l'image de référence-!| | |
38 | +|check|execute|diff|command|${workingPath}plot_5689_00_REF.png ${workingPath}/plot_5689_00.png|args|0| | |
39 | + | |
40 | +!2 Suivi des modifications | |
41 | + | |
42 | +----- | |
43 | +!contents -R2 -g -p -f -h | ... | ... |
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease2/MexPlot/plot_5689_00_REF.png
0 → 100644
930 KB
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease2/MexPlot/properties.xml
0 → 100644
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease2/MexPlot/request_5689_00.xml
0 → 100755
... | ... | @@ -0,0 +1,64 @@ |
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<request> | |
3 | + <params> | |
4 | + <param id="mex_els_spec_0"/> | |
5 | + </params> | |
6 | + <times> | |
7 | + <interval> | |
8 | + <startTime>2007050000000000</startTime> | |
9 | + <timeInterval>1970006000000000</timeInterval> | |
10 | + </interval> | |
11 | + </times> | |
12 | + <outputs> | |
13 | + <plot writeContextFile="true"> | |
14 | + <outputStructure>one-file</outputStructure> | |
15 | + <filePrefix>plot_1</filePrefix> | |
16 | + <page format="png" dimension="ISO A4" orientation="landscape" mode="color" superposeMode="false"> | |
17 | + <title/> | |
18 | + <layout type="vertical" panelHeight="0.5" panelSpacing="0" expand="false" onlyLowerTimeAxesLegend="true"/> | |
19 | + <panel id="1" index="0"> | |
20 | + <font/> | |
21 | + <title/> | |
22 | + <timePlot> | |
23 | + <legends/> | |
24 | + <params> | |
25 | + <param id="mex_els_spec_0"> | |
26 | + <spectro yAxis="y-left"/> | |
27 | + </param> | |
28 | + </params> | |
29 | + <axes> | |
30 | + <xAxis> | |
31 | + <timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true"> | |
32 | + <range extend="true"/> | |
33 | + <tick position="outwards" minorGrid="false" majorGrid="false"/> | |
34 | + <legend/> | |
35 | + </timeAxis> | |
36 | + </xAxis> | |
37 | + <yAxis> | |
38 | + <digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true"> | |
39 | + <range extend="true"/> | |
40 | + <tick position="outwards" minorGrid="false" majorGrid="false"/> | |
41 | + <legend/> | |
42 | + </digitalAxis> | |
43 | + <digitalAxis id="y-right" position="right" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true"> | |
44 | + <range extend="true"/> | |
45 | + <tick position="outwards" minorGrid="false" majorGrid="false"/> | |
46 | + <legend/> | |
47 | + </digitalAxis> | |
48 | + </yAxis> | |
49 | + <zAxis> | |
50 | + <colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true"> | |
51 | + <range extend="true"/> | |
52 | + <tick position="outwards" minorGrid="false" majorGrid="false"/> | |
53 | + <legend/> | |
54 | + </colorAxis> | |
55 | + </zAxis> | |
56 | + </axes> | |
57 | + <additionalObjects/> | |
58 | + <fills/> | |
59 | + </timePlot> | |
60 | + </panel> | |
61 | + </page> | |
62 | + </plot> | |
63 | + </outputs> | |
64 | +</request> | ... | ... |
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease2/content.txt
1 | 1 | !1 Release 21 |
2 | 2 | !2 Listes des anomalies corrigées lors de la Release 2 |
3 | 3 | * [[#5849: Download 2 parameters for TT][>Tt2Params]] |
4 | +* [[#5689: Bug d'affichage lors d'un plot de MEX ELS][>MexPlot]] | |
4 | 5 | !2 Listes des évolutions traitées lors de la Release 2 |
5 | 6 | * [[#5392: nom de mission / instrument][>AxisLegend]] |
6 | 7 | * [[#5744: implement new type of file reader : FileReaderNetCDF][>NetcdfLoader]] | ... | ... |
... | ... | @@ -0,0 +1,17 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="mex_els_energy"> | |
3 | + <gap_threshold>20</gap_threshold> | |
4 | + <get> | |
5 | + <vi name="mex:els:all"> | |
6 | + <baseParam name="EnergyTable" useNearestValue="true"> | |
7 | + <clb name="Etab0"/> | |
8 | + <clb name="Etab1"/> | |
9 | + <clb name="Etab2"/> | |
10 | + <clb name="Etab3"/> | |
11 | + <clb name="Etab4"/> | |
12 | + </baseParam> | |
13 | + </vi> | |
14 | + </get> | |
15 | + <process>#getClbInfo(#mex_els_decode($mex_els_all_EnergyTable;$mex_els_all_EnergyTable);0:Etab0;1:Etab1;2:Etab2;3:Etab3;4:Etab4)*7.5</process> | |
16 | + <output/> | |
17 | +</param> | ... | ... |
... | ... | @@ -0,0 +1,54 @@ |
1 | +<?xml version="1.0"?> | |
2 | +<param xml:id="mex_els_spec_0"> | |
3 | + <info> | |
4 | + <name>mex_els_spec</name> | |
5 | + <short_name>spectra</short_name> | |
6 | + <components/> | |
7 | + <units>counts</units> | |
8 | + <coordinates_system/> | |
9 | + <tensor_order/> | |
10 | + <si_conversion/> | |
11 | + <table> | |
12 | + <centerAutoTable variable="true" name="Energy" units="eV" centerName="mex_els_energy" log="false"/> | |
13 | + </table> | |
14 | + <fill_value/> | |
15 | + <ucd>phys.count;phys.electron</ucd> | |
16 | + <dataset_id>mex-els-all</dataset_id> | |
17 | + </info> | |
18 | + <gap_threshold>20</gap_threshold> | |
19 | + <get> | |
20 | + <vi name="mex:els:all"> | |
21 | + <baseParam name="EnergyTable" useNearestValue="true"> | |
22 | + <clb name="Etab0"/> | |
23 | + <clb name="Etab1"/> | |
24 | + <clb name="Etab2"/> | |
25 | + <clb name="Etab3"/> | |
26 | + <clb name="Etab4"/> | |
27 | + </baseParam> | |
28 | + <baseParam name="ELS"/> | |
29 | + <baseParam name="TimeCompres"/> | |
30 | + <baseParam name="EnergyCompres"/> | |
31 | + </vi> | |
32 | + <amdaParam name="mex_els_energy"/> | |
33 | + </get> | |
34 | + <process>#mex_els_decode(mexvex_els_calculate($mex_els_all_ELS,$mex_els_all_TimeCompres,$mex_els_all_EnergyCompres,0);$mex_els_all_EnergyTable)</process> | |
35 | + <output> | |
36 | + <plot> | |
37 | + <timePlot> | |
38 | + <params> | |
39 | + <param id="mex_els_spec_0"> | |
40 | + <spectro yAxis="y-left"/> | |
41 | + </param> | |
42 | + </params> | |
43 | + <axes> | |
44 | + <yAxis> | |
45 | + <digitalAxis id="y-left" scale="logarithmic"/> | |
46 | + </yAxis> | |
47 | + <zAxis> | |
48 | + <colorAxis scale="logarithmic"/> | |
49 | + </zAxis> | |
50 | + </axes> | |
51 | + </timePlot> | |
52 | + </plot> | |
53 | + </output> | |
54 | +</param> | ... | ... |