Merge branch 'testing' into development

Author: aacuevas

Source/Plugins/KWIKFormat/FileSource/KwikFileSource.cpp

@@ -117,9 +117,22 @@ void KWIKFileSource::fillRecordInfo()
                 try
                 {
                     recordN = recordings.openGroup((String(i) + "/application_data").toUTF8());
-                    attr=recordN.openAttribute("channel_bit_volts");
-                    attr.read(ArrayType(PredType::NATIVE_FLOAT,1,&dims[1]),bitVoltArray);
-                    foundBitVoltArray = true;
+					try 
+					{
+						DataSet bV = recordN.openDataSet("channel_bit_volts");
+						bV.read(bitVoltArray.getData(), PredType::NATIVE_FLOAT);
+						foundBitVoltArray = true;
+					}
+					catch (GroupIException)
+					{ }
+					catch (DataSetIException)
+					{ }
+					if (!foundBitVoltArray)
+					{
+						attr = recordN.openAttribute("channel_bit_volts");
+						attr.read(ArrayType(PredType::NATIVE_FLOAT, 1, &dims[1]), bitVoltArray);
+						foundBitVoltArray = true;
+					}
                 } catch (GroupIException)
                 {
                 } catch (AttributeIException)