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

Timestamp:

Nov 2, 2005, 5:21:36 PM (21 years ago)

Author:

Paul Price

Message:

Mostly working, in general.

File:

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

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

@@ -577 +577 @@
                                             if (coeff->type.type != PS_TYPE_F64) {
                                                 psVector *temp = psVectorCopy(NULL, coeff, PS_TYPE_F64);
-                                                psFree(coeff);
                                                 coeff = temp;
                                             }
                                             // Polynomial correction
-                                            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);
@@ -726 +724 @@
                 }
 
+                // XXX: Temporary: until the other functions are altered to do this themselves.
                 // Trim, so that flat, fringe etc computations are faster.
+#ifndef PRODUCTION
                 psRegion *trimRegion = psMetadataLookupPtr(NULL, inputCell->concepts, "CELL.TRIMSEC");
                 psImage *trimmed = psImageSubset(inputReadout->image, *trimRegion);
                 psFree(inputReadout->image);
                 inputReadout->image = trimmed;
+#endif
 
                 // Flat-field correction