Skip to content

Commit 8bf855a

Browse files
bourgeslbourgesl
committed
disabled SNR VIS / T3 (incorrect)
1 parent 77d726f commit 8bf855a

25 files changed

+19
-246
lines changed

‎rules/DataModelV1-all.xml‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3093,28 +3093,6 @@
30933093
<repeat>[[NWAVE]]</repeat>
30943094
<array>true</array>
30953095
</column>
3096-
<column>
3097-
<name>SNR_VISAMP</name>
3098-
<datatype>TYPE_DBL</datatype>
3099-
<description>SNR on VISAMP</description>
3100-
<optional>false</optional>
3101-
<rules>
3102-
</rules>
3103-
<repeat>[[NWAVE]]</repeat>
3104-
<array>true</array>
3105-
<expression>abs(VISAMP / VISAMPERR)</expression>
3106-
</column>
3107-
<column>
3108-
<name>SNR_VISPHI</name>
3109-
<datatype>TYPE_DBL</datatype>
3110-
<description>SNR on VISPHI</description>
3111-
<optional>false</optional>
3112-
<rules>
3113-
</rules>
3114-
<repeat>[[NWAVE]]</repeat>
3115-
<array>true</array>
3116-
<expression>abs(VISPHI / VISPHIERR)</expression>
3117-
</column>
31183096
<column>
31193097
<name>RES_VISAMP_MODEL</name>
31203098
<datatype>TYPE_DBL</datatype>
@@ -3684,28 +3662,6 @@
36843662
<repeat>[[NWAVE]]</repeat>
36853663
<array>true</array>
36863664
</column>
3687-
<column>
3688-
<name>SNR_T3AMP</name>
3689-
<datatype>TYPE_DBL</datatype>
3690-
<description>SNR on T3AMP</description>
3691-
<optional>false</optional>
3692-
<rules>
3693-
</rules>
3694-
<repeat>[[NWAVE]]</repeat>
3695-
<array>true</array>
3696-
<expression>abs(T3AMP / T3AMPERR)</expression>
3697-
</column>
3698-
<column>
3699-
<name>SNR_T3PHI</name>
3700-
<datatype>TYPE_DBL</datatype>
3701-
<description>SNR on T3PHI</description>
3702-
<optional>false</optional>
3703-
<rules>
3704-
</rules>
3705-
<repeat>[[NWAVE]]</repeat>
3706-
<array>true</array>
3707-
<expression>abs(T3PHI / T3PHIERR)</expression>
3708-
</column>
37093665
<column>
37103666
<name>RES_T3AMP_MODEL</name>
37113667
<datatype>TYPE_DBL</datatype>

‎rules/DataModelV1-all_output.html‎

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

‎rules/DataModelV2-all.xml‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4441,28 +4441,6 @@
44414441
<repeat>[[NWAVE]]</repeat>
44424442
<array>true</array>
44434443
</column>
4444-
<column>
4445-
<name>SNR_VISAMP</name>
4446-
<datatype>TYPE_DBL</datatype>
4447-
<description>SNR on VISAMP</description>
4448-
<optional>false</optional>
4449-
<rules>
4450-
</rules>
4451-
<repeat>[[NWAVE]]</repeat>
4452-
<array>true</array>
4453-
<expression>abs(VISAMP / VISAMPERR)</expression>
4454-
</column>
4455-
<column>
4456-
<name>SNR_VISPHI</name>
4457-
<datatype>TYPE_DBL</datatype>
4458-
<description>SNR on VISPHI</description>
4459-
<optional>false</optional>
4460-
<rules>
4461-
</rules>
4462-
<repeat>[[NWAVE]]</repeat>
4463-
<array>true</array>
4464-
<expression>abs(VISPHI / VISPHIERR)</expression>
4465-
</column>
44664444
<column>
44674445
<name>RES_VISAMP_MODEL</name>
44684446
<datatype>TYPE_DBL</datatype>
@@ -5086,28 +5064,6 @@
50865064
<repeat>[[NWAVE]]</repeat>
50875065
<array>true</array>
50885066
</column>
5089-
<column>
5090-
<name>SNR_T3AMP</name>
5091-
<datatype>TYPE_DBL</datatype>
5092-
<description>SNR on T3AMP</description>
5093-
<optional>false</optional>
5094-
<rules>
5095-
</rules>
5096-
<repeat>[[NWAVE]]</repeat>
5097-
<array>true</array>
5098-
<expression>abs(T3AMP / T3AMPERR)</expression>
5099-
</column>
5100-
<column>
5101-
<name>SNR_T3PHI</name>
5102-
<datatype>TYPE_DBL</datatype>
5103-
<description>SNR on T3PHI</description>
5104-
<optional>false</optional>
5105-
<rules>
5106-
</rules>
5107-
<repeat>[[NWAVE]]</repeat>
5108-
<array>true</array>
5109-
<expression>abs(T3PHI / T3PHIERR)</expression>
5110-
</column>
51115067
<column>
51125068
<name>RES_T3AMP_MODEL</name>
51135069
<datatype>TYPE_DBL</datatype>

‎rules/DataModelV2-all_output.html‎

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ private void processHDUnits(final OIFitsStandard std, final FileRef fileRef, fin
574574

575575
// TODO load and handle any other FITS binary table or HDU...
576576
if (logger.isLoggable(Level.INFO)) {
577+
// Dump HDU header and table columns:
577578
logger.log(Level.INFO, "Skipping non-standard OIFITS {0}:\n{1}",
578579
new Object[]{FitsHDU.getHDUId(extName, i), FitsUtils.dumpHDU(hdu, false)});
579580
}

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,14 @@ public short[] getIntAcceptedValues() {
135135
// Derived SPATIAL_V2_FREQ column definition
136136
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_V2COORD_SPATIAL, "spatial V2 frequency", Types.TYPE_DBL, this));
137137

138-
// Derived SNR column definition
139-
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_SNR_T3AMP, "SNR on " + OIFitsConstants.COLUMN_T3AMP,
140-
Types.TYPE_DBL, this, "abs(" + OIFitsConstants.COLUMN_T3AMP + " / " + OIFitsConstants.COLUMN_T3AMPERR + ")"));
141-
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_SNR_T3PHI, "SNR on " + OIFitsConstants.COLUMN_T3PHI,
142-
Types.TYPE_DBL, this, "abs(" + OIFitsConstants.COLUMN_T3PHI + " / " + OIFitsConstants.COLUMN_T3PHIERR + ")"));
138+
if (false) {
139+
// invalid SNR definition => disabled
140+
// Derived SNR column definition
141+
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_SNR_T3AMP, "SNR on " + OIFitsConstants.COLUMN_T3AMP,
142+
Types.TYPE_DBL, this, "abs(" + OIFitsConstants.COLUMN_T3AMP + " / " + OIFitsConstants.COLUMN_T3AMPERR + ")"));
143+
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_SNR_T3PHI, "SNR on " + OIFitsConstants.COLUMN_T3PHI,
144+
Types.TYPE_DBL, this, "abs(" + OIFitsConstants.COLUMN_T3PHI + " / " + OIFitsConstants.COLUMN_T3PHIERR + ")"));
145+
}
143146

144147
// if IMAGE_OI support is enabled
145148
if (DataModel.hasOiModelColumnsSupport()) {

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,14 @@ Types.TYPE_DBL, true, false, NO_STR_VALUES, new CustomUnits(), OIFitsConstants.C
182182
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_VCOORD_SPATIAL, "spatial V frequency", Types.TYPE_DBL, this)
183183
.setOrientationDependent(true));
184184

185-
// Derived SNR column definition
186-
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_SNR_VISAMP, "SNR on " + OIFitsConstants.COLUMN_VISAMP,
187-
Types.TYPE_DBL, this, "abs(" + OIFitsConstants.COLUMN_VISAMP + " / " + OIFitsConstants.COLUMN_VISAMPERR + ")"));
188-
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_SNR_VISPHI, "SNR on " + OIFitsConstants.COLUMN_VISPHI,
189-
Types.TYPE_DBL, this, "abs(" + OIFitsConstants.COLUMN_VISPHI + " / " + OIFitsConstants.COLUMN_VISPHIERR + ")"));
185+
if (false) {
186+
// invalid SNR definition => disabled
187+
// Derived SNR column definition
188+
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_SNR_VISAMP, "SNR on " + OIFitsConstants.COLUMN_VISAMP,
189+
Types.TYPE_DBL, this, "abs(" + OIFitsConstants.COLUMN_VISAMP + " / " + OIFitsConstants.COLUMN_VISAMPERR + ")"));
190+
addDerivedColumnMeta(new WaveColumnMeta(OIFitsConstants.COLUMN_SNR_VISPHI, "SNR on " + OIFitsConstants.COLUMN_VISPHI,
191+
Types.TYPE_DBL, this, "abs(" + OIFitsConstants.COLUMN_VISPHI + " / " + OIFitsConstants.COLUMN_VISPHIERR + ")"));
192+
}
190193

191194
// if IMAGE_OI support is enabled
192195
if (DataModel.hasOiModelColumnsSupport()) {

‎src/test/resources/ref/2004-FKV1137.fits.properties‎

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

‎src/test/resources/ref/2008-Contest_Binary.oifits.properties‎

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

0 commit comments

Comments
 (0)