Changeset 5464

Timestamp:

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

Author:

Paul Price

Message:

Mostly working, in general.

Location:

trunk/archive/scripts/src/phase2

Files:

• papPhase2.c (modified) (2 diffs)
• phase2.config (modified) (1 diff)
• pmNonLinear.c (modified) (3 diffs)
• pmNonLinear.h (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

trunk/archive/scripts/src/phase2/phase2.config

@@ -20 +20 @@
         @ccd01          F32     0.0 1.001 0.001 # A polynomial
         @ccd02          F32     0.0 1.001 0.001 # A polynomial
-        @ccd03          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

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

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-23 02:58:30 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-03 03:21:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
 
 /******************************************************************************
-pmNonLinearityLookup(): This routine will take an psReadout image as input
+pmNonLinearityLookup(): This routine will take an pmReadout image as input
 and a 1-D polynomial.  For each pixel in the input image, the polynomial will
 be evaluated at that pixels value, and the image pixel will then be set to
@@ -51 +51 @@
 
 /******************************************************************************
-pmNonLinearityLookup(): This routine will take an psReadout image as input
+pmNonLinearityLookup(): This routine will take an pmReadout image as input
 and two input vectors, which constitute a lookup table.  For each pixel in
 the input image, that pixels value will be determined in the input vector

trunk/archive/scripts/src/phase2/pmNonLinear.h

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-23 02:58:30 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-03 03:21:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16 +16 @@
 
 #include "pslib.h"
-#include "pmFPA.h"
+#include "pmFPA.h" // #include "pmAstrometry.h"
 
 pmReadout *pmNonLinearityPolynomial(pmReadout *in,