less logs

Author: bourgesl

src/main/java/fr/jmmc/oitools/fits/FitsTable.java

@@ -1042,7 +1042,7 @@ protected final Map<String, Object> getColumnsRangeValue() {
      * Return the column range given its name
      *
      * @param name column name
-     * @return Range instance
+     * @return Range instance or Range.UNDEFINED_RANGE if no data
      */
     public Range getColumnRange(final String name) {
         final String key = name + "_RANGE";

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

@@ -979,14 +979,14 @@ public final Range getMjdRange() {
      * Return the column range given its name
      *
      * @param name column name
-     * @return Range instance
+     * @return Range instance or Range.UNDEFINED_RANGE if no data
      */
     public final Range getColumnRange(final String name) {
         // Intercept EFF_WAVE and EFF_BAND to use OI_WAVELENGTH:
         if (OIFitsConstants.COLUMN_EFF_WAVE.equals(name)
                 || OIFitsConstants.COLUMN_EFF_BAND.equals(name)) {
             final OIWavelength oiWavelength = getOiWavelength();
-            return (oiWavelength != null) ? oiWavelength.getColumnRange(name) : null;
+            return (oiWavelength != null) ? oiWavelength.getColumnRange(name) : Range.UNDEFINED_RANGE;
         }
         return super.getColumnRange(name);
     }

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

@@ -162,7 +162,7 @@ public static List<String> getDistinctStaConfs(final Collection<OIData> oiDataLi
      * Return the global column range from given OIData tables
      * @param oiDataList OIData tables
      * @param name column name to extract values
-     * @return global column range or Range.UNDEFINED_RANGE when nothing found
+     * @return Range instance or Range.UNDEFINED_RANGE if no data
      */
     public static Range getColumnRange(final Collection<OIData> oiDataList, final String name) {
         double min = Double.POSITIVE_INFINITY;
@@ -180,11 +180,8 @@ public static Range getColumnRange(final Collection<OIData> oiDataList, final St
                 }
             }
         }
-
         final Range range = (min < max) ? new Range(min, max) : Range.UNDEFINED_RANGE;
-
-        logger.log(Level.WARNING, "getColumnRange : {0}", range);
-
+        logger.log(Level.FINE, "getColumnRange : {0}", range);
         return range;
     }
 

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

@@ -449,7 +449,7 @@ public List<String> getDistinctValues(final String name) {
     /**
      * Return the global column range from all OIData tables
      * @param name column name to extract values
-     * @return global column range or Range.UNDEFINED_RANGE when nothing found
+     * @return global column range or Range.UNDEFINED_RANGE if no data
      */
     public Range getColumnRange(final String name) {
         Range r = columnRanges.get(name);
@@ -537,9 +537,7 @@ public SelectorResult findOIData(final Selector selector, final SelectorResult i
                                 filtersData1D.add(new Double1DFilter(e.getKey(), (List<Range>) e.getValue()));
                             }
                         }
-                        if (logger.isLoggable(Level.INFO)) {
-                            logger.log(Level.INFO, "filtersData1D: {0} ", filtersData1D);
-                        }
+                        logger.log(Level.FINE, "filtersData1D: {0} ", filtersData1D);
                     }
                     {
                         // Wavelength filters:
@@ -552,6 +550,7 @@ public SelectorResult findOIData(final Selector selector, final SelectorResult i
                                 filtersWL.add(new Double1DFilter(e.getKey(), (List<Range>) e.getValue()));
                             }
                         }
+                        logger.log(Level.FINE, "filtersWL:     {0} ", filtersWL);
                     }
                 }
 
@@ -673,9 +672,8 @@ private void filterOIData(final SelectorResult result, final Granule g, final OI
     private IndexMask computeMask1D(final List<FitsTableFilter<?>> filters,
                                     final FitsTable fitsTable,
                                     final List<FitsTableFilter<?>> usedFilters) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.log(Level.FINE, "computeMask1D: filters = {0}", filters);
-        }
+
+        logger.log(Level.FINE, "computeMask1D: filters = {0}", filters);
 
         FilterState chainState = FilterState.FULL;
         usedFilters.clear();
@@ -686,6 +684,10 @@ private IndexMask computeMask1D(final List<FitsTableFilter<?>> filters,
             // Prepare filter:
             final FilterState state = filter.prepare(fitsTable);
 
+            if (logger.isLoggable(Level.FINE)) {
+                logger.log(Level.FINE, "{0} => {1}", new Object[]{filter, state});
+            }
+
             if (state.ordinal() < chainState.ordinal()) {
                 // min:
                 chainState = state;