Changeset 28346 for trunk/ppArith

Timestamp:

Jun 15, 2010, 4:26:53 PM (16 years ago)

Author:

Paul Price

Message:

Allow application of a constant instead of an image.

Location:

trunk/ppArith/src

Files:

• ppArith.h (modified) (1 diff)
• ppArithArguments.c (modified) (4 diffs)
• ppArithLoop.c (modified) (2 diffs)
• ppArithReadout.c (modified) (2 diffs)

trunk/ppArith/src/ppArith.h

@@ -44 +44 @@
                     const pmReadout *input1, ///< Input readout
                     const pmReadout *input2, ///< Input readout
+                    float const2,            ///< Constant to apply
                     const pmConfig *config, ///< Configuration
                     const pmFPAview *view ///< View of readout on which to operate

trunk/ppArith/src/ppArithArguments.c

@@ -51 +51 @@
                         )
 {
-    psString value = psMetadataLookupStr(NULL, arguments, argName); // Value of interest 
+    psString value = psMetadataLookupStr(NULL, arguments, argName); // Value of interest
     if (value && strlen(value) > 0) {
         return psMetadataAddStr(target, PS_LIST_TAIL, mdName, 0, NULL, value);
@@ -82 +82 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-op", 0, "Operation to perform", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-file2", 0, "Second image", NULL);
+    psMetadataAddF32(arguments, PS_LIST_TAIL, "-const2", 0, "Constant", NAN);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-mask", 0, "Treat images as masks", false);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "Statistics file", NULL);
@@ -98 +99 @@
                      "File rule for output", outFilerule);
 
-    bool status = false;                // Status for file definition 
+    bool status = false;                // Status for file definition
 
     // First file
@@ -135 +136 @@
         }
     }
+    float const2 = psMetadataLookupF32(NULL, arguments, "-const2"); // Constant to apply
+    if (!isnan(const2)) {
+        if (name2) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Cannot specify both -file2 and -const2");
+            goto ERROR;
+        }
+        psMetadataAddF32(config->arguments, PS_LIST_TAIL, "PPARITH.CONST", 0, "Constant to apply", const2);
+    }
 
     // Output image

trunk/ppArith/src/ppArithLoop.c

@@ -62 +62 @@
     }
     psFree(iter);
+
+    float const2 = psMetadataLookupF32(&mdok, config->arguments, "PPARITH.CONST");
 
     pmFPAview *view = pmFPAviewAlloc(0); // Pointer into FPA hierarchy
@@ -138 +140 @@
 
                 // Perform the analysis
-                if (!ppArithReadout(outRO, inRO1, inRO2, config, view)) {
+                if (!ppArithReadout(outRO, inRO1, inRO2, const2, config, view)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to perform arithmetic.\n");
                     return false;

trunk/ppArith/src/ppArithReadout.c

@@ -21 +21 @@
 #include "ppArith.h"
 
-bool ppArithReadout(pmReadout *output, const pmReadout *input1, const pmReadout *input2,
+bool ppArithReadout(pmReadout *output, const pmReadout *input1, const pmReadout *input2, float const2,
                     const pmConfig *config, const pmFPAview *view)
 {
@@ -77 +77 @@
     if (input2) {
         psBinaryOp(outImage, inImage1, op, inImage2);
+    }  else if (!isnan(const2)) {
+        psBinaryOp(outImage, inImage1, op, psScalarAlloc(const2, inImage1->type.type));
     } else {
         psUnaryOp(outImage, inImage1, op);