Changeset 14360 for trunk/psModules/src/imcombine/pmSubtraction.c

Timestamp:

Jul 20, 2007, 6:30:57 PM (19 years ago)

Author:

Paul Price

Message:

Adding RINGS kernel --- a series of rings, modified by polynomials.

File:

• trunk/psModules/src/imcombine/pmSubtraction.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-07-20 21:18:50 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-07-21 04:30:57 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -170 +170 @@
               break; \
           } \
+          case PM_SUBTRACTION_KERNEL_RINGS: { \
+              if (i == (KERNELS)->subIndex) { \
+                  (TARGET)->kernel[0][0] += value; \
+                  break; \
+              } \
+              psArray *preCalc = (KERNELS)->preCalc->data[i]; /* Precalculated data */ \
+              psVector *uCoords = preCalc->data[0]; /* u coordinates */ \
+              psVector *vCoords = preCalc->data[1]; /* v coordinates */ \
+              psVector *poly = preCalc->data[2]; /* Polynomial values */ \
+              int num = uCoords->n;     /* Number of pixels */ \
+              for (int j = 0; j < num; j++) { \
+                  int u = uCoords->data.S32[j], v = vCoords->data.S32[j]; /* Kernel coordinates */ \
+                  (TARGET)->kernel[v][u] += value * FUNC(poly->data.F32[j]); \
+              } \
+              /* The (0,0) kernel is subtracted from other kernels to preserve photometric scaling */ \
+              if (kernels->spatialOrder > 0) { \
+                  kernel->kernel[0][0] += subValue; \
+              } \
+              break; \
+          } \
           default: \
             psAbort("Should never get here."); \
@@ -274 +294 @@
               break;
           }
+          case PM_SUBTRACTION_KERNEL_RINGS: {
+              if (i == kernels->subIndex) {
+                  kernel->kernel[0][0] += value;
+                  break;
+              }
+              psArray *preCalc = kernels->preCalc->data[i]; // Precalculated data
+              psVector *uCoords = preCalc->data[0]; // u coordinates
+              psVector *vCoords = preCalc->data[1]; // v coordinates
+              psVector *poly = preCalc->data[2]; // Polynomial values
+              int num = uCoords->n;     // Number of pixels
+
+              for (int j = 0; j < num; j++) {
+                  int u = uCoords->data.S32[j], v = vCoords->data.S32[j]; // Kernel coordinates
+                  kernel->kernel[v][u] += value * weightFunc(poly->data.F32[j]);
+              }
+
+              // The (0,0) kernel is subtracted from other kernels to preserve photometric scaling
+              if (kernels->spatialOrder > 0) {
+                  kernel->kernel[0][0] += subValue;
+              }
+              break;
+          }
           default:
             psAbort("Should never get here.");
@@ -367 +409 @@
           }
           return polyValue * sum - sub;
+      }
+      case PM_SUBTRACTION_KERNEL_RINGS: {
+          if (index == kernels->subIndex) {
+              return image->data.F32[0][0];
+          }
+          psArray *preCalc = kernels->preCalc->data[index]; // Precalculated data
+          psVector *uCoords = preCalc->data[0]; // u coordinates
+          psVector *vCoords = preCalc->data[1]; // v coordinates
+          psVector *poly = preCalc->data[2]; // Polynomial values
+          int num = uCoords->n;         // Number of pixels
+          double sum = 0.0;             // Accumulated sum from convolution
+          for (int j = 0; j < num; j++) {
+              int u = uCoords->data.S32[j], v = vCoords->data.S32[j]; // Kernel coordinates
+              sum += image->data.F32[y + v][x + u] * poly->data.F32[j];
+          }
+          // The (0,0) kernel is subtracted from other kernels to preserve photometric scaling
+          return polyValue * sum - image->data.F32[0][0];
       }
       default: