Changeset 16829

Timestamp:

Mar 5, 2008, 11:11:51 AM (18 years ago)

Author:

Paul Price

Message:

No need for SCALE now. Scaling is taken care of by the convolution.

Location:

trunk/ppStack/src

Files:

• ppStackArguments.c (modified) (1 diff)
• ppStackCamera.c (modified) (2 diffs)

trunk/ppStack/src/ppStackArguments.c

@@ -27 +27 @@
             "\tPSF(STR)        PSF filename\n"
             "\tWEIGHTING(F32): Relative weighting to be applied\n"
-            "\tSCALE(F32):     Relative scaling to be applied\n",
             program);
     fprintf(stderr, "\n");

trunk/ppStack/src/ppStackCamera.c

@@ -107 +107 @@
         }
 
-        float scale = psMetadataLookupF32(&mdok, input, "SCALE"); // Relative scale
-        if (!mdok || isnan(scale) || scale == 0.0) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Component %s lacks SCALE of type F32", item->name);
-            psFree(iter);
-            return false;
-        }
-
         // Add the image file
         psArray *imageFiles = psArrayAlloc(1); // Array of filenames for this FPA
@@ -223 +216 @@
         psMetadataAddF32(imageFile->fpa->analysis, PS_LIST_TAIL, "PPSTACK.WEIGHTING", 0,
                          "Relative weighting for image", weighting);
-        psMetadataAddF32(imageFile->fpa->analysis, PS_LIST_TAIL, "PPSTACK.SCALE", 0,
-                         "Relative scale for image", scale);
 
         i++;