Changeset 17228 for trunk/psModules/src/imcombine/pmReadoutCombine.h

Timestamp:

Mar 28, 2008, 5:10:17 PM (18 years ago)

Author:

Paul Price

Message:

Merging pap_branch_080328 so we can use the modernised version of ppMerge.

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.h (modified) (3 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.h

@@ -5 +5 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-06-02 03:51:03 $
+ * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-03-29 03:10:17 $
  * Copyright 2004-2006 Institute for Astronomy, University of Hawaii
  */
@@ -20 +20 @@
 /// These values define how the combination is performed, and should not vary by detector, so that it can be
 /// re-used for multiple combinations.
-typedef struct
-{
+typedef struct {
     psStatsOptions combine;             ///< Statistic to use when performing the combination
     psMaskType maskVal;                 ///< Mask value
@@ -31 +30 @@
     float rej;                          ///< Rejection threshould for clipping (for CLIPPED_MEAN only)
     bool weights;                       ///< Use the supplied weights (instead of calculated stdev)?
-}
-pmCombineParams;
+} pmCombineParams;
 
 // Allocator for pmCombineParams