Changeset 28484 for branches/pap/ppArith/src/ppArith.h

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppArith/src/ppArith.h (modified) (1 diff)

branches/pap/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