Index: /trunk/archive/scripts/src/phase2/ipprc.config
===================================================================
--- /trunk/archive/scripts/src/phase2/ipprc.config	(revision 5466)
+++ /trunk/archive/scripts/src/phase2/ipprc.config	(revision 5467)
@@ -23,3 +23,4 @@
 	pmConfigRead		S32	10
 	pmFPARead		S32	10
+	pap			S32	10
 END
Index: /trunk/archive/scripts/src/phase2/papPhase2.c
===================================================================
--- /trunk/archive/scripts/src/phase2/papPhase2.c	(revision 5466)
+++ /trunk/archive/scripts/src/phase2/papPhase2.c	(revision 5467)
@@ -516,12 +516,10 @@
 				if (coeff->type.type != PS_TYPE_F64) {
 				    psVector *temp = psVectorCopy(NULL, coeff, PS_TYPE_F64); // F64 version
-				    psFree(coeff);
 				    coeff = temp;
 				}
-				psPolynomial1D *correction = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD,
-										 coeff->n + 1);
-				for (int i = 0; i < coeff->n; i++) {
-				    correction->coeff[i] = coeff->data.F64[i];
-				}
+				psPolynomial1D *correction = psPolynomial1DAlloc(coeff->n - 1,
+										 PS_POLYNOMIAL_ORD);
+				psFree(correction->coeff);
+				correction->coeff = psMemIncrRefCounter(coeff->data.F64);
 				(void)pmNonLinearityPolynomial(inputReadout, correction);
 				psFree(coeff);
@@ -541,5 +539,8 @@
 				    (void)pmNonLinearityLookup(inputReadout, table);
 #else
-				    printf("XXX: Non-linearity with lookup table not yet implemented.\n");
+				    psVector *influx = table->values->data[0];
+				    psVector *outflux = table->values->data[1];
+				    (void)pmNonLinearityLookup(inputReadout, table->values->data[0],
+							       table->values->data[1]);
 #endif
 				}
Index: /trunk/archive/scripts/src/phase2/phase2.config
===================================================================
--- /trunk/archive/scripts/src/phase2/phase2.config	(revision 5466)
+++ /trunk/archive/scripts/src/phase2/phase2.config	(revision 5467)
@@ -15,44 +15,45 @@
 # Non-linearity correction
 NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-# @NONLIN.SOURCE	STR	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		METADATA		# Source of non-linearity data
-	ccd00		STR	nonlin00.dat	# A lookup table 
-	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-	@ccd03		F32	1.2345 		# A polynomial
-	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-END
+#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
+NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
+#NONLIN.DATA		METADATA		# Source of non-linearity data
+#	ccd00		STR	nonlin00.dat	# A lookup table 
+#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd03		F32	1.2345 		# A polynomial
+#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
+#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
+#END
 
 # Overscan subtraction
Index: /trunk/archive/scripts/src/phase2/testing.txt
===================================================================
--- /trunk/archive/scripts/src/phase2/testing.txt	(revision 5466)
+++ /trunk/archive/scripts/src/phase2/testing.txt	(revision 5467)
@@ -61,3 +61,5 @@
 CELL.TRIMSEC (assuming the non-linearity is from the CCD itself, not
 the amplifier).  It's fairly slow, but that might be because of the
-multiple trace messages in the polynomial evaluation.
+multiple trace messages in the polynomial evaluation.  Got the
+individual correction parameters working.  Now need to do the lookup
+table.