Add easy way to find scalar time stamps; fix bug in whereby array subsets not managed correctly when writing data

Author: SimonFlower

bgs/geophys/library/Data/ImagCDF/ImagCDF.java

@@ -588,16 +588,26 @@ public ImagCDFVariableTS findVectorTimeStamps ()
      * @return the element index or a -ve number if there is no scalar element in the file */
     public int findScalarElement ()
     {
-        int count;
-
-        for (count=0; count<elements.length; count++)
+        for (int count=0; count<elements.length; count++)
         {
             if (elements[count].isScalarGeomagneticData())
                 return count;
         }
         return -1;
     }
 
+    /** find the timestamps for scalar data which may be the same as
+     * those for vector data, or may not exist
+     * @return a time stamp object or null if there is no scalar data
+     */
+    public ImagCDFVariableTS findScalarTimeStamps ()
+    {
+        int scalar_index = findScalarElement();
+        if (scalar_index < 0) return null;
+        ImagCDFVariable scalar_element = getElement(scalar_index);
+        return findTimeStamps(scalar_element);
+    }
+    
     /** get the element code string corresponding to the given vector and scalar elements
      * @param vector_indices the indexes to the vector elements
      * @param scalar_index  the index to the scalar element OR -ve for no scalar index

bgs/geophys/library/Data/ImagCDF/ImagCDFLowLevel.java

@@ -333,7 +333,15 @@ public void addData (Variable var, int rec_no, double data [])
     public void addData (Variable var, int rec_no, double data [], int data_offset, int data_length)
     throws CDFException
     {
-        var.putHyperData (rec_no, data_length, 1, new long [] {data_offset}, new long [] {data_length}, new long [] {0}, data);
+        double data_slice [];
+        if (data_offset != 0 || data_length != data.length)
+        {
+            // we need to slice the data - I can't see a way to do this with the Java CDF library
+            data_slice = new double [data_length];
+            System.arraycopy(data, data_offset, data_slice, 0, data_length);
+        }
+        else data_slice = data;
+        var.putHyperData (rec_no, data_length, 1, new long [] {0}, new long [] {data_length}, new long [] {0}, data_slice);
     }
 
     /** put a time stamp into a record in the CDF file 
@@ -368,7 +376,15 @@ public void addTimeStamp (Variable var, int rec_no, long data [])
     public void addTimeStamp (Variable var, int rec_no, long data [], int data_offset, int data_length)
     throws CDFException
     {
-        var.putHyperData (rec_no, data_length, 1, new long [] {data_offset}, new long [] {data_length}, new long [] {0}, data);
+        long data_slice [];
+        if (data_offset != 0 || data_length != data.length)
+        {
+            // we need to slice the data - I can't see a way to do this with the Java CDF library
+            data_slice = new long [data_length];
+            System.arraycopy(data, data_offset, data_slice, 0, data_length);
+        }
+        else data_slice = data;
+        var.putHyperData (rec_no, data_length, 1, new long [] {0}, new long [] {data_length}, new long [] {0}, data_slice);
     }