Skip to content

Commit 77d726f

Browse files
bourgeslbourgesl
committed
updated test files (compact mode)
1 parent ddd9722 commit 77d726f

14 files changed

+1962
-1976
lines changed

‎rules/Failures.xml‎

Lines changed: 1860 additions & 1860 deletions
Large diffs are not rendered by default.

‎src/main/java/fr/jmmc/oitools/model/Rule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public enum Rule {
8787
"fix the UNFLAGGED *ERR column invalid values (negative values set to NaN)",
8888
Const.JMMC,
8989
RuleDataType.VALUE_ROW_COL,
90-
"Fixed value at index {{COL}} for column '{{MEMBER}}' line {{ROW}}, found '{{VALUE}} set to NaN (should be > 0 or NaN or flagged out)"
90+
"Fixed value at index {{COL}} for column '{{MEMBER}}' line {{ROW}}, found '{{VALUE}}' set to NaN (should be > 0 or NaN or flagged out)"
9191
),
9292
GENERIC_COL_FORMAT("check if the column format matches the expected format (data type and dimensions)",
9393
"V2.4§1",

‎src/main/java/fr/jmmc/oitools/model/RuleFailure.java‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -137,39 +137,34 @@ public Object getField(final RuleFailureField field) {
137137

138138
/* --- KEY --- */
139139
/**
140-
* Return the validation rule
141140
* @return validation rule
142141
*/
143142
public Rule getRule() {
144143
return rule;
145144
}
146145

147146
/**
148-
* Return the FileRef
149147
* @return FileRef
150148
*/
151149
public FileRef getFileRef() {
152150
return fileRef;
153151
}
154152

155153
/**
156-
* Return the extName
157154
* @return extName
158155
*/
159156
public String getExtName() {
160157
return extName;
161158
}
162159

163160
/**
164-
* Return the extNb
165161
* @return extNb
166162
*/
167163
public int getExtNb() {
168164
return extNb;
169165
}
170166

171167
/**
172-
* Return the member
173168
* @return member
174169
*/
175170
public String getMember() {
@@ -178,7 +173,6 @@ public String getMember() {
178173

179174
/* --- SEVERITY --- */
180175
/**
181-
* Return the message severity
182176
* @return message severity
183177
*/
184178
public Severity getSeverity() {
@@ -243,20 +237,15 @@ public StringBuilder toString(final StringBuilder sb) {
243237
sb.append(getFileRef().getAbsoluteFilePath());
244238
}
245239
sb.append('\t');
246-
if (getExtNb() >= 0 && getExtName() == null) {
247-
sb.append("HDU").append('\t');
248-
sb.append(getExtNb()).append('\t');
249-
} else if (getExtNb() >= 0) {
250-
sb.append(getExtName()).append('\t');
240+
if (getExtNb() >= 0) {
241+
sb.append((getExtName() == null) ? "HDU" : getExtName()).append('\t');
251242
sb.append(getExtNb()).append('\t');
252243
}
253244

254245
if (getMember() != null) {
255246
sb.append(getMember());
256247
}
257248
sb.append('\t');
258-
259-
// sb.append(formatMessage()).append('\t');
260249
return sb;
261250
}
262251

@@ -266,7 +255,6 @@ public StringBuilder toString(final StringBuilder sb) {
266255
* @return a XML representation of this class
267256
*/
268257
public StringBuilder toXML(StringBuilder sb) {
269-
270258
sb.append(" <severity>").append(getSeverity()).append("</severity>\n");
271259

272260
if (getRule() != null) {
@@ -289,7 +277,6 @@ public StringBuilder toXML(StringBuilder sb) {
289277
if (getMember() != null) {
290278
sb.append(" <member>").append(getMember()).append("</member>\n");
291279
}
292-
293280
return sb;
294281
}
295282
}

‎src/main/java/fr/jmmc/oitools/model/Severity.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ public String toString() {
5454
return label;
5555
}
5656

57+
public boolean isHigher(final Severity other) {
58+
return this.ordinal() > other.ordinal();
59+
}
60+
5761
/**
5862
* Method to sort on this Enum
5963
* @return Const.CMP_NAME

‎src/test/resources/ref/GRAVI.2016-06-23T03:10:17.458_singlesciviscalibrated.fits-formatted.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1797,18 +1797,18 @@
17971797
<column><name>INT_TIME</name><description>Integration time</description><type>D</type><unit>s|sec|second|seconds</unit><min>0.0</min><max>210.0</max></column>
17981798
<column><name>VISDATA</name><description>raw complex visibilities</description><type>C</type><unit>e</unit></column>
17991799
<column><name>VISERR</name><description>error in raw complex visibilities</description><type>C</type><unit>e</unit></column>
1800-
<column><name>VISAMP</name><description>visibility amplitude</description><type>D</type><unit></unit><min>0.0</min><max>0.5751971329623402</max></column>
1801-
<column><name>VISAMPERR</name><description>error in visibility amplitude</description><type>D</type><unit></unit><min>0.008911338651039883</min><max>1.4305870843358925E10</max></column>
1802-
<column><name>VISPHI</name><description>visibility phase</description><type>D</type><unit>deg|degree|degrees</unit><min>-179.8341943067733</min><max>179.9119788752143</max></column>
1803-
<column><name>VISPHIERR</name><description>error in visibility phase</description><type>D</type><unit>deg|degree|degrees</unit><min>0.5810259953834308</min><max>5.729577951308232E11</max></column>
1800+
<column><name>VISAMP</name><description>visibility amplitude</description><type>D</type><unit></unit><min>0.008466932998664719</min><max>0.5751971329623402</max></column>
1801+
<column><name>VISAMPERR</name><description>error in visibility amplitude</description><type>D</type><unit></unit><min>0.008911338651039883</min><max>0.306093928372905</max></column>
1802+
<column><name>VISPHI</name><description>visibility phase</description><type>D</type><unit>deg|degree|degrees</unit><min>-107.75289645528588</min><max>129.4273246822763</max></column>
1803+
<column><name>VISPHIERR</name><description>error in visibility phase</description><type>D</type><unit>deg|degree|degrees</unit><min>0.5810259953834308</min><max>112.14271834662883</max></column>
18041804
<column><name>UCOORD</name><description>U coordinate of the data</description><type>D</type><unit>m|meter|meters</unit><min>-12.116311186339276</min><max>8.088126862517592</max></column>
18051805
<column><name>VCOORD</name><description>V coordinate of the data</description><type>D</type><unit>m|meter|meters</unit><min>-31.30747484513021</min><max>20.876115084633852</max></column>
18061806
<column><name>STA_INDEX</name><description>station numbers contributing to the data</description><type>I</type><unit></unit><min>1</min><max>13</max></column>
18071807
<column><name>FLAG</name><description>flag</description><type>L</type><unit></unit></column>
18081808
<column><name>RVIS</name><description>Complex coherent flux (Real) in units of TUNITn</description><type>D</type><unit>e</unit><min>-61299.76693427514</min><max>53625.50728021527</max></column>
1809-
<column><name>RVISERR</name><description>Error RVIS</description><type>D</type><unit>e</unit><min>47.40801093459652</min><max>1.0E10</max></column>
1809+
<column><name>RVISERR</name><description>Error RVIS</description><type>D</type><unit>e</unit><min>47.40801093459652</min><max>2805.7913182604216</max></column>
18101810
<column><name>IVIS</name><description>Complex coherent flux (Imaginary) in units of TUNITn</description><type>D</type><unit>e</unit><min>-45065.15790857806</min><max>45612.9420031075</max></column>
1811-
<column><name>IVISERR</name><description>Error IVIS</description><type>D</type><unit>e</unit><min>26.699232769101744</min><max>1.0E10</max></column>
1811+
<column><name>IVISERR</name><description>Error IVIS</description><type>D</type><unit>e</unit><min>26.699232769101744</min><max>2286.313572365395</max></column>
18121812
</columns>
18131813
<table>
18141814
<tr>
@@ -1837,7 +1837,7 @@
18371837
<column><name>MJD</name><description>Modified Julian Day (start date of observation)</description><type>D</type><unit>d|day|days</unit><min>57562.1339081338</min><max>57562.135323171286</max></column>
18381838
<column><name>INT_TIME</name><description>Integration time</description><type>D</type><unit>s|sec|second|seconds</unit><min>0.0</min><max>210.0</max></column>
18391839
<column><name>VIS2DATA</name><description>squared visibility</description><type>D</type><unit></unit><min>-0.015051519393547864</min><max>0.3343599832991078</max></column>
1840-
<column><name>VIS2ERR</name><description>error in squared visibility</description><type>D</type><unit></unit><min>0.002236237143626775</min><max>1.9541385699118755E10</max></column>
1840+
<column><name>VIS2ERR</name><description>error in squared visibility</description><type>D</type><unit></unit><min>0.002236237143626775</min><max>0.46771611210341985</max></column>
18411841
<column><name>UCOORD</name><description>U coordinate of the data</description><type>D</type><unit>m|meter|meters</unit><min>-12.116311186339276</min><max>8.088126862517592</max></column>
18421842
<column><name>VCOORD</name><description>V coordinate of the data</description><type>D</type><unit>m|meter|meters</unit><min>-31.30747484513021</min><max>20.876115084633852</max></column>
18431843
<column><name>STA_INDEX</name><description>station numbers contributing to the data</description><type>I</type><unit></unit><min>1</min><max>13</max></column>
@@ -1869,10 +1869,10 @@
18691869
<column><name>TIME</name><description>UTC start time of observation</description><type>D</type><unit>s|sec|second|seconds</unit><min>11575.219989870675</min><max>11691.921999072656</max></column>
18701870
<column><name>MJD</name><description>Modified Julian Day (start date of observation)</description><type>D</type><unit>d|day|days</unit><min>57562.13397245359</min><max>57562.135323171286</max></column>
18711871
<column><name>INT_TIME</name><description>Integration time</description><type>D</type><unit>s|sec|second|seconds</unit><min>0.0</min><max>10.0</max></column>
1872-
<column><name>T3AMP</name><description>triple product amplitude</description><type>D</type><unit></unit><min>0.0</min><max>0.12965909079545854</max></column>
1873-
<column><name>T3AMPERR</name><description>error in triple product amplitude</description><type>D</type><unit></unit><min>3.4718685682720903E-16</min><max>2.2055951232246952E10</max></column>
1872+
<column><name>T3AMP</name><description>triple product amplitude</description><type>D</type><unit></unit><min>9.16917438333146E-4</min><max>0.12965909079545854</max></column>
1873+
<column><name>T3AMPERR</name><description>error in triple product amplitude</description><type>D</type><unit></unit><min>7.24084696898377E-4</min><max>0.03203189249583335</max></column>
18741874
<column><name>T3PHI</name><description>triple product phase</description><type>D</type><unit>deg|degree|degrees</unit><min>-54.6684345466558</min><max>174.3171499537919</max></column>
1875-
<column><name>T3PHIERR</name><description>error in triple product phase</description><type>D</type><unit>deg|degree|degrees</unit><min>1.3451034701682285</min><max>5.729577951308232E11</max></column>
1875+
<column><name>T3PHIERR</name><description>error in triple product phase</description><type>D</type><unit>deg|degree|degrees</unit><min>1.3451034701682285</min><max>59.533326746986326</max></column>
18761876
<column><name>U1COORD</name><description>U coordinate of baseline AB of the triangle</description><type>D</type><unit>m|meter|meters</unit><min>0.0</min><max>8.088126862517592</max></column>
18771877
<column><name>V1COORD</name><description>V coordinate of baseline AB of the triangle</description><type>D</type><unit>m|meter|meters</unit><min>0.0</min><max>20.876115084633852</max></column>
18781878
<column><name>U2COORD</name><description>U coordinate of baseline BC of the triangle</description><type>D</type><unit>m|meter|meters</unit><min>-12.116311186339276</min><max>0.0</max></column>

‎src/test/resources/ref/GRAVI.2016-06-23T03:10:17.458_singlesciviscalibrated.fits.properties‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,10 +1443,10 @@ OI_T3.11.MM.FLAG=null
14431443
OI_T3.11.MM.INT_TIME=[0, 1E1]
14441444
OI_T3.11.MM.MJD=[5.756213397245359E4, 5.756213532317128E4]
14451445
OI_T3.11.MM.STA_INDEX=[1, 13]
1446-
OI_T3.11.MM.T3AMP=[0, 1.296590907954585E-1]
1447-
OI_T3.11.MM.T3AMPERR=[3.47186856827209E-16, 2.205595123224695E10]
1446+
OI_T3.11.MM.T3AMP=[9.16917438333146E-4, 1.296590907954585E-1]
1447+
OI_T3.11.MM.T3AMPERR=[7.24084696898377E-4, 3.203189249583335E-2]
14481448
OI_T3.11.MM.T3PHI=[-5.46684345466558E1, 1.743171499537919E2]
1449-
OI_T3.11.MM.T3PHIERR=[1.345103470168228E0, 5.729577951308232E11]
1449+
OI_T3.11.MM.T3PHIERR=[1.345103470168228E0, 5.953332674698632E1]
14501450
OI_T3.11.MM.TARGET_ID=[1, 1]
14511451
OI_T3.11.MM.TIME=[1.157521998987067E4, 1.169192199907265E4]
14521452
OI_T3.11.MM.U1COORD=[0, 8.088126862517592E0]
@@ -1602,7 +1602,7 @@ OI_VIS2.10.MM.TIME=[1.156966276040766E4, 1.169192199907265E4]
16021602
OI_VIS2.10.MM.UCOORD=[-1.211631118633928E1, 8.088126862517592E0]
16031603
OI_VIS2.10.MM.VCOORD=[-3.130747484513021E1, 2.087611508463385E1]
16041604
OI_VIS2.10.MM.VIS2DATA=[-1.505151939354787E-2, 3.343599832991078E-1]
1605-
OI_VIS2.10.MM.VIS2ERR=[2.236237143626775E-3, 1.954138569911875E10]
1605+
OI_VIS2.10.MM.VIS2ERR=[2.236237143626775E-3, 4.677161121034198E-1]
16061606
OI_VIS2.10.NBRow=6
16071607
OI_VIS2.10.nFlagged=630
16081608
OI_VIS2.10.nWave=210
@@ -1787,21 +1787,21 @@ OI_VIS.9.MM.CORRINDX_VISPHI=null
17871787
OI_VIS.9.MM.FLAG=null
17881788
OI_VIS.9.MM.INT_TIME=[0, 2.1E2]
17891789
OI_VIS.9.MM.IVIS=[-4.506515790857806E4, 4.56129420031075E4]
1790-
OI_VIS.9.MM.IVISERR=[2.669923276910174E1, 1E10]
1790+
OI_VIS.9.MM.IVISERR=[2.669923276910174E1, 2.286313572365395E3]
17911791
OI_VIS.9.MM.MJD=[5.75621339081338E4, 5.756213532317128E4]
17921792
OI_VIS.9.MM.RVIS=[-6.129976693427514E4, 5.362550728021527E4]
1793-
OI_VIS.9.MM.RVISERR=[4.740801093459652E1, 1E10]
1793+
OI_VIS.9.MM.RVISERR=[4.740801093459652E1, 2.805791318260421E3]
17941794
OI_VIS.9.MM.STA_INDEX=[1, 13]
17951795
OI_VIS.9.MM.TARGET_ID=[1, 1]
17961796
OI_VIS.9.MM.TIME=[1.156966276040766E4, 1.169192199907265E4]
17971797
OI_VIS.9.MM.UCOORD=[-1.211631118633928E1, 8.088126862517592E0]
17981798
OI_VIS.9.MM.VCOORD=[-3.130747484513021E1, 2.087611508463385E1]
1799-
OI_VIS.9.MM.VISAMP=[0, 5.751971329623402E-1]
1800-
OI_VIS.9.MM.VISAMPERR=[8.911338651039883E-3, 1.430587084335892E10]
1799+
OI_VIS.9.MM.VISAMP=[8.466932998664719E-3, 5.751971329623402E-1]
1800+
OI_VIS.9.MM.VISAMPERR=[8.911338651039883E-3, 3.06093928372905E-1]
18011801
OI_VIS.9.MM.VISDATA=null
18021802
OI_VIS.9.MM.VISERR=null
1803-
OI_VIS.9.MM.VISPHI=[-1.798341943067733E2, 1.799119788752143E2]
1804-
OI_VIS.9.MM.VISPHIERR=[5.810259953834308E-1, 5.729577951308232E11]
1803+
OI_VIS.9.MM.VISPHI=[-1.077528964552859E2, 1.294273246822763E2]
1804+
OI_VIS.9.MM.VISPHIERR=[5.810259953834308E-1, 1.121427183466288E2]
18051805
OI_VIS.9.MM.VISREFMAP=null
18061806
OI_VIS.9.NBRow=6
18071807
OI_VIS.9.nFlagged=630

0 commit comments

Comments
 (0)