Implements correction factor based calibration.

Signed-off-by: Jared Woolston <[email protected]>

Author: jwoolston

src/com/tenkiv/tekdaqc/android/content/ATekdaqcDatabaseHelper.java

@@ -72,9 +72,9 @@ public abstract class ATekdaqcDatabaseHelper extends SQLiteOpenHelper {
             + TekdaqcDataProviderContract.COLUMN_BUFFER + " text not null, "
             + TekdaqcDataProviderContract.COLUMN_SCALE + " text not null, "
             + TekdaqcDataProviderContract.COLUMN_TEMPERATURE + " real not null, "
-            + TekdaqcDataProviderContract.COLUMN_SELF_GAIN_CAL + " integer not null, "
-            + TekdaqcDataProviderContract.COLUMN_SYSTEM_GAIN_CAL + " integer not null, "
-            + TekdaqcDataProviderContract.COLUMN_GAIN_CAL_DIFF + " integer not null"
+            + TekdaqcDataProviderContract.COLUMN_READ_VOLTAGE + " real not null, "
+            + TekdaqcDataProviderContract.COLUMN_NOMINAL_VOLATGE + " real not null, "
+            + TekdaqcDataProviderContract.COLUMN_CORRECTION_FACTOR + " real not null"
             + ");";
 
     /**

src/com/tenkiv/tekdaqc/android/content/CalibrationPoint.java

@@ -38,15 +38,15 @@ public class CalibrationPoint {
     private Rate mRate;
     private BUFFER_STATE mBuffer;
     private ANALOG_SCALE mScale;
-    private int mSelfGainCal;
-    private int mSystemGainCal;
-    private int mGainCalDifference;
+    private float mReadVoltage;
+    private float mNominalVoltage;
+    private float mCorrectionFactor;
 
-    public CalibrationPoint(String serial, long time, double temp, Gain gain, Rate rate, BUFFER_STATE buffer, ANALOG_SCALE scale, int selfGain, int systemGain, int gainDiff) {
-    	this(-1, serial, time, temp, gain, rate, buffer, scale, selfGain, systemGain, gainDiff);
+    public CalibrationPoint(String serial, long time, double temp, Gain gain, Rate rate, BUFFER_STATE buffer, ANALOG_SCALE scale, float read, float nominal, float factor) {
+    	this(-1, serial, time, temp, gain, rate, buffer, scale, read, nominal, factor);
     }
 
-    public CalibrationPoint(long id, String serial, long time, double temp, Gain gain, Rate rate, BUFFER_STATE buffer, ANALOG_SCALE scale,  int selfGain, int systemGain, int gainDiff) {
+    public CalibrationPoint(long id, String serial, long time, double temp, Gain gain, Rate rate, BUFFER_STATE buffer, ANALOG_SCALE scale,  float read, float nominal, float factor) {
     	mID = id;
     	mSerial = serial;
     	mTime = time;
@@ -55,9 +55,9 @@ public CalibrationPoint(long id, String serial, long time, double temp, Gain gai
     	mRate = rate;
     	mBuffer = buffer;
     	mScale = scale;
-    	mSelfGainCal = selfGain;
-    	mSystemGainCal = systemGain;
-    	mGainCalDifference = gainDiff;
+    	mReadVoltage = read;
+    	mNominalVoltage = nominal;
+    	mCorrectionFactor = factor;
     }
 
     public ContentValues toContentValues() {
@@ -70,9 +70,9 @@ public ContentValues toContentValues() {
 		values.put(TekdaqcDataProviderContract.COLUMN_SCALE, mScale.scale);
 		// We are writing the goal here to be as exact as possible
 		values.put(TekdaqcDataProviderContract.COLUMN_TEMPERATURE, mTemperature);
-		values.put(TekdaqcDataProviderContract.COLUMN_SELF_GAIN_CAL, mSelfGainCal);
-		values.put(TekdaqcDataProviderContract.COLUMN_SYSTEM_GAIN_CAL, mSystemGainCal);
-		values.put(TekdaqcDataProviderContract.COLUMN_GAIN_CAL_DIFF, mGainCalDifference);
+		values.put(TekdaqcDataProviderContract.COLUMN_READ_VOLTAGE, mReadVoltage);
+		values.put(TekdaqcDataProviderContract.COLUMN_NOMINAL_VOLATGE, mNominalVoltage);
+		values.put(TekdaqcDataProviderContract.COLUMN_CORRECTION_FACTOR, mCorrectionFactor);
 		return values;
     }
 
@@ -132,27 +132,27 @@ public void setAnalogScale(ANALOG_SCALE scale) {
     	mScale = scale;
     }
 
-    public int getSelfGainCal() {
-        return mSelfGainCal;
+    public float getReadVoltage() {
+        return mReadVoltage;
     }
 
-    public void setSelfGainCal(int cal) {
-        mSelfGainCal = cal;
+    public void setReadVoltage(float volt) {
+        mReadVoltage = volt;
     }
 
-    public int getSystemGainCal() {
-        return mSystemGainCal;
+    public float getNominalVoltage() {
+        return mNominalVoltage;
     }
 
-    public void setSystemGainCal(int cal) {
-        mSystemGainCal = cal;
+    public void setNominalVoltage(float volt) {
+        mNominalVoltage = volt;
     }
 
-    public int getGainCalDifference() {
-        return mGainCalDifference;
+    public float getCorrectionFactor() {
+        return mCorrectionFactor;
     }
 
-    public void setGainCalDifference(int difference) {
-        mGainCalDifference = difference;
+    public void setCorrectionFactor(float factor) {
+        mCorrectionFactor = factor;
     }
 }

src/com/tenkiv/tekdaqc/android/content/TekdaqcDataProvider.java

@@ -57,8 +57,8 @@ public class TekdaqcDataProvider extends ContentProvider {
 	private static final String[] CALIBRATION_AVAILABLE_COLUMNS = { TekdaqcDataProviderContract.COLUMN_ID,
 			TekdaqcDataProviderContract.COLUMN_SERIAL, TekdaqcDataProviderContract.COLUMN_TIME, TekdaqcDataProviderContract.COLUMN_GAIN,
 			TekdaqcDataProviderContract.COLUMN_RATE, TekdaqcDataProviderContract.COLUMN_BUFFER, TekdaqcDataProviderContract.COLUMN_SCALE,
-			TekdaqcDataProviderContract.COLUMN_SELF_GAIN_CAL, TekdaqcDataProviderContract.COLUMN_SYSTEM_GAIN_CAL,
-			TekdaqcDataProviderContract.COLUMN_GAIN_CAL_DIFF, TekdaqcDataProviderContract.COLUMN_TEMPERATURE };
+			TekdaqcDataProviderContract.COLUMN_READ_VOLTAGE, TekdaqcDataProviderContract.COLUMN_NOMINAL_VOLATGE,
+			TekdaqcDataProviderContract.COLUMN_CORRECTION_FACTOR, TekdaqcDataProviderContract.COLUMN_TEMPERATURE };
 
 	/**
 	 * List of columns which are available for query/insert of analog input data

src/com/tenkiv/tekdaqc/android/content/TekdaqcDataProviderContract.java

@@ -42,9 +42,9 @@ public interface TekdaqcDataProviderContract {
     public static final String COLUMN_BUFFER = "buffer";
     public static final String COLUMN_TEMPERATURE = "temperature";
     public static final String COLUMN_SCALE = "scale";
-    public static final String COLUMN_SELF_GAIN_CAL = "self_gain_cal";
-    public static final String COLUMN_SYSTEM_GAIN_CAL = "system_gain_cal";
-    public static final String COLUMN_GAIN_CAL_DIFF = "gain_cal_difference";
+    public static final String COLUMN_READ_VOLTAGE = "read_voltage";
+    public static final String COLUMN_NOMINAL_VOLATGE = "nominal_voltage";
+    public static final String COLUMN_CORRECTION_FACTOR = "correction_factor";
     public static final String COLUMN_ANALOG_COUNTS = "analog_counts";
     public static final String COLUMN_TIMESTAMP = "timestamp";
 }