Changeset 28043 for trunk/psModules

Timestamp:

May 19, 2010, 5:13:52 PM (16 years ago)

Author:

watersc1

Message:

Merging czw_branch (maskstats and software versions) back into the trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/config/pmVersion.c (modified) (1 diff)
• psModules/src/detrend/Makefile.am (modified) (2 diffs)
• psModules/src/detrend/pmMaskStats.c (copied) (copied from branches/czw_branch/20100427/psModules/src/detrend/pmMaskStats.c )
• psModules/src/detrend/pmMaskStats.h (copied) (copied from branches/czw_branch/20100427/psModules/src/detrend/pmMaskStats.h )
• psModules/src/psmodules.h (modified) (1 diff)

trunk/psModules/src/config/pmVersion.c

@@ -64 +64 @@
     psString source = psModulesSource();   // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "MODULE_V", PS_META_REPLACE, NULL, PSMODULES_VERSION);
+    
     psStringPrepend(&version, "psModules version: ");
     psStringPrepend(&source, "psModules source: ");

trunk/psModules/src/detrend/Makefile.am

@@ -8 +8 @@
         pmFringeStats.c \
         pmMaskBadPixels.c \
+        pmMaskStats.c \
         pmNonLinear.c \
         pmBias.c \
@@ -27 +28 @@
         pmFringeStats.h \
         pmMaskBadPixels.h \
+        pmMaskStats.h \
         pmNonLinear.h \
         pmBias.h \

trunk/psModules/src/psmodules.h

@@ -73 +73 @@
 #include <pmFringeStats.h>
 #include <pmMaskBadPixels.h>
+#include <pmMaskStats.h>
 #include <pmNonLinear.h>
 #include <pmOverscan.h>