Skip to content

Commit 5f68a8b

Browse files
bourgeslbourgesl
committed
updated reference test files
1 parent 47fe4ed commit 5f68a8b

File tree

42 files changed

+3213
-2460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3213
-2460
lines changed

‎rules/DataModelV1.xml‎

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@
141141
</standards>
142142
</rule>
143143
<rule>
144-
<name>GENERIC_COL_ERR</name>
145-
<description>check if the UNFLAGGED *ERR column values are valid (positive or NULL)</description>
144+
<name>GENERIC_COL_ERR_FIX</name>
145+
<description>fix the UNFLAGGED *ERR column invalid values (negative values set to NaN)</description>
146146
<paragraph>JMMC</paragraph>
147147
<subjects>
148148
<apply>OI_T3.T3AMPERR</apply>
@@ -540,8 +540,11 @@
540540
<subjects>
541541
<apply>OI_ARRAY.DIAMETER</apply>
542542
<apply>OI_T3.INT_TIME</apply>
543+
<apply>OI_T3.MJD</apply>
543544
<apply>OI_VIS.INT_TIME</apply>
545+
<apply>OI_VIS.MJD</apply>
544546
<apply>OI_VIS2.INT_TIME</apply>
547+
<apply>OI_VIS2.MJD</apply>
545548
<apply>OI_WAVELENGTH.EFF_BAND</apply>
546549
<apply>OI_WAVELENGTH.EFF_WAVE</apply>
547550
</subjects>
@@ -1522,7 +1525,7 @@
15221525
<column>
15231526
<name>STA_INDEX</name>
15241527
<datatype>TYPE_SHORT</datatype>
1525-
<description>station index</description>
1528+
<description>station number</description>
15261529
<optional>false</optional>
15271530
<rules>
15281531
<applyrule>GENERIC_COL_DIM</applyrule>
@@ -1809,7 +1812,7 @@
18091812
<column>
18101813
<name>TIME</name>
18111814
<datatype>TYPE_DBL</datatype>
1812-
<description>UTC time of observation</description>
1815+
<description>UTC start time of observation</description>
18131816
<optional>false</optional>
18141817
<unit>UNIT_SECOND</unit>
18151818
<rules>
@@ -1830,25 +1833,30 @@
18301833
<column>
18311834
<name>MJD</name>
18321835
<datatype>TYPE_DBL</datatype>
1833-
<description>modified Julian Day</description>
1836+
<description>Modified Julian Day (start date of observation)</description>
18341837
<optional>false</optional>
1835-
<unit>UNIT_MJD</unit>
1838+
<unit>UNIT_DAYS</unit>
18361839
<rules>
18371840
<applyrule>GENERIC_COL_DIM</applyrule>
18381841
<applyrule>GENERIC_COL_FORMAT</applyrule>
18391842
<applyrule>GENERIC_COL_MANDATORY</applyrule>
18401843
<applyrule>GENERIC_COL_NBROWS</applyrule>
18411844
<applyrule>GENERIC_COL_UNIT</applyrule>
18421845
<applyrule>GENERIC_COL_UNIT_EXIST</applyrule>
1846+
<applyrule>GENERIC_COL_VAL_POSITIVE</applyrule>
18431847
<applyrule>GENERIC_MJD_RANGE</applyrule>
18441848
</rules>
18451849
<repeat>1</repeat>
18461850
<array>false</array>
1851+
<datarange>
1852+
<name>RANGE_POSITIVE_STRICT</name>
1853+
<min>0.0</min>
1854+
</datarange>
18471855
</column>
18481856
<column>
18491857
<name>INT_TIME</name>
18501858
<datatype>TYPE_DBL</datatype>
1851-
<description>integration time</description>
1859+
<description>Integration time</description>
18521860
<optional>false</optional>
18531861
<unit>UNIT_SECOND</unit>
18541862
<rules>
@@ -1894,7 +1902,7 @@
18941902
<optional>false</optional>
18951903
<rules>
18961904
<applyrule>GENERIC_COL_DIM</applyrule>
1897-
<applyrule>GENERIC_COL_ERR</applyrule>
1905+
<applyrule>GENERIC_COL_ERR_FIX</applyrule>
18981906
<applyrule>GENERIC_COL_FORMAT</applyrule>
18991907
<applyrule>GENERIC_COL_MANDATORY</applyrule>
19001908
<applyrule>GENERIC_COL_NBROWS</applyrule>
@@ -1935,7 +1943,7 @@
19351943
<unit>UNIT_DEGREE</unit>
19361944
<rules>
19371945
<applyrule>GENERIC_COL_DIM</applyrule>
1938-
<applyrule>GENERIC_COL_ERR</applyrule>
1946+
<applyrule>GENERIC_COL_ERR_FIX</applyrule>
19391947
<applyrule>GENERIC_COL_FORMAT</applyrule>
19401948
<applyrule>GENERIC_COL_MANDATORY</applyrule>
19411949
<applyrule>GENERIC_COL_NBROWS</applyrule>
@@ -2132,7 +2140,7 @@
21322140
<column>
21332141
<name>TIME</name>
21342142
<datatype>TYPE_DBL</datatype>
2135-
<description>UTC time of observation</description>
2143+
<description>UTC start time of observation</description>
21362144
<optional>false</optional>
21372145
<unit>UNIT_SECOND</unit>
21382146
<rules>
@@ -2153,25 +2161,30 @@
21532161
<column>
21542162
<name>MJD</name>
21552163
<datatype>TYPE_DBL</datatype>
2156-
<description>modified Julian Day</description>
2164+
<description>Modified Julian Day (start date of observation)</description>
21572165
<optional>false</optional>
2158-
<unit>UNIT_MJD</unit>
2166+
<unit>UNIT_DAYS</unit>
21592167
<rules>
21602168
<applyrule>GENERIC_COL_DIM</applyrule>
21612169
<applyrule>GENERIC_COL_FORMAT</applyrule>
21622170
<applyrule>GENERIC_COL_MANDATORY</applyrule>
21632171
<applyrule>GENERIC_COL_NBROWS</applyrule>
21642172
<applyrule>GENERIC_COL_UNIT</applyrule>
21652173
<applyrule>GENERIC_COL_UNIT_EXIST</applyrule>
2174+
<applyrule>GENERIC_COL_VAL_POSITIVE</applyrule>
21662175
<applyrule>GENERIC_MJD_RANGE</applyrule>
21672176
</rules>
21682177
<repeat>1</repeat>
21692178
<array>false</array>
2179+
<datarange>
2180+
<name>RANGE_POSITIVE_STRICT</name>
2181+
<min>0.0</min>
2182+
</datarange>
21702183
</column>
21712184
<column>
21722185
<name>INT_TIME</name>
21732186
<datatype>TYPE_DBL</datatype>
2174-
<description>integration time</description>
2187+
<description>Integration time</description>
21752188
<optional>false</optional>
21762189
<unit>UNIT_SECOND</unit>
21772190
<rules>
@@ -2217,7 +2230,7 @@
22172230
<optional>false</optional>
22182231
<rules>
22192232
<applyrule>GENERIC_COL_DIM</applyrule>
2220-
<applyrule>GENERIC_COL_ERR</applyrule>
2233+
<applyrule>GENERIC_COL_ERR_FIX</applyrule>
22212234
<applyrule>GENERIC_COL_FORMAT</applyrule>
22222235
<applyrule>GENERIC_COL_MANDATORY</applyrule>
22232236
<applyrule>GENERIC_COL_NBROWS</applyrule>
@@ -2414,7 +2427,7 @@
24142427
<column>
24152428
<name>TIME</name>
24162429
<datatype>TYPE_DBL</datatype>
2417-
<description>UTC time of observation</description>
2430+
<description>UTC start time of observation</description>
24182431
<optional>false</optional>
24192432
<unit>UNIT_SECOND</unit>
24202433
<rules>
@@ -2435,25 +2448,30 @@
24352448
<column>
24362449
<name>MJD</name>
24372450
<datatype>TYPE_DBL</datatype>
2438-
<description>modified Julian Day</description>
2451+
<description>Modified Julian Day (start date of observation)</description>
24392452
<optional>false</optional>
2440-
<unit>UNIT_MJD</unit>
2453+
<unit>UNIT_DAYS</unit>
24412454
<rules>
24422455
<applyrule>GENERIC_COL_DIM</applyrule>
24432456
<applyrule>GENERIC_COL_FORMAT</applyrule>
24442457
<applyrule>GENERIC_COL_MANDATORY</applyrule>
24452458
<applyrule>GENERIC_COL_NBROWS</applyrule>
24462459
<applyrule>GENERIC_COL_UNIT</applyrule>
24472460
<applyrule>GENERIC_COL_UNIT_EXIST</applyrule>
2461+
<applyrule>GENERIC_COL_VAL_POSITIVE</applyrule>
24482462
<applyrule>GENERIC_MJD_RANGE</applyrule>
24492463
</rules>
24502464
<repeat>1</repeat>
24512465
<array>false</array>
2466+
<datarange>
2467+
<name>RANGE_POSITIVE_STRICT</name>
2468+
<min>0.0</min>
2469+
</datarange>
24522470
</column>
24532471
<column>
24542472
<name>INT_TIME</name>
24552473
<datatype>TYPE_DBL</datatype>
2456-
<description>integration time</description>
2474+
<description>Integration time</description>
24572475
<optional>false</optional>
24582476
<unit>UNIT_SECOND</unit>
24592477
<rules>
@@ -2498,7 +2516,7 @@
24982516
<optional>false</optional>
24992517
<rules>
25002518
<applyrule>GENERIC_COL_DIM</applyrule>
2501-
<applyrule>GENERIC_COL_ERR</applyrule>
2519+
<applyrule>GENERIC_COL_ERR_FIX</applyrule>
25022520
<applyrule>GENERIC_COL_FORMAT</applyrule>
25032521
<applyrule>GENERIC_COL_MANDATORY</applyrule>
25042522
<applyrule>GENERIC_COL_NBROWS</applyrule>
@@ -2539,7 +2557,7 @@
25392557
<unit>UNIT_DEGREE</unit>
25402558
<rules>
25412559
<applyrule>GENERIC_COL_DIM</applyrule>
2542-
<applyrule>GENERIC_COL_ERR</applyrule>
2560+
<applyrule>GENERIC_COL_ERR_FIX</applyrule>
25432561
<applyrule>GENERIC_COL_FORMAT</applyrule>
25442562
<applyrule>GENERIC_COL_MANDATORY</applyrule>
25452563
<applyrule>GENERIC_COL_NBROWS</applyrule>

‎rules/DataModelV1_output.html‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)