Index: branches/czw_branch/20100427/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm
===================================================================
--- trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm	(revision 27783)
+++ branches/czw_branch/20100427/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm	(revision 27784)
@@ -699,4 +699,5 @@
 #        print "Time to run dvoImagesAtCoords: $dtime_dvo\n";
         unless ($success) {
+
             my $result_code = $error_code >> 8;
             if ($result_code == $PSTAMP_NO_OVERLAP) {
Index: branches/czw_branch/20100427/ippMonitor/def/detProcessedExp_failure.d
===================================================================
--- trunk/ippMonitor/def/detProcessedExp_failure.d	(revision 27783)
+++ branches/czw_branch/20100427/ippMonitor/def/detProcessedExp_failure.d	(revision 27784)
@@ -13,5 +13,5 @@
 ARGS  ARG1 basename=$detProcessedExp.path_base
 
-OP    OP1  $detProcessedExp.bg / $detProcessedExp.bg_stdev
+OP    OP1  $detProcessedExp.bg_stdev > 0.0 ? $detProcessedExp.bg / $detProcessedExp.bg_stdev : NAN
 
 #     field                    size    	format  name       show          link to                 extras
Index: branches/czw_branch/20100427/ippMonitor/def/rawImfile_failed.d
===================================================================
--- trunk/ippMonitor/def/rawImfile_failed.d	(revision 27783)
+++ branches/czw_branch/20100427/ippMonitor/def/rawImfile_failed.d	(revision 27784)
@@ -1,5 +1,5 @@
 TABLE rawImfile
 TITLE Failed Raw Image Files
-FILE  rawImfile.php
+FILE  rawImfile_failed.php
 MENU  ipp.load.dat
 
Index: branches/czw_branch/20100427/ippMonitor/raw/getimage.php
===================================================================
--- trunk/ippMonitor/raw/getimage.php	(revision 27783)
+++ branches/czw_branch/20100427/ippMonitor/raw/getimage.php	(revision 27784)
@@ -8,4 +8,6 @@
 // global $BINDIR;
 // global $SITE;
+// global $PSCONFDIR
+// global $PSCONFIG
 
 ### these need to be set to the correct locations!!
@@ -18,4 +20,7 @@
 }
 
+
+putenv("PSCONFDIR=$PSCONFDIR");
+putenv("PSCONFIG=$PSCONFIG");
 putenv("PERL5LIB=$PERLLIB:");
 $PATH = getenv("PATH");
Index: branches/czw_branch/20100427/ippMonitor/raw/ipp.php
===================================================================
--- trunk/ippMonitor/raw/ipp.php	(revision 27783)
+++ branches/czw_branch/20100427/ippMonitor/raw/ipp.php	(revision 27784)
@@ -722,5 +722,9 @@
     global $BINDIR;
     global $SITE;
-
+    global $PSCONFDIR;
+    global $PSCONFIG;
+
+    putenv("PSCONFDIR=$PSCONFDIR");
+    putenv("PSCONFIG=$PSCONFIG");
     putenv("PERL5LIB=$PERLLIB:");
     $PATH = getenv("PATH");
Index: branches/czw_branch/20100427/ippMonitor/raw/site.php.in
===================================================================
--- trunk/ippMonitor/raw/site.php.in	(revision 27783)
+++ branches/czw_branch/20100427/ippMonitor/raw/site.php.in	(revision 27784)
@@ -11,4 +11,7 @@
 $SITE    = "@SITE@";
 
+$PSCONFDIR = "@PSCONFDIR@";
+$PSCONFIG  = "@PSCONFIG@";
+
 $DBI     = "@DBI@";
 ?>
Index: branches/czw_branch/20100427/ippScripts/scripts/diff_skycell.pl
===================================================================
--- trunk/ippScripts/scripts/diff_skycell.pl	(revision 27783)
+++ branches/czw_branch/20100427/ippScripts/scripts/diff_skycell.pl	(revision 27784)
@@ -292,5 +292,5 @@
     $command .= " -recipe PPSUB $recipe_ppSub";
     $command .= " -recipe PSPHOT $recipe_psphot";
-    $command .= " -recipe PPSTATS WARPSTATS";
+    $command .= " -recipe PPSTATS DIFFSTATS";
     $command .= " -F PSPHOT.PSF.SAVE PSPHOT.PSF.SKY.SAVE";
     $command .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF";
Index: branches/czw_branch/20100427/ippScripts/scripts/stack_skycell.pl
===================================================================
--- trunk/ippScripts/scripts/stack_skycell.pl	(revision 27783)
+++ branches/czw_branch/20100427/ippScripts/scripts/stack_skycell.pl	(revision 27784)
@@ -232,5 +232,5 @@
     $command .= " -recipe PPSUB $recipe_ppSub";
     $command .= " -recipe PSPHOT $recipe_psphot";
-    $command .= " -recipe PPSTATS WARPSTATS" if $do_stats;;
+    $command .= " -recipe PPSTATS STACKSTATS" if $do_stats;;
     $command .= " -F PSPHOT.PSF.SAVE PSPHOT.PSF.SKY.SAVE";
     $command .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF";
Index: branches/czw_branch/20100427/ippToPsps/src/ippToPspsVersion.c
===================================================================
--- trunk/ippToPsps/src/ippToPspsVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ippToPsps/src/ippToPspsVersion.c	(revision 27784)
@@ -58,4 +58,6 @@
     psString source = ippToPsps_Source();   // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "IPP2PS_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ippToPsps version: ");
     psStringPrepend(&source, "ippToPsps source: ");
Index: branches/czw_branch/20100427/ippTools/src/camtool.c
===================================================================
--- trunk/ippTools/src/camtool.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/camtool.c	(revision 27784)
@@ -482,4 +482,15 @@
     PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false);
 
+    PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false);
+    PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false);
+    PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false);
+    PXOPT_LOOKUP_STR(ver_psastro, config->args, "-ver_psastro", false, false);
+    PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
+    PXOPT_LOOKUP_STR(ver_ppimage, config->args, "-ver_ppimage", false, false);
+    PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
+
+    psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n",
+	    ver_pslib,ver_psmodules,ver_psphot,ver_psastro,ver_ppstats,ver_ppimage,ver_streaks);
+    
 //    Get this from the chipRun
 //    PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false);
@@ -596,4 +607,12 @@
         fault,
         quality
+/* 	quality, */
+/* 	ver_pslib, */
+/* 	ver_psmodules, */
+/* 	ver_psphot, */
+/* 	ver_psastro, */
+/* 	ver_ppstats, */
+/* 	ver_ppimage, */
+/* 	ver_streaks	 */
         );
 
Index: branches/czw_branch/20100427/ippTools/src/camtoolConfig.c
===================================================================
--- trunk/ippTools/src/camtoolConfig.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/camtoolConfig.c	(revision 27784)
@@ -174,4 +174,12 @@
     psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-magicked",   0,         "set magicked", 0);
 
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_pslib", 0, "define psLib version", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_psmodules", 0, "define psModules version", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_psastro", 0, "define psastro version", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_ppImage", 0, "define ppImage version", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL);
+    
     // -processedexp
     psMetadata *processedexpArgs = psMetadataAlloc();
Index: branches/czw_branch/20100427/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/chiptool.c	(revision 27784)
@@ -583,4 +583,15 @@
     PXOPT_LOOKUP_S64(magicked, config->args,       "-magicked", false, false);
 
+    PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false);
+    PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false);
+    PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false);
+    PXOPT_LOOKUP_STR(ver_psastro, config->args, "-ver_psastro", false, false);
+    PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
+    PXOPT_LOOKUP_STR(ver_ppimage, config->args, "-ver_ppimage", false, false);
+    PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
+
+    psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n",
+	    ver_pslib,ver_psmodules,ver_psphot,ver_psastro,ver_ppstats,ver_ppimage,ver_streaks);
+    
     // default values
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
@@ -660,4 +671,12 @@
                                    quality,
                                    magicked
+/* 				   magicked, */
+/* 				   ver_pslib, */
+/* 				   ver_psmodules, */
+/* 				   ver_psphot, */
+/* 				   ver_psastro, */
+/* 				   ver_ppstats, */
+/* 				   ver_ppimage, */
+/* 				   ver_streaks */
             )) {
         // rollback
Index: branches/czw_branch/20100427/ippTools/src/chiptoolConfig.c
===================================================================
--- trunk/ippTools/src/chiptoolConfig.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/chiptoolConfig.c	(revision 27784)
@@ -182,4 +182,12 @@
     psMetadataAddS64(addprocessedimfileArgs, PS_LIST_TAIL, "-magicked",  0,        "define magicked status", 0);
 
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-ver_pslib", 0, "define psLib version", NULL);
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-ver_psmodules", 0, "define psModules version", NULL);
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL);
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-ver_psastro", 0, "define psastro version", NULL);
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL);
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-ver_ppImage", 0, "define ppImage version", NULL);
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL);
+    
     // -processedimfile
     psMetadata *processedimfileArgs = psMetadataAlloc();
Index: branches/czw_branch/20100427/ippTools/src/difftool.c
===================================================================
--- trunk/ippTools/src/difftool.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/difftool.c	(revision 27784)
@@ -548,4 +548,14 @@
     PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false);
 
+    PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false);
+    PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false);
+    PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false);
+    PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
+    PXOPT_LOOKUP_STR(ver_ppsub, config->args, "-ver_ppsub", false, false);
+    PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
+
+    psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s ppsub %s streaks %s\n",
+	    ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_ppsub,ver_streaks);
+    
     if (!psDBTransaction(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -581,4 +591,12 @@
                            quality,
                            magicked
+/* 			   magicked, */
+/* 			   ver_pslib, */
+/* 			   ver_psmodules, */
+/* 			   ver_psphot, */
+/* 			   ver_ppstats, */
+/* 			   ver_ppsub, */
+/* 			   ver_streaks */
+			 
           )) {
         if (!psDBRollback(config->dbh)) {
Index: branches/czw_branch/20100427/ippTools/src/difftoolConfig.c
===================================================================
--- trunk/ippTools/src/difftoolConfig.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/difftoolConfig.c	(revision 27784)
@@ -126,5 +126,11 @@
     psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-good_frac",  0, "define %% of good pixels", NAN);
     psMetadataAddS64(adddiffskyfileArgs, PS_LIST_TAIL, "-magicked",  0, "define magicked state", 0);
-
+    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-ver_pslib", 0, "define psLib version", NULL);
+    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-ver_psmodules", 0, "define psModules version", NULL);
+    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL);
+    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL);
+    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-ver_ppsub", 0, "define ppSub version", NULL);
+    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL);
+    
     // -advance
     psMetadata *advanceArgs = psMetadataAlloc();
Index: branches/czw_branch/20100427/ippTools/src/pxtools.c
===================================================================
--- trunk/ippTools/src/pxtools.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/pxtools.c	(revision 27784)
@@ -48,4 +48,42 @@
 }
 
+psString pxMergeCodeVersions(psString version1, psString version2) {
+  psString out = NULL;
+
+  bool mod1 = false;
+  bool mod2 = false;
+
+  psS32 num1;
+  psS32 num2;
+  psS32 numO;
+  
+  if (strchr(version1,'M')) {
+    psStringSubstitute(&version1,"M","");
+    mod1 = true;
+  }
+  if (strchr(version2,'M')) {
+    psStringSubstitute(&version2,"M","");
+    mod2 = true;
+  }
+
+  num1 = strtol(version1,NULL,10);
+  num2 = strtol(version2,NULL,10);
+
+  if (num1 >= num2) {
+    numO = num1;
+  }
+  else {
+    numO = num2;
+  }
+  
+  psStringAppend(&out,"%" PRId32,numO);
+  if (mod1 || mod2) {
+    psStringAppend(&out,"M");
+  }
+  return(out);
+}
+
+
+
 // 'scrubbed' is no longer a virtual state equivalent to cleaned, but allows files to be removed
 // even if the config files is missing.  This change was prompted as files that are cleaned can
Index: branches/czw_branch/20100427/ippTools/src/stacktool.c
===================================================================
--- trunk/ippTools/src/stacktool.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/stacktool.c	(revision 27784)
@@ -844,4 +844,14 @@
     PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false);
 
+    PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false);
+    PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false);
+    PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false);
+    PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
+    PXOPT_LOOKUP_STR(ver_ppstack, config->args, "-ver_ppstack", false, false);
+    PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
+
+    psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s ppstack %s streaks %s\n",
+	    ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_ppstack,ver_streaks);
+    
     // default values
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
@@ -884,4 +894,11 @@
                                fault,
                                quality
+/* 			       quality, */
+/* 			       ver_pslib, */
+/* 			       ver_psmodules, */
+/* 			       ver_psphot, */
+/* 			       ver_ppstats, */
+/* 			       ver_ppstack, */
+/* 			       ver_streaks */
           )) {
         if (!psDBRollback(config->dbh)) {
Index: branches/czw_branch/20100427/ippTools/src/stacktoolConfig.c
===================================================================
--- trunk/ippTools/src/stacktoolConfig.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/stacktoolConfig.c	(revision 27784)
@@ -171,4 +171,11 @@
     psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-quality",  0,            "set quality", 0);
 
+    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-ver_pslib", 0, "define psLib version", NULL);
+    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-ver_psmodules", 0, "define psModules version", NULL);
+    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL);
+    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL);
+    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-ver_ppstack", 0, "define ppStack version", NULL);
+    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL);
+
     // -sumskyfile
     psMetadata *sumskyfileArgs= psMetadataAlloc();
Index: branches/czw_branch/20100427/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/warptool.c	(revision 27784)
@@ -1005,8 +1005,21 @@
     PXOPT_LOOKUP_S64(magicked, config->args, "-set_magicked", false, false);
 
+    PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false);
+    PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false);
+    PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false);
+    PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
+    PXOPT_LOOKUP_STR(ver_pswarp, config->args, "-ver_pswarp", false, false);
+    PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
+
+    psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s pswarp %s streaks %s\n",
+	    ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_pswarp,ver_streaks);
+   
+    
     // default values
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
     PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false);
 
+
+    
     // we don't want to insert the last skyfile in a run but then not mark the
     // run as 'stop'
@@ -1037,4 +1050,11 @@
                            quality,
                            magicked
+/* 			   magicked, */
+/* 			   ver_pslib, */
+/* 			   ver_psmodules, */
+/* 			   ver_psphot, */
+/* 			   ver_ppstats, */
+/* 			   ver_pswarp, */
+/* 			   ver_streaks */
         )) {
         if (!psDBRollback(config->dbh)) {
Index: branches/czw_branch/20100427/ippTools/src/warptoolConfig.c
===================================================================
--- trunk/ippTools/src/warptoolConfig.c	(revision 27783)
+++ branches/czw_branch/20100427/ippTools/src/warptoolConfig.c	(revision 27784)
@@ -221,4 +221,12 @@
     psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-quality",  0,            "set quality", 0);
 
+    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-ver_pslib", 0, "define psLib version", NULL);
+    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-ver_psmodules", 0, "define psModules version", NULL);
+    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL);
+    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL);
+    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-ver_pswarp", 0, "define pswarp version", NULL);
+    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL);
+
+    
     // -warped
     psMetadata *warpedArgs = psMetadataAlloc();
Index: branches/czw_branch/20100427/ippconfig/recipes/ppStats.config
===================================================================
--- trunk/ippconfig/recipes/ppStats.config	(revision 27783)
+++ branches/czw_branch/20100427/ippconfig/recipes/ppStats.config	(revision 27784)
@@ -85,4 +85,12 @@
   HEADER        STR     IQ_M4_UQ
 
+  HEADER	STR	PSLIB_V
+  HEADER	STR	MODULE_V
+  HEADER	STR	PHOT_V
+  HEADER	STR	ASTRO_V
+  HEADER	STR	STATS_V
+  HEADER	STR	IMAGE_V
+  HEADER	STR	STREAK_V
+
   HEADER	STR	DETREND.MASK DETREND.BIAS DETREND.DARK DETREND.SHUTTER DETREND.FLAT DETREND.FRINGE
 
@@ -91,4 +99,10 @@
   ANALYSIS      STR     PSASTRO.HEADER
   ANALYSIS	STR	DETREND
+
+#  ANALYSIS 	STR	MASKFRAC_STATIC
+#  ANALYSIS 	STR	MASKFRAC_MAGIC
+#  ANALYSIS	STR	MASKFRAC_ADVISORY
+#  ANALYSIS	STR	MASKFRAC_DYNAMIC
+#  ANALYSIS	STR	MASKFRAC_NPIX
 END
 
@@ -103,7 +117,21 @@
   HEADER        STR     ZPT_ERR
 
+  HEADER	STR	PSLIB_V
+  HEADER	STR	MODULE_V
+  HEADER	STR	PHOT_V
+  HEADER	STR	ASTRO_V
+  HEADER	STR	STATS_V
+  HEADER	STR	IMAGE_V
+  HEADER	STR	STREAK_V
+
   ANALYSIS      MULTI   # metadata blocks to search in chip/cell/readout->analysis
   ANALYSIS      STR     PSPHOT.HEADER
   ANALYSIS      STR     PSASTRO.HEADER
+
+  ANALYSIS 	STR	MASKFRAC_STATIC
+  ANALYSIS 	STR	MASKFRAC_MAGIC
+  ANALYSIS	STR	MASKFRAC_ADVISORY
+  ANALYSIS	STR	MASKFRAC_DYNAMIC
+  ANALYSIS	STR	MASKFRAC_NPIX
 END
 
@@ -241,7 +269,75 @@
   SUMMARY       MULTI
 
+  HEADER	STR	PSLIB_V
+  HEADER	STR	MODULE_V
+  HEADER	STR	PHOT_V
+  HEADER	STR	STATS_V
+  HEADER	STR	WARP_V
+  HEADER	STR	STREAK_V
+
   STAT		STR	ROBUST_MEDIAN
   STAT          STR     ROBUST_STDEV    # Background statistics estimators
   SUMMARY       STR     GOOD_PIXEL_NUM  # Number of good pixels
   SUMMARY       STR     GOOD_PIXEL_FRAC # Fraction of good pixels
-END
+
+  ANALYSIS	MULTI
+  ANALYSIS 	STR	MASKFRAC_STATIC
+  ANALYSIS 	STR	MASKFRAC_MAGIC
+  ANALYSIS	STR	MASKFRAC_ADVISORY
+  ANALYSIS	STR	MASKFRAC_DYNAMIC
+  ANALYSIS	STR	MASKFRAC_NPIX
+END
+
+# Based on WARPSTATS
+# basic stats for stacked images
+STACKSTATS	METADATA
+  HEADER        MULTI
+  CONCEPT       MULTI
+  STAT          MULTI
+  SUMMARY       MULTI
+
+  HEADER	STR	PSLIB_V
+  HEADER	STR	MODULE_V
+  HEADER	STR	PHOT_V
+  HEADER	STR	STATS_V
+  HEADER	STR	STACK_V
+
+  STAT		STR	ROBUST_MEDIAN
+  STAT          STR     ROBUST_STDEV    # Background statistics estimators
+  SUMMARY       STR     GOOD_PIXEL_NUM  # Number of good pixels
+  SUMMARY       STR     GOOD_PIXEL_FRAC # Fraction of good pixels
+
+  ANALYSIS	MULTI
+  ANALYSIS 	STR	MASKFRAC_STATIC
+  ANALYSIS 	STR	MASKFRAC_MAGIC
+  ANALYSIS	STR	MASKFRAC_ADVISORY
+  ANALYSIS	STR	MASKFRAC_DYNAMIC
+  ANALYSIS	STR	MASKFRAC_NPIX
+END
+
+# basic stats for diffed images
+DIFFSTATS	METADATA
+  HEADER        MULTI
+  CONCEPT       MULTI
+  STAT          MULTI
+  SUMMARY       MULTI
+
+  HEADER	STR	PSLIB_V
+  HEADER	STR	MODULE_V
+  HEADER	STR	PHOT_V
+  HEADER	STR	STATS_V
+  HEADER	STR	PPSUB_V
+  HEADER	STR	STREAK_V
+
+  STAT		STR	ROBUST_MEDIAN
+  STAT          STR     ROBUST_STDEV    # Background statistics estimators
+  SUMMARY       STR     GOOD_PIXEL_NUM  # Number of good pixels
+  SUMMARY       STR     GOOD_PIXEL_FRAC # Fraction of good pixels
+
+  ANALYSIS	MULTI
+  ANALYSIS 	STR	MASKFRAC_STATIC
+  ANALYSIS 	STR	MASKFRAC_MAGIC
+  ANALYSIS	STR	MASKFRAC_ADVISORY
+  ANALYSIS	STR	MASKFRAC_DYNAMIC
+  ANALYSIS	STR	MASKFRAC_NPIX
+END
Index: branches/czw_branch/20100427/ippconfig/recipes/ppStatsFromMetadata.config
===================================================================
--- trunk/ippconfig/recipes/ppStatsFromMetadata.config	(revision 27783)
+++ branches/czw_branch/20100427/ippconfig/recipes/ppStatsFromMetadata.config	(revision 27784)
@@ -171,4 +171,13 @@
   ENTRY  VAL  IQ_M2S_U            F32  SAMPLE_MEAN      -iq_m2s_uq            
   ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag
+
+  # Revision values
+  ENTRY	 VAL  PSLIB_V		  STR  CONSTANT		-ver_pslib
+  ENTRY  VAL  MODULE_V		  STR  CONSTANT		-ver_psmodules
+  ENTRY	 VAL  PHOT_V		  STR  CONSTANT		-ver_psphot
+  ENTRY	 VAL  ASTRO_V		  STR  CONSTANT		-ver_psastro
+  ENTRY	 VAL  STATS_V		  STR  CONSTANT		-ver_ppstats
+  ENTRY	 VAL  IMAGE_V		  STR  CONSTANT		-ver_ppimage
+  ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
 END
 
@@ -230,4 +239,13 @@
 
   ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag
+
+  # Revision values
+  ENTRY	 VAL  PSLIB_V		  STR  CONSTANT		-ver_pslib
+  ENTRY  VAL  MODULE_V		  STR  CONSTANT		-ver_psmodules
+  ENTRY	 VAL  PHOT_V		  STR  CONSTANT		-ver_psphot
+  ENTRY	 VAL  ASTRO_V		  STR  CONSTANT		-ver_psastro
+  ENTRY	 VAL  STATS_V		  STR  CONSTANT		-ver_ppstats
+  ENTRY	 VAL  IMAGE_V		  STR  CONSTANT		-ver_ppimage
+  ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
 END
 
@@ -246,4 +264,13 @@
 
   ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag
+
+  # Revision values
+  ENTRY	 VAL  PSLIB_V		  STR  CONSTANT		-ver_pslib
+  ENTRY  VAL  MODULE_V		  STR  CONSTANT		-ver_psmodules
+  ENTRY	 VAL  PHOT_V		  STR  CONSTANT		-ver_psphot
+  ENTRY	 VAL  ASTRO_V		  STR  CONSTANT		-ver_psastro
+  ENTRY	 VAL  STATS_V		  STR  CONSTANT		-ver_ppstats
+  ENTRY	 VAL  IMAGE_V		  STR  CONSTANT		-ver_ppimage
+  ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
 END
 
@@ -261,4 +288,12 @@
   ENTRY  VAL  ACCEPT              BOOL CONSTANT          -accept
   ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag
+
+  # Revision values
+  ENTRY	 VAL  PSLIB_V		  STR  CONSTANT		-ver_pslib
+  ENTRY  VAL  MODULE_V		  STR  CONSTANT		-ver_psmodules
+  ENTRY	 VAL  PHOT_V		  STR  CONSTANT		-ver_psphot
+  ENTRY	 VAL  STATS_V		  STR  CONSTANT		-ver_ppstats
+  ENTRY	 VAL  WARP_V		  STR  CONSTANT		-ver_pswarp
+  ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
 END
 
@@ -288,4 +323,12 @@
   ENTRY  VAL  GOOD_PIXEL_FRAC     F32  MEAN              -good_frac                     
   ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag
+
+  # Revision values
+  ENTRY	 VAL  PSLIB_V		  STR  CONSTANT		-ver_pslib
+  ENTRY  VAL  MODULE_V		  STR  CONSTANT		-ver_psmodules
+  ENTRY	 VAL  PHOT_V		  STR  CONSTANT		-ver_psphot
+  ENTRY	 VAL  STATS_V		  STR  CONSTANT		-ver_ppstats
+  ENTRY	 VAL  STACK_V		  STR  CONSTANT		-ver_ppstack
+  ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
 END
 
@@ -312,4 +355,12 @@
   ENTRY  VAL  GOOD_PIXEL_FRAC        F32  MEAN              -good_frac      
   ENTRY  VAL  QUALITY                S32  CONSTANT          -quality             # Bad quality flag
+
+  # Revision values
+  ENTRY	 VAL  PSLIB_V		  STR  CONSTANT		-ver_pslib
+  ENTRY  VAL  MODULE_V		  STR  CONSTANT		-ver_psmodules
+  ENTRY	 VAL  PHOT_V		  STR  CONSTANT		-ver_psphot
+  ENTRY	 VAL  STATS_V		  STR  CONSTANT		-ver_ppstats
+  ENTRY	 VAL  PPSUB_V		  STR  CONSTANT		-ver_ppsub	
+  ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
 END
 
Index: branches/czw_branch/20100427/magic/censorObjects/src/censorVersion.c
===================================================================
--- trunk/magic/censorObjects/src/censorVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/magic/censorObjects/src/censorVersion.c	(revision 27784)
@@ -58,4 +58,6 @@
     psString source = censorSource();   // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "CENSOR_V", 0, NULL, source);
+    
     psStringPrepend(&version, "censor version: ");
     psStringPrepend(&source, "censor source: ");
Index: branches/czw_branch/20100427/magic/remove/src/streaksVersion.c
===================================================================
--- trunk/magic/remove/src/streaksVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/magic/remove/src/streaksVersion.c	(revision 27784)
@@ -58,4 +58,6 @@
     psString source = streaksSource();   // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "STREAK_V", 0, NULL, source);
+    
     psStringPrepend(&version, "%s version: ", streaksProgram);
     psStringPrepend(&source, "%s source: ", streaksProgram);
Index: branches/czw_branch/20100427/ppArith/src/ppArithVersion.c
===================================================================
--- trunk/ppArith/src/ppArithVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppArith/src/ppArithVersion.c	(revision 27784)
@@ -83,4 +83,6 @@
     psString source  = ppArithSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "ARITH_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppArith version: ");
     psStringPrepend(&version, "ppArith source: ");
Index: branches/czw_branch/20100427/ppImage/src/ppImageVersion.c
===================================================================
--- trunk/ppImage/src/ppImageVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppImage/src/ppImageVersion.c	(revision 27784)
@@ -68,4 +68,6 @@
     psString source  = ppImageSource();  // ppImage software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "IMAGE_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppImage version: ");
     psStringPrepend(&source, "ppImage source: ");
Index: branches/czw_branch/20100427/ppMerge/src/ppMergeVersion.c
===================================================================
--- trunk/ppMerge/src/ppMergeVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppMerge/src/ppMergeVersion.c	(revision 27784)
@@ -83,4 +83,6 @@
     psString source  = ppMergeSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "MERGE_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppMerge version: ");
     psStringPrepend(&source, "ppMerge source: ");
Index: branches/czw_branch/20100427/ppNoiseMap/src/ppNoiseMapVersion.c
===================================================================
--- trunk/ppNoiseMap/src/ppNoiseMapVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppNoiseMap/src/ppNoiseMapVersion.c	(revision 27784)
@@ -61,4 +61,6 @@
     psString source  = ppNoiseMapSource();  // ppNoiseMap software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "NOISEM_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppNoiseMap version: ");
     psStringPrepend(&source, "ppNoiseMap source: ");
Index: branches/czw_branch/20100427/ppSkycell/src/ppSkycellVersion.c
===================================================================
--- trunk/ppSkycell/src/ppSkycellVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppSkycell/src/ppSkycellVersion.c	(revision 27784)
@@ -81,4 +81,6 @@
     psString source  = ppSkycellSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "SKYCELL_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppSkycell version: ");
     psStringPrepend(&version, "ppSkycell source: ");
Index: branches/czw_branch/20100427/ppSmooth/src/ppSmoothVersion.c
===================================================================
--- trunk/ppSmooth/src/ppSmoothVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppSmooth/src/ppSmoothVersion.c	(revision 27784)
@@ -75,4 +75,6 @@
     psString source  = ppSmoothSource();  // ppSmooth software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "SMOOTH_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppSmooth version: ");
     psStringPrepend(&source, "ppSmooth source: ");
Index: branches/czw_branch/20100427/ppStack/src/ppStackVersion.c
===================================================================
--- trunk/ppStack/src/ppStackVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppStack/src/ppStackVersion.c	(revision 27784)
@@ -74,4 +74,6 @@
     psString source  = ppStackSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "STACK_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppStack version: ");
     psStringPrepend(&source, "ppStack source: ");
Index: branches/czw_branch/20100427/ppStats/src/ppStatsVersion.c
===================================================================
--- trunk/ppStats/src/ppStatsVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppStats/src/ppStatsVersion.c	(revision 27784)
@@ -49,4 +49,6 @@
     psString source = ppStatsSource();   // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "STATS_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppStats version: ");
     psStringPrepend(&source, "ppStats source: ");
Index: branches/czw_branch/20100427/ppSub/src/ppSubVersion.c
===================================================================
--- trunk/ppSub/src/ppSubVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppSub/src/ppSubVersion.c	(revision 27784)
@@ -86,4 +86,6 @@
     psString source  = ppSubSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "PPSUB_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppSub version: ");
     psStringPrepend(&source, "ppSub source: ");
Index: branches/czw_branch/20100427/ppTranslate/src/ppTranslateVersion.c
===================================================================
--- trunk/ppTranslate/src/ppTranslateVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppTranslate/src/ppTranslateVersion.c	(revision 27784)
@@ -67,4 +67,6 @@
     psString source  = ppTranslateSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "TRANSL_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppTranslate version: ");
     psStringPrepend(&source, "ppTranslate source: ");
Index: branches/czw_branch/20100427/ppViz/src/ppCoord/ppCoordVersion.c
===================================================================
--- trunk/ppViz/src/ppCoord/ppCoordVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppViz/src/ppCoord/ppCoordVersion.c	(revision 27784)
@@ -81,4 +81,6 @@
     psString source  = ppCoordSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "COORD_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppCoord version: ");
     psStringPrepend(&version, "ppCoord source: ");
Index: branches/czw_branch/20100427/ppViz/src/ppVizPSF/ppVizPSFVersion.c
===================================================================
--- trunk/ppViz/src/ppVizPSF/ppVizPSFVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppViz/src/ppVizPSF/ppVizPSFVersion.c	(revision 27784)
@@ -81,4 +81,6 @@
     psString source  = ppVizPSFSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "VIZPSF_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppVizPSF version: ");
     psStringPrepend(&version, "ppVizPSF source: ");
Index: branches/czw_branch/20100427/ppViz/src/ppVizPattern/ppVizPatternVersion.c
===================================================================
--- trunk/ppViz/src/ppVizPattern/ppVizPatternVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppViz/src/ppVizPattern/ppVizPatternVersion.c	(revision 27784)
@@ -81,4 +81,6 @@
     psString source  = ppVizPatternSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "VIZPAT_V", 0, NULL, source);
+    
     psStringPrepend(&version, "ppVizPattern version: ");
     psStringPrepend(&version, "ppVizPattern source: ");
Index: branches/czw_branch/20100427/ppbgrestore/src/ppbgrestoreVersion.c
===================================================================
--- trunk/ppbgrestore/src/ppbgrestoreVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/ppbgrestore/src/ppbgrestoreVersion.c	(revision 27784)
@@ -64,4 +64,6 @@
     psString source  = ppbgrestoreSource();  // ppbgrestore software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "BGREST_V", 0, NULL, source);
+	
     psStringPrepend(&version, "ppbgrestore version: ");
     psStringPrepend(&source, "ppbgrestore source: ");
Index: branches/czw_branch/20100427/psLib/src/imageops/psImageStats.c
===================================================================
--- trunk/psLib/src/imageops/psImageStats.c	(revision 27783)
+++ branches/czw_branch/20100427/psLib/src/imageops/psImageStats.c	(revision 27784)
@@ -97,7 +97,14 @@
 
 	psVectorMaskType *data = junkMask->data.PS_TYPE_VECTOR_MASK_DATA;
+	psU8* imdata = junkData->data.U8;
 	for (int row = 0, nVect = 0; row < numRows; row++) {
 	    for (int col = 0; col < numCols; col++, nVect++) {
 		data[nVect] = (mask->data.PS_TYPE_IMAGE_MASK_DATA[row][col] & maskVal);
+		
+		if ((imdata[nVect] > 100000)||
+		    (imdata[nVect] != imdata[nVect])||
+		    (imdata[nVect] < -100000)) {
+		  data[nVect] &= maskVal;
+		}
 	    }
 	}
Index: branches/czw_branch/20100427/psLib/src/types/psMetadataHeader.c
===================================================================
--- trunk/psLib/src/types/psMetadataHeader.c	(revision 27783)
+++ branches/czw_branch/20100427/psLib/src/types/psMetadataHeader.c	(revision 27784)
@@ -18,4 +18,6 @@
     psString source = psLibSource();    // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "PSLIB_V", 0, NULL, source);
+    
     psStringPrepend(&version, "psLib version: ");
     psStringPrepend(&source, "psLib source: ");
Index: branches/czw_branch/20100427/psModules/src/config/pmVersion.c
===================================================================
--- trunk/psModules/src/config/pmVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/psModules/src/config/pmVersion.c	(revision 27784)
@@ -64,4 +64,6 @@
     psString source = psModulesSource();   // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "MODULE_V", 0, NULL, source);
+    
     psStringPrepend(&version, "psModules version: ");
     psStringPrepend(&source, "psModules source: ");
Index: branches/czw_branch/20100427/psastro/src/psastroVersion.c
===================================================================
--- trunk/psastro/src/psastroVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/psastro/src/psastroVersion.c	(revision 27784)
@@ -58,4 +58,6 @@
     psString source = psastroSource();   // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "ASTRO_V", 0, NULL, source);
+    
     psStringPrepend(&version, "psastro version: ");
     psStringPrepend(&source, "psastro source: ");
Index: branches/czw_branch/20100427/psphot/src/psphotVersion.c
===================================================================
--- trunk/psphot/src/psphotVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/psphot/src/psphotVersion.c	(revision 27784)
@@ -69,4 +69,6 @@
     psString source = psphotSource();   // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "PHOT_V", 0, NULL, source);
+    
     psStringPrepend(&version, "psphot version: ");
     psStringPrepend(&source, "psphot source: ");
Index: branches/czw_branch/20100427/pstamp/scripts/detect_query_read
===================================================================
--- trunk/pstamp/scripts/detect_query_read	(revision 27783)
+++ branches/czw_branch/20100427/pstamp/scripts/detect_query_read	(revision 27784)
@@ -78,10 +78,16 @@
                         comment => 'site identifier (MPC observatory code)',
                         value => undef
-              }
+                      },
+ 	'STAGE'    => { 
+	                name => 'STAGE',
+			writetype => TSTRING,
+			comment => 'processing stage to examine',
+			value => undef
+	              }
 };
 
 # key_array insures that the order that the keywords is printed out is
 # the same as the ICD
-my @key_array = qw( QUERY_ID FPA_ID MJD_OBS FILTER OBSCODE );
+my @key_array = qw( QUERY_ID FPA_ID MJD_OBS FILTER OBSCODE STAGE);
 
 # Specification of columns
@@ -144,4 +150,7 @@
         my $name = $header->{$key}->{name};
         my $value = $inHeader->{$name};
+	if (($key eq 'STAGE')&& !(defined($value))) {
+	    $value = 'DIFF';
+	}
         # get rid of quotes and whitespace
         $value =~ s/\'//g;
Index: branches/czw_branch/20100427/pstamp/test/detect_query_create
===================================================================
--- trunk/pstamp/test/detect_query_create	(revision 27783)
+++ branches/czw_branch/20100427/pstamp/test/detect_query_create	(revision 27784)
@@ -59,5 +59,10 @@
                     comment => 'site identifier (MPC observatory code)',
                     value => undef
-        }
+        },
+#        { name =>  'STAGE',
+#                    writetype => TSTRING,
+#                    comment => 'processing stage to examine',
+#                    value => undef
+#        }
 ];
 
Index: branches/czw_branch/20100427/pswarp/src/pswarpVersion.c
===================================================================
--- trunk/pswarp/src/pswarpVersion.c	(revision 27783)
+++ branches/czw_branch/20100427/pswarp/src/pswarpVersion.c	(revision 27784)
@@ -85,4 +85,6 @@
     psString source  = pswarpSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "WARP_V", 0, NULL, source);
+    
     psStringPrepend(&version, "pswarp version: ");
     psStringPrepend(&source, "pswarp source: ");