Changeset 10954 for trunk/pswarp/src/pswarpTransformReadout.c

Timestamp:

Jan 7, 2007, 6:48:50 AM (20 years ago)

Author:

eugene

Message:

functioning pswarp, needs opt code

File:

• trunk/pswarp/src/pswarpTransformReadout.c (modified) (4 diffs)

trunk/pswarp/src/pswarpTransformReadout.c

@@ -8 +8 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
+    // psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSWARP_RECIPE);
 
     int outNx = output->image->numCols;
@@ -27 +27 @@
     pmChip *chipOutput = cell->parent;
     pmFPA *fpaOutput = chipOutput->parent;
+
+    psF32 **outData = output->image->data.F32;
+    psImage *inImage = input->image;
 
     // Iterate over the output image pixels
@@ -48 +51 @@
 
                 // XXX get interpolation method from the recipe
-                outImage->data.F32[y][x] = (psF32)psImagePixelInterpolate(image, inPix->x, inPix->y, mask, 1, NAN, PS_INTERPOLATE_BILINEAR);
+                outData[y][x] = (psF32)psImagePixelInterpolate(inImage, inPix->x, inPix->y, NULL, 1, NAN, PS_INTERPOLATE_BILINEAR);
+                // modify zero and scale?
 
+                // outData[y][x] = (psF32)psImagePixelInterpolate(inImage, inPix->x, inPix->y, mask, 1, NAN, PS_INTERPOLATE_BILINEAR);
+                
 # if (0)
                 if (error) {
@@ -58 +64 @@
                                                                                             mask, 1, NAN);
                 }
-# endif
-
-                outImage->data.F32[y][x] = (outImage->data.F32[y][x] - offset) / scale;
-# if (0)
                 if (error) {
                     outError->data.F32[y][x] = outError->data.F32[y][x] / SQUARE(scale);