Changeset 5467 for trunk/archive/scripts/src/phase2/papPhase2.c

Timestamp:

Nov 3, 2005, 2:29:46 PM (21 years ago)

Author:

Paul Price

Message:

Non-linearity working

File:

• trunk/archive/scripts/src/phase2/papPhase2.c (modified) (2 diffs)

trunk/archive/scripts/src/phase2/papPhase2.c

@@ -516 +516 @@
                                 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 +539 @@
                                     (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
                                 }