fixed getStaNames() to return 'UNDEFINED' if given staIndex is null (missing value case)

Author: bourgesl

src/main/java/fr/jmmc/oitools/model/OIAbstractData.java

@@ -25,7 +25,6 @@
 import fr.jmmc.oitools.meta.KeywordMeta;
 import fr.jmmc.oitools.meta.Types;
 import fr.jmmc.oitools.meta.Units;
-import static fr.jmmc.oitools.model.ModelBase.UNDEFINED_STRING;
 import static fr.jmmc.oitools.model.ModelBase.logger;
 import fr.jmmc.oitools.model.range.Range;
 import java.util.Arrays;
@@ -384,7 +383,7 @@ public String getStaName(final short staIndex) {
      */
     public final String getStaNames(final short[] staIndexes) {
         if (staIndexes == null) {
-            return UNDEFINED_STRING;
+            return UNDEFINED;
         }
         final OIArray oiArray = getOiArray();
 
@@ -442,10 +441,10 @@ public String getRealStaNames(final Map<String, StaNamesDir> usedStaNamesMap,
                 logger.log(Level.WARNING, "getRealStaNames: bad staIndexesToSortedStaNamesDir: missing {0}", Arrays.toString(staIndexes));
             } else {
                 // find the previous (real) baseline corresponding to the sorted StaNames (stable):
-                return getRealStaNames(usedStaNamesMap, sortedStaNamesDir.getStaNames(), UNDEFINED_STRING);
+                return getRealStaNames(usedStaNamesMap, sortedStaNamesDir.getStaNames(), UNDEFINED);
             }
         }
-        return UNDEFINED_STRING;
+        return UNDEFINED;
     }
 
     /**

src/main/java/fr/jmmc/oitools/model/OIArray.java

@@ -529,7 +529,7 @@ public String getStaName(final short staIndex) {
      */
     public String getStaNames(final short[] staIndexes) {
         if (staIndexes == null) {
-            return UNDEFINED_STRING;
+            return UNDEFINED;
         }
         // warning: identity hashcode so use carefully using distinct array instances:
         String label = staIndexesToStaNames.get(staIndexes);

src/main/java/fr/jmmc/oitools/model/OIFlux.java

@@ -112,7 +112,7 @@ public OIFlux(final OIFitsFile oifitsFile, final OIFlux src) {
 
         this.copyTable(src);
     }
-
+    
     /* --- Keywords --- */
     /**
      * Get the value of CALSTAT keyword
@@ -247,6 +247,17 @@ protected double[][] getDerivedColumnAsDoubles(final String name) {
     @Override
     public void checkSyntax(final OIFitsChecker checker) {
         super.checkSyntax(checker);
+        
+        /* TODO: add rules to validate (OIFits 2?)
+        - If CALSTAT is C (Calibrated), the spectrum of the ob-
+            ject does not depend on the telescope used: the table shall
+            not contain ARRNAME and STA_INDEX.
+        - If CALSTAT is U (Uncalibrated), ARRNAME and the
+            STA_INDEX column must be present, and the flux stored in
+            FLUXDATA is the flux measured on the telescope of array
+            ARRNAME indicated by STA_INDEX. In this case, the table shall
+            not contain FOV and FOVTYPE.
+        */
 
         checkColumnError(checker, getFlag(), getFluxErr(), this, OIFitsConstants.COLUMN_FLUXERR);