Index: /branches/czw_branch/20170908/Ohana/src/skycalc/Makefile
===================================================================
--- /branches/czw_branch/20170908/Ohana/src/skycalc/Makefile	(revision 40485)
+++ /branches/czw_branch/20170908/Ohana/src/skycalc/Makefile	(revision 40486)
@@ -20,5 +20,5 @@
 libskycalc: $(DESTLIB)/libskycalc.a $(DESTLIB)/libskycalc.$(DLLTYPE)
 
-all: libskycalc dusktime moondata sundata sunriseset
+all: libskycalc dusktime moondata sundata sunriseset sunmoon
 programs: all
 
Index: /branches/czw_branch/20170908/ippScripts/scripts/detrend_norm_apply.pl
===================================================================
--- /branches/czw_branch/20170908/ippScripts/scripts/detrend_norm_apply.pl	(revision 40485)
+++ /branches/czw_branch/20170908/ippScripts/scripts/detrend_norm_apply.pl	(revision 40486)
@@ -88,4 +88,5 @@
     'SKYFLATTEST_RAW'  => 'FLAT',
     'FLAT'             => 'FLAT',
+    'FLATTEST'         => 'FLAT',
     'DOMEFLAT'         => 'FLAT',
     'SKYFLAT'          => 'FLAT',
Index: /branches/czw_branch/20170908/ippScripts/scripts/detrend_norm_calc.pl
===================================================================
--- /branches/czw_branch/20170908/ippScripts/scripts/detrend_norm_calc.pl	(revision 40485)
+++ /branches/czw_branch/20170908/ippScripts/scripts/detrend_norm_calc.pl	(revision 40486)
@@ -80,4 +80,5 @@
     'SKYFLATTEST_RAW'  => 1,
     'FLAT'             => 1,
+    'FLATTEST'         => 1,
     'DOMEFLAT'         => 1,
     'SKYFLAT'          => 1,
@@ -199,5 +200,5 @@
         if ($normalisation == 0.0 or lc($normalisation) eq 'nan') {
             warn("Class $className has bad normalisation: $normalisation");
-            exit($PS_EXIT_SYS_ERROR);
+            # exit($PS_EXIT_SYS_ERROR);
         }
 
@@ -212,5 +213,5 @@
         if (not run \@command, \$stdin, \$stdout, \$stderr) {
             warn("Unable to perform dettool -addnormstat for $className: $?");
-            exit($PS_EXIT_SYS_ERROR);
+            # exit($PS_EXIT_SYS_ERROR);
         }
         print $stdout . "\n" if $verbose;
@@ -225,5 +226,5 @@
         if ($normalisation == 0.0 or lc($normalisation) eq 'nan') {
             warn("Class $className has bad normalisation: $normalisation");
-            exit($PS_EXIT_SYS_ERROR);
+            # exit($PS_EXIT_SYS_ERROR);
         }
         print "$className : $normalisation\n";
Index: /branches/czw_branch/20170908/ippScripts/scripts/detrend_process_imfile.pl
===================================================================
--- /branches/czw_branch/20170908/ippScripts/scripts/detrend_process_imfile.pl	(revision 40485)
+++ /branches/czw_branch/20170908/ippScripts/scripts/detrend_process_imfile.pl	(revision 40486)
@@ -97,4 +97,5 @@
                   'SKYFLATTEST_RAW'  => 'PPIMAGE.OUTPUT.DETREND',
                   'FLAT'             => 'PPIMAGE.OUTPUT.DETREND',
+                  'FLATTEST'         => 'PPIMAGE.OUTPUT.DETREND',
                   'DOMEFLAT'         => 'PPIMAGE.OUTPUT.DETREND',
                   'SKYFLAT'          => 'PPIMAGE.OUTPUT.DETREND',
Index: /branches/czw_branch/20170908/ippScripts/scripts/detrend_resid_imfile.pl
===================================================================
--- /branches/czw_branch/20170908/ippScripts/scripts/detrend_resid_imfile.pl	(revision 40485)
+++ /branches/czw_branch/20170908/ippScripts/scripts/detrend_resid_imfile.pl	(revision 40486)
@@ -114,4 +114,5 @@
     'SKYFLATTEST_RAW'  => '-flat',      # Specify the flat frame
     'FLAT'             => '-flat',      # Specify the flat frame
+    'FLATTEST'         => '-flat',      # Specify the flat frame
     'DOMEFLAT'         => '-flat',      # Specify the flat frame
     'SKYFLAT'          => '-flat',      # Specify the flat frame
@@ -142,4 +143,5 @@
                   'SKYFLATTEST_RAW'  => 'PPIMAGE.OUTPUT.DETREND',
                   'FLAT'             => 'PPIMAGE.OUTPUT.DETREND',
+                  'FLATTEST'         => 'PPIMAGE.OUTPUT.DETREND',
                   'DOMEFLAT'         => 'PPIMAGE.OUTPUT.DETREND',
                   'SKYFLAT'          => 'PPIMAGE.OUTPUT.DETREND',
Index: /branches/czw_branch/20170908/ippScripts/scripts/detrend_stack.pl
===================================================================
--- /branches/czw_branch/20170908/ippScripts/scripts/detrend_stack.pl	(revision 40485)
+++ /branches/czw_branch/20170908/ippScripts/scripts/detrend_stack.pl	(revision 40486)
@@ -92,4 +92,5 @@
                   'SKYFLATTEST_RAW'  => 'PPMERGE.OUTPUT.FLAT',
                   'FLAT'             => 'PPMERGE.OUTPUT.FLAT',
+                  'FLATTEST'         => 'PPMERGE.OUTPUT.FLAT',
                   'DOMEFLAT'         => 'PPMERGE.OUTPUT.FLAT',
                   'SKYFLAT'          => 'PPMERGE.OUTPUT.FLAT',
@@ -118,4 +119,5 @@
                    'SKYFLATTEST_RAW'  => 'DETSTATS',
                    'FLAT'             => 'DETSTATS',
+                   'FLATTEST'         => 'DETSTATS',
                    'DOMEFLAT'         => 'DETSTATS',
                    'SKYFLAT'          => 'DETSTATS',
Index: /branches/czw_branch/20170908/ippconfig/recipes/reductionClasses.mdc
===================================================================
--- /branches/czw_branch/20170908/ippconfig/recipes/reductionClasses.mdc	(revision 40485)
+++ /branches/czw_branch/20170908/ippconfig/recipes/reductionClasses.mdc	(revision 40486)
@@ -45,4 +45,11 @@
 	FLAT_PREMASK_JPEG_RESID		STR	FLAT_RESID
 
+	FLATTEST_PREMASK_PROCESS	STR	PPIMAGE_FLATPROC_PREMASK
+	FLATTEST_PREMASK_RESID		STR	PPIMAGE_F
+	FLATTEST_PREMASK_VERIFY		STR	PPIMAGE_F
+	FLATTEST_PREMASK_STACK		STR	PPMERGE_FLAT
+	FLATTEST_PREMASK_JPEG_IMAGE	STR	FLAT
+	FLATTEST_PREMASK_JPEG_RESID	STR	FLAT_RESID
+
 	DOMEFLAT_PREMASK_PROCESS	STR	PPIMAGE_FLATPROC_PREMASK 
 	DOMEFLAT_PREMASK_RESID		STR	PPIMAGE_F
@@ -88,6 +95,4 @@
         SKYFLATTEST_RAW_JPEG_RESID  STR     FLAT_RESID     
 
-
-
 	# *** Standard flat-field types
 	FLAT_PROCESS		STR	PPIMAGE_OBDS
@@ -97,4 +102,11 @@
 	FLAT_JPEG_IMAGE		STR	FLAT
 	FLAT_JPEG_RESID		STR	FLAT_RESID
+
+	FLATTEST_PROCESS	STR	PPIMAGE_OBDS
+	FLATTEST_RESID		STR	PPIMAGE_F
+	FLATTEST_VERIFY		STR	PPIMAGE_F
+	FLATTEST_STACK		STR	PPMERGE_FLAT
+	FLATTEST_JPEG_IMAGE	STR	FLAT
+	FLATTEST_JPEG_RESID	STR	FLAT_RESID
 
 	DOMEFLAT_PROCESS	STR	PPIMAGE_OBDS
Index: /branches/czw_branch/20170908/ippconfig/recipes/rejections.config
===================================================================
--- /branches/czw_branch/20170908/ippconfig/recipes/rejections.config	(revision 40485)
+++ /branches/czw_branch/20170908/ippconfig/recipes/rejections.config	(revision 40486)
@@ -122,4 +122,28 @@
 
 FLAT METADATA
+  FILTER      	     STR  *
+  EXPECTED    	     F32  0.0
+  IMFILE.MEAN 	     F32  0.0
+  IMFILE.STDEV       F32  0.0
+  IMFILE.MEANSTDEV   F32  0.0
+  IMFILE.SKEWNESS    F32  0.0
+  IMFILE.KURTOSIS    F32  0.0
+  IMFILE.SNR         F32  0.0
+  IMFILE.BIN.STDEV   F32  0.0
+  IMFILE.BIN.SNR     F32  0.0
+  IMFILE.FLUX        F32  0.0
+  EXP.MEAN           F32  0.0
+  EXP.STDEV          F32  0.0
+  EXP.MEANSTDEV      F32  0.0
+  EXP.SNR            F32  0.0
+  EXP.BIN.STDEV      F32  0.0
+  EXP.BIN.SNR        F32  0.0
+  EXP.FLUX           F32  0.0
+  ENSEMBLE.MEAN      F32  0.0
+  ENSEMBLE.STDEV     F32  0.0
+  ENSEMBLE.MEANSTDEV F32  3.0
+END
+
+FLATTEST METADATA
   FILTER      	     STR  *
   EXPECTED    	     F32  0.0
Index: /branches/czw_branch/20170908/ppMerge/src/ppMergeArguments.c
===================================================================
--- /branches/czw_branch/20170908/ppMerge/src/ppMergeArguments.c	(revision 40485)
+++ /branches/czw_branch/20170908/ppMerge/src/ppMergeArguments.c	(revision 40486)
@@ -261,4 +261,5 @@
     }
     if (!strcasecmp(typeStr, "FLAT") ||
+        !strcasecmp(typeStr, "FLATTEST") ||
         !strcasecmp(typeStr, "DOMEFLAT") ||
         !strcasecmp(typeStr, "SKYFLAT") ||