Changeset 33415 for branches/meh_branches/ppstack_test/ippconfig

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/Makefile.am (modified) (1 diff)
• ippconfig/configure.ac (modified) (1 diff)
• ippconfig/gpc1/format_20090120.config (modified) (2 diffs)
• ippconfig/gpc1/format_20090220.config (modified) (3 diffs)
• ippconfig/gpc1/format_20091209.config (modified) (6 diffs)
• ippconfig/gpc1/format_20100122.config (modified) (5 diffs)
• ippconfig/gpc1/format_20100228.config (modified) (5 diffs)
• ippconfig/gpc1/format_20100723.config (modified) (5 diffs)
• ippconfig/gpc1/ppImage.config (modified) (3 diffs)
• ippconfig/gpc1/ppStack.config (modified) (1 diff)
• ippconfig/gpc1/psastro.config (modified) (1 diff)
• ippconfig/gpc1/psphot.config (modified) (1 diff)
• ippconfig/lbc_red/filerules.mdc (modified) (1 diff)
• ippconfig/megacam/camera.config (modified) (1 diff)
• ippconfig/recipes/filerules-mef.mdc (modified) (3 diffs)
• ippconfig/recipes/filerules-simple.mdc (modified) (3 diffs)
• ippconfig/recipes/filerules-split.mdc (modified) (4 diffs)
• ippconfig/recipes/jpeg.mdc (modified) (1 diff)
• ippconfig/recipes/nightly_science.config (modified) (16 diffs)
• ippconfig/recipes/ppImage.config (modified) (2 diffs)
• ippconfig/recipes/ppSim.config (modified) (3 diffs)
• ippconfig/recipes/ppStack.config (modified) (1 diff)
• ippconfig/recipes/ppStatsFromMetadata.config (modified) (1 diff)
• ippconfig/recipes/ppSub.config (modified) (1 diff)
• ippconfig/recipes/psastro.config (modified) (1 diff)
• ippconfig/recipes/psphot.config (modified) (8 diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (5 diffs, 1 prop)
• ippconfig/ssp (copied) (copied from trunk/ippconfig/ssp )
• ippconfig/ssp/Makefile.am (copied) (copied from trunk/ippconfig/ssp/Makefile.am )
• ippconfig/ssp/camera.config (copied) (copied from trunk/ippconfig/ssp/camera.config )
• ippconfig/ssp/format.config (copied) (copied from trunk/ippconfig/ssp/format.config )
• ippconfig/ssp/ppImage.config (copied) (copied from trunk/ippconfig/ssp/ppImage.config )
• ippconfig/ssp/psastro.config (copied) (copied from trunk/ippconfig/ssp/psastro.config )
• ippconfig/ssp/psphot.config (copied) (copied from trunk/ippconfig/ssp/psphot.config )
• ippconfig/system.config (modified) (1 diff)

branches/meh_branches/ppstack_test/ippconfig/Makefile.am

@@ -18 +18 @@
         lbc_red \
         lulin \
+        ssp \
         uh8k
 

branches/meh_branches/ppstack_test/ippconfig/configure.ac

@@ -29 +29 @@
   lbc_red/Makefile
   lulin/Makefile
+  ssp/Makefile
   uh8k/Makefile
 ])

branches/meh_branches/ppstack_test/ippconfig/gpc1/format_20090120.config

@@ -185 +185 @@
         FPA.ALT         STR     ALT
         FPA.AZ          STR     AZ
-        # FPA.TEMP        STR     DETTEM
+         FPA.TEMP        STR     DETTEM
         FPA.M1X         STR     M1X
         FPA.M1Y         STR     M1Y   
@@ -505 +505 @@
 DATABASE        METADATA
         # this rule is fragile : does not match the camera
-        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
+#        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
 END
 

branches/meh_branches/ppstack_test/ippconfig/gpc1/format_20090220.config

@@ -185 +185 @@
         FPA.ALT         STR     ALT
         FPA.AZ          STR     AZ
-        # FPA.TEMP        STR     DETTEM
+        FPA.TEMP        STR     DETTEM
         FPA.M1X         STR     M1X
         FPA.M1Y         STR     M1Y   
@@ -505 +505 @@
 DATABASE        METADATA
         # this rule is fragile : does not match the camera
-        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
+#        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
 END
 
@@ -590 +590 @@
         XY76    STR     1111111111111111111111111111111111111111111111111111111111111111
 END
+PATTERN.CELL    BOOL    FALSE
+PATTERN.CONTINUITY BOOL TRUE
 PATTERN.CELL.SUBSET      METADATA        # List of chips and whether to do cell pattern correction  
         XY01    BOOL    FALSE

branches/meh_branches/ppstack_test/ippconfig/gpc1/format_20091209.config

@@ -185 +185 @@
         FPA.ALT         STR     ALT
         FPA.AZ          STR     AZ
-        # FPA.TEMP        STR     DETTEM
+        FPA.TEMP        STR     DETTEM
         FPA.M1X         STR     M1X
         FPA.M1Y         STR     M1Y   
@@ -505 +505 @@
 DATABASE        METADATA
         # this rule is fragile : does not match the camera
-        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
+#        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
 END
 
@@ -525 +525 @@
 
 # PATTERN.ROW           BOOL    TRUE    # Do any row pattern correction at all?
+# PATTERN.ROW.SUBSET    METADATA        # List of chips and whether to do row pattern correction
+#       XY01    BOOL    FALSE
+#         XY02  STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+#       XY06    BOOL    FALSE
+#       XY10    BOOL    FALSE
+#       XY11    STR     0011100100000000000000000000000000000000000000000000000000000000
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#         XY14  STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
+#       XY15    STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
+#       XY16    BOOL    FALSE
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+#       XY24    BOOL    FALSE
+#       XY25    BOOL    FALSE
+#       XY26    BOOL    FALSE
+#       XY27    STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
+#       XY30    BOOL    FALSE
+#       XY31    STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
+#       XY32    STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+#       XY33    BOOL    FALSE
+#       XY34    BOOL    FALSE
+#       XY35    BOOL    FALSE
+#       XY36    BOOL    FALSE
+#       XY37    BOOL    FALSE
+#       XY40    BOOL    FALSE
+#       XY41    BOOL    FALSE
+#       XY42    BOOL    FALSE
+#       XY43    BOOL    FALSE
+#       XY44    BOOL    FALSE
+#       XY45    STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+#       XY46    BOOL    FALSE
+#       XY47    STR     1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    STR     1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7
+#       XY60    STR     0000000000000000000000000000000000000000000001000000000000000000 # cell xy55
+#       XY61    BOOL    FALSE
+#       XY62    BOOL    FALSE
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+#       XY72    BOOL    FALSE
+#       XY73    BOOL    FALSE
+#       XY74    STR     0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END
+
+# # PATTERN.CELL        BOOL    TRUE            # by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET   METADATA        # List of chips and whether to do cell pattern correction
+#       XY01    BOOL    FALSE
+#       XY02    BOOL    FALSE
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+#       XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
+#       XY10    BOOL    FALSE
+#       XY11    BOOL    FALSE
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#       XY14    STR     0000000000000000111111110000000000000000000000010000000000101101
+#       XY15    STR     0011111100011000000001000000010000001001000111110001010000011111
+#       XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+#       XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
+#       XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
+#       XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
+#       XY27    BOOL    FALSE
+#       XY30    BOOL    FALSE
+#       XY31    BOOL    FALSE
+#       XY32    BOOL    FALSE
+#       XY33    BOOL    FALSE
+#       XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
+#       XY35    BOOL    FALSE
+#       XY36    STR     0000000000000000000000000000000000010000000000000000000000000000
+#       XY37    STR     0000000000000000000000000000000100010001000000001011000010110110
+#       XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
+#       XY41    BOOL    FALSE
+#       XY42    BOOL    FALSE
+#       XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
+#       XY44    BOOL    FALSE
+#       XY45    BOOL    FALSE
+#       XY46    BOOL    FALSE
+#       XY47    BOOL    FALSE
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    BOOL    FALSE
+#       XY60    BOOL    FALSE
+#       XY61    BOOL    FALSE
+#       XY62    STR     0000000000000000000000000000000000001000000000000000000100001010
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    BOOL    FALSE
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+#       XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
+#       XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
+#       XY74    BOOL    FALSE
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END
+# PATTERN.ROW           BOOL    TRUE    # Do any row pattern correction at all?
 PATTERN.ROW.SUBSET      METADATA        # List of chips and whether to do row pattern correction
         XY01    BOOL    FALSE
-        XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#       XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+        XY02    BOOL    FALSE
         XY03    BOOL    FALSE
         XY04    BOOL    FALSE
@@ -536 +664 @@
         XY12    BOOL    FALSE
         XY13    BOOL    FALSE
-        XY14    STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
+        XY14    STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
         XY15    STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
         XY16    BOOL    FALSE
@@ -578 +706 @@
         XY64    BOOL    FALSE
         XY65    BOOL    FALSE
-        XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#       XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+        XY66    BOOL    FALSE
         XY67    BOOL    FALSE
         XY71    BOOL    FALSE
@@ -588 +717 @@
 END
 
-# PATTERN.CELL  BOOL    TRUE            # by default, do not do any cell pattern correction
-PATTERN.CELL.SUBSET     METADATA        # List of chips and whether to do cell pattern correction
-        XY01    BOOL    FALSE
-        XY02    BOOL    FALSE
-        XY03    BOOL    FALSE
-        XY04    BOOL    FALSE
-        XY05    BOOL    FALSE
-        XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
-        XY10    BOOL    FALSE
-        XY11    BOOL    FALSE
-        XY12    BOOL    FALSE
-        XY13    BOOL    FALSE
-        XY14    STR     0000000000000000111111110000000000000000000000010000000000101101
-        XY15    STR     0011111100011000000001000000010000001001000111110001010000011111
-        XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
-        XY17    BOOL    FALSE
-        XY20    BOOL    FALSE
-        XY21    BOOL    FALSE
-        XY22    BOOL    FALSE
-        XY23    BOOL    FALSE
-        XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
-        XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
-        XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
-        XY27    BOOL    FALSE
-        XY30    BOOL    FALSE
-        XY31    BOOL    FALSE
-        XY32    BOOL    FALSE
-        XY33    BOOL    FALSE
-        XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
-        XY35    BOOL    FALSE
-        XY36    STR     0000000000000000000000000000000000010000000000000000000000000000
-        XY37    STR     0000000000000000000000000000000100010001000000001011000010110110
-        XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
-        XY41    BOOL    FALSE
-        XY42    BOOL    FALSE
-        XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
-        XY44    BOOL    FALSE
-        XY45    BOOL    FALSE
-        XY46    BOOL    FALSE
-        XY47    BOOL    FALSE
-        XY50    BOOL    FALSE
-        XY51    BOOL    FALSE
-        XY52    BOOL    FALSE
-        XY53    BOOL    FALSE
-        XY54    BOOL    FALSE
-        XY55    BOOL    FALSE
-        XY56    BOOL    FALSE
-        XY57    BOOL    FALSE
-        XY60    BOOL    FALSE
-        XY61    BOOL    FALSE
-        XY62    STR     0000000000000000000000000000000000001000000000000000000100001010
-        XY63    BOOL    FALSE
-        XY64    BOOL    FALSE
-        XY65    BOOL    FALSE
-        XY66    BOOL    FALSE
-        XY67    BOOL    FALSE
-        XY71    BOOL    FALSE
-        XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
-        XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
-        XY74    BOOL    FALSE
-        XY75    BOOL    FALSE
-        XY76    BOOL    FALSE
-END
+PATTERN.CELL    BOOL   FALSE
+PATTERN.CONTINUITY BOOL TRUE
+
+# # PATTERN.CELL        BOOL    TRUE            # by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET   METADATA        # List of chips and whether to do cell pattern correction
+#       XY01    BOOL    FALSE
+#       XY02    BOOL    FALSE
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+# #     XY06    STR     0101000000010000000110000100000000000000000000000000000000000000
+#       XY06    BOOL    FALSE
+#       XY10    BOOL    FALSE
+#       XY11    BOOL    FALSE
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#       XY14    STR     0000000000000000111111110000000000000000000000000000000000000000
+#       XY15    STR     1111111110000000100000000000000000000000000000000000000000000000
+# #     XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
+#       XY16    BOOL    FALSE
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+# #     XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
+#       XY24    BOOL    FALSE
+# #     XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
+#       XY25    BOOL    FALSE
+# #     XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
+#       XY26    BOOL    FALSE
+#       XY27    BOOL    FALSE
+#       XY30    BOOL    FALSE
+#       XY31    BOOL    FALSE
+#       XY32    BOOL    FALSE
+#       XY33    BOOL    FALSE
+# #     XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
+#       XY34    BOOL    FALSE
+#       XY35    BOOL    FALSE
+# #     XY36    STR     0001000000000000000000000000000000010000000000000000000000000000
+#       XY36    BOOL    FALSE
+# #     XY37    STR     0000000000000000000000000000000100010001000000001011000010110110 ?
+#       XY37    BOOL    FALSE
+# #     XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
+#       XY40    BOOL    FALSE
+#       XY41    BOOL    FALSE
+# #     XY42    BOOL    FALSE
+#       XY42    STR     0000000000000000000100000001000000000000000000000000000000000000
+# #     XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
+#       XY43    STR     0000000000000000000000000000000000000000000010000000000000000000
+#       XY44    BOOL    FALSE
+#       XY45    BOOL    FALSE
+#       XY46    BOOL    FALSE
+#       XY47    BOOL    FALSE
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    BOOL    FALSE
+#       XY60    BOOL    FALSE
+#       XY61    BOOL    FALSE
+# #     XY62    STR     0000000000000000000000000000000000000000000000000000000000000010
+#       XY62    BOOL    FALSE
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    BOOL    FALSE
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+# #     XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
+#       XY72    BOOL    FALSE
+# #     XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
+#       XY73    BOOL    FALSE
+#       XY74    BOOL    FALSE
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END

branches/meh_branches/ppstack_test/ippconfig/gpc1/format_20100122.config

@@ -185 +185 @@
         FPA.ALT         STR     ALT
         FPA.AZ          STR     AZ
-        # FPA.TEMP        STR     DETTEM
+        FPA.TEMP        STR     DETTEM
         FPA.M1X         STR     M1X
         FPA.M1Y         STR     M1Y   
@@ -506 +506 @@
 DATABASE        METADATA
         # this rule is fragile : does not match the camera
-        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
+#        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
 END
 
@@ -527 +527 @@
 # Pattern correction information:
 
+# # PATTERN.ROW         BOOL    TRUE    # Do any row pattern correction at all?
+# PATTERN.ROW.SUBSET    METADATA        # List of chips and whether to do row pattern correction
+#       XY01    BOOL    FALSE
+#       XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+#       XY06    BOOL    FALSE
+#       XY10    BOOL    FALSE
+#       XY11    STR     0011100100000000000000000000000000000000000000000000000000000000
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#       XY14    STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
+#       XY15    STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
+#       XY16    BOOL    FALSE
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+#       XY24    BOOL    FALSE
+#       XY25    BOOL    FALSE
+#       XY26    BOOL    FALSE
+#       XY27    STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
+#       XY30    BOOL    FALSE
+#       XY31    STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
+#       XY32    STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+#       XY33    BOOL    FALSE
+#       XY34    BOOL    FALSE
+#       XY35    BOOL    FALSE
+#       XY36    BOOL    FALSE
+#       XY37    BOOL    FALSE
+#       XY40    BOOL    FALSE
+#       XY41    BOOL    FALSE
+#       XY42    BOOL    FALSE
+#       XY43    BOOL    FALSE
+#       XY44    BOOL    FALSE
+#       XY45    STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+#       XY46    BOOL    FALSE
+#       XY47    STR     1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    STR     1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7
+#       XY60    STR     0000000000000000000000000000000000000000000001000000000000000000 # cell xy55
+#       XY61    BOOL    FALSE
+#       XY62    BOOL    FALSE
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+#       XY72    BOOL    FALSE
+#       XY73    BOOL    FALSE
+#       XY74    STR     0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END
+
+# # PATTERN.CELL        BOOL    TRUE            # by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET   METADATA        # List of chips and whether to do cell pattern correction
+#       XY01    BOOL    FALSE
+#       XY02    BOOL    FALSE
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+#       XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
+#       XY10    BOOL    FALSE
+#       XY11    BOOL    FALSE
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#       XY14    STR     0000000000000000111111110000000000000000000000010000000000101101
+#       XY15    STR     0011111100011000000001000000010000001001000111110001010000011111
+#       XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+#       XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
+#       XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
+#       XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
+#       XY27    BOOL    FALSE
+#       XY30    BOOL    FALSE
+#       XY31    BOOL    FALSE
+#       XY32    BOOL    FALSE
+#       XY33    BOOL    FALSE
+#       XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
+#       XY35    BOOL    FALSE
+#       XY36    STR     0000000000000000000000000000000000010000000000000000000000000000
+#       XY37    STR     0000000000000000000000000000000100010001000000001011000010110110
+#       XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
+#       XY41    BOOL    FALSE
+#       XY42    BOOL    FALSE
+#       XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
+#       XY44    BOOL    FALSE
+#       XY45    BOOL    FALSE
+#       XY46    BOOL    FALSE
+#       XY47    BOOL    FALSE
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    BOOL    FALSE
+#       XY60    BOOL    FALSE
+#       XY61    BOOL    FALSE
+#       XY62    STR     0000000000000000000000000000000000001000000000000000000100001010
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    BOOL    FALSE
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+#       XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
+#       XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
+#       XY74    BOOL    FALSE
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END
 # PATTERN.ROW           BOOL    TRUE    # Do any row pattern correction at all?
 PATTERN.ROW.SUBSET      METADATA        # List of chips and whether to do row pattern correction
         XY01    BOOL    FALSE
-        XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#       XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+        XY02    BOOL    FALSE
         XY03    BOOL    FALSE
         XY04    BOOL    FALSE
@@ -581 +709 @@
         XY64    BOOL    FALSE
         XY65    BOOL    FALSE
-        XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#       XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+        XY66    BOOL    FALSE
         XY67    BOOL    FALSE
         XY71    BOOL    FALSE
@@ -591 +720 @@
 END
 
-# PATTERN.CELL  BOOL    TRUE            # by default, do not do any cell pattern correction
-PATTERN.CELL.SUBSET     METADATA        # List of chips and whether to do cell pattern correction
-        XY01    BOOL    FALSE
-        XY02    BOOL    FALSE
-        XY03    BOOL    FALSE
-        XY04    BOOL    FALSE
-        XY05    BOOL    FALSE
-        XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
-        XY10    BOOL    FALSE
-        XY11    BOOL    FALSE
-        XY12    BOOL    FALSE
-        XY13    BOOL    FALSE
-        XY14    STR     0000000000000000111111110000000000000000000000010000000000101101
-        XY15    STR     0011111100011000000001000000010000001001000111110001010000011111
-        XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
-        XY17    BOOL    FALSE
-        XY20    BOOL    FALSE
-        XY21    BOOL    FALSE
-        XY22    BOOL    FALSE
-        XY23    BOOL    FALSE
-        XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
-        XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
-        XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
-        XY27    BOOL    FALSE
-        XY30    BOOL    FALSE
-        XY31    BOOL    FALSE
-        XY32    BOOL    FALSE
-        XY33    BOOL    FALSE
-        XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
-        XY35    BOOL    FALSE
-        XY36    STR     0000000000000000000000000000000000010000000000000000000000000000
-        XY37    STR     0000000000000000000000000000000100010001000000001011000010110110
-        XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
-        XY41    BOOL    FALSE
-        XY42    BOOL    FALSE
-        XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
-        XY44    BOOL    FALSE
-        XY45    BOOL    FALSE
-        XY46    BOOL    FALSE
-        XY47    BOOL    FALSE
-        XY50    BOOL    FALSE
-        XY51    BOOL    FALSE
-        XY52    BOOL    FALSE
-        XY53    BOOL    FALSE
-        XY54    BOOL    FALSE
-        XY55    BOOL    FALSE
-        XY56    BOOL    FALSE
-        XY57    BOOL    FALSE
-        XY60    BOOL    FALSE
-        XY61    BOOL    FALSE
-        XY62    STR     0000000000000000000000000000000000001000000000000000000100001010
-        XY63    BOOL    FALSE
-        XY64    BOOL    FALSE
-        XY65    BOOL    FALSE
-        XY66    BOOL    FALSE
-        XY67    BOOL    FALSE
-        XY71    BOOL    FALSE
-        XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
-        XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
-        XY74    BOOL    FALSE
-        XY75    BOOL    FALSE
-        XY76    BOOL    FALSE
-END
+PATTERN.CELL BOOL FALSE
+PATTERN.CONTINUITY BOOL TRUE
+
+# # PATTERN.CELL        BOOL    TRUE            # by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET   METADATA        # List of chips and whether to do cell pattern correction
+#       XY01    BOOL    FALSE
+#       XY02    BOOL    FALSE
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+# #     XY06    STR     0101000000010000000110000100000000000000000000000000000000000000
+#       XY06    BOOL    FALSE
+#       XY10    BOOL    FALSE
+#       XY11    BOOL    FALSE
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#       XY14    STR     0000000000000000111111110000000000000000000000000000000000000000
+#       XY15    STR     1111111110000000100000000000000000000000000000000000000000000000
+# #     XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
+#       XY16    BOOL    FALSE
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+# #     XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
+#       XY24    BOOL    FALSE
+# #     XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
+#       XY25    BOOL    FALSE
+# #     XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
+#       XY26    BOOL    FALSE
+#       XY27    BOOL    FALSE
+#       XY30    BOOL    FALSE
+#       XY31    BOOL    FALSE
+#       XY32    BOOL    FALSE
+#       XY33    BOOL    FALSE
+# #     XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
+#       XY34    BOOL    FALSE
+#       XY35    BOOL    FALSE
+# #     XY36    STR     0001000000000000000000000000000000010000000000000000000000000000
+#       XY36    BOOL    FALSE
+# #     XY37    STR     0000000000000000000000000000000100010001000000001011000010110110 ?
+#       XY37    BOOL    FALSE
+# #     XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
+#       XY40    BOOL    FALSE
+#       XY41    BOOL    FALSE
+# #     XY42    BOOL    FALSE
+#       XY42    STR     0000000000000000000100000001000000000000000000000000000000000000
+# #     XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
+#       XY43    STR     0000000000000000000000000000000000000000000010000000000000000000
+#       XY44    BOOL    FALSE
+#       XY45    BOOL    FALSE
+#       XY46    BOOL    FALSE
+#       XY47    BOOL    FALSE
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    BOOL    FALSE
+#       XY60    BOOL    FALSE
+#       XY61    BOOL    FALSE
+# #     XY62    STR     0000000000000000000000000000000000000000000000000000000000000010
+#       XY62    BOOL    FALSE
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    BOOL    FALSE
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+# #     XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
+#       XY72    BOOL    FALSE
+# #     XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
+#       XY73    BOOL    FALSE
+#       XY74    BOOL    FALSE
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END

branches/meh_branches/ppstack_test/ippconfig/gpc1/format_20100228.config

@@ -185 +185 @@
         FPA.ALT         STR     ALT
         FPA.AZ          STR     AZ
-        # FPA.TEMP        STR     DETTEM
+         FPA.TEMP        STR     DETTEM
         FPA.M1X         STR     M1X
         FPA.M1Y         STR     M1Y   
@@ -506 +506 @@
 DATABASE        METADATA
         # this rule is fragile : does not match the camera
-        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
+#        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
 END
 
@@ -526 +526 @@
 # Pattern correction information:
 
+# # PATTERN.ROW         BOOL    TRUE    # Do any row pattern correction at all?
+# PATTERN.ROW.SUBSET    METADATA        # List of chips and whether to do row pattern correction
+#       XY01    BOOL    FALSE
+#       XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+#       XY06    BOOL    FALSE
+#       XY10    BOOL    FALSE
+#       XY11    STR     0011100100000000000000000000000000000000000000000000000000000000
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#       XY14    STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
+#       XY15    STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
+#       XY16    BOOL    FALSE
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+#       XY24    BOOL    FALSE
+#       XY25    BOOL    FALSE
+#       XY26    BOOL    FALSE
+#       XY27    STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
+#       XY30    BOOL    FALSE
+#       XY31    STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
+#       XY32    STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+#       XY33    BOOL    FALSE
+#       XY34    BOOL    FALSE
+#       XY35    BOOL    FALSE
+#       XY36    BOOL    FALSE
+#       XY37    BOOL    FALSE
+#       XY40    BOOL    FALSE
+#       XY41    BOOL    FALSE
+#       XY42    BOOL    FALSE
+#       XY43    BOOL    FALSE
+#       XY44    BOOL    FALSE
+#       XY45    STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+#       XY46    BOOL    FALSE
+#       XY47    STR     1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    STR     1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7
+#       XY60    STR     0000000000000000000000000000000000000000000001000000000000000000 # cell xy55
+#       XY61    BOOL    FALSE
+#       XY62    BOOL    FALSE
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+#       XY72    BOOL    FALSE
+#       XY73    BOOL    FALSE
+#       XY74    STR     0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END
+
+# # PATTERN.CELL        BOOL    TRUE            # by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET   METADATA        # List of chips and whether to do cell pattern correction
+#       XY01    BOOL    FALSE
+#       XY02    BOOL    FALSE
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+#       XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
+#       XY10    BOOL    FALSE
+#       XY11    BOOL    FALSE
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#       XY14    STR     0000000000000000111111110000000000000000000000010000000000101101
+#       XY15    STR     0011111100011000000001000000010000001001000111110001010000011111
+#       XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+#       XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
+#       XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
+#       XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
+#       XY27    BOOL    FALSE
+#       XY30    BOOL    FALSE
+#       XY31    BOOL    FALSE
+#       XY32    BOOL    FALSE
+#       XY33    BOOL    FALSE
+#       XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
+#       XY35    BOOL    FALSE
+#       XY36    STR     0000000000000000000000000000000000010000000000000000000000000000
+#       XY37    STR     0000000000000000000000000000000100010001000000001011000010110110
+#       XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
+#       XY41    BOOL    FALSE
+#       XY42    BOOL    FALSE
+#       XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
+#       XY44    BOOL    FALSE
+#       XY45    BOOL    FALSE
+#       XY46    BOOL    FALSE
+#       XY47    BOOL    FALSE
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    BOOL    FALSE
+#       XY60    BOOL    FALSE
+#       XY61    BOOL    FALSE
+#       XY62    STR     0000000000000000000000000000000000001000000000000000000100001010
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    BOOL    FALSE
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+#       XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
+#       XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
+#       XY74    BOOL    FALSE
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END
 # PATTERN.ROW           BOOL    TRUE    # Do any row pattern correction at all?
 PATTERN.ROW.SUBSET      METADATA        # List of chips and whether to do row pattern correction
         XY01    BOOL    FALSE
-        XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#       XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+        XY02    BOOL    FALSE
         XY03    BOOL    FALSE
         XY04    BOOL    FALSE
@@ -580 +708 @@
         XY64    BOOL    FALSE
         XY65    BOOL    FALSE
-        XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#       XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+        XY66    BOOL    FALSE
         XY67    BOOL    FALSE
         XY71    BOOL    FALSE
@@ -590 +719 @@
 END
 
+PATTERN.CELL BOOL FALSE
+PATTERN.CONTINUITY BOOL TRUE
+
 # PATTERN.CELL  BOOL    TRUE            # by default, do not do any cell pattern correction
-PATTERN.CELL.SUBSET     METADATA        # List of chips and whether to do cell pattern correction
-        XY01    BOOL    FALSE
-        XY02    BOOL    FALSE
-        XY03    BOOL    FALSE
-        XY04    BOOL    FALSE
-        XY05    BOOL    FALSE
-        XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
-        XY10    BOOL    FALSE
-        XY11    BOOL    FALSE
-        XY12    BOOL    FALSE
-        XY13    BOOL    FALSE
-        XY14    STR     0000000000000000111111110000000000000000000000010000000000101101
-        XY15    STR     0011111100011000000001000000010000001001000111110001010000011111
-        XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
-        XY17    BOOL    FALSE
-        XY20    BOOL    FALSE
-        XY21    BOOL    FALSE
-        XY22    BOOL    FALSE
-        XY23    BOOL    FALSE
-        XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
-        XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
-        XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
-        XY27    BOOL    FALSE
-        XY30    BOOL    FALSE
-        XY31    BOOL    FALSE
-        XY32    BOOL    FALSE
-        XY33    BOOL    FALSE
-        XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
-        XY35    BOOL    FALSE
-        XY36    STR     0000000000000000000000000000000000010000000000000000000000000000
-        XY37    STR     0000000000000000000000000000000100010001000000001011000010110110
-        XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
-        XY41    BOOL    FALSE
-        XY42    BOOL    FALSE
-        XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
-        XY44    BOOL    FALSE
-        XY45    BOOL    FALSE
-        XY46    BOOL    FALSE
-        XY47    BOOL    FALSE
-        XY50    BOOL    FALSE
-        XY51    BOOL    FALSE
-        XY52    BOOL    FALSE
-        XY53    BOOL    FALSE
-        XY54    BOOL    FALSE
-        XY55    BOOL    FALSE
-        XY56    BOOL    FALSE
-        XY57    BOOL    FALSE
-        XY60    BOOL    FALSE
-        XY61    BOOL    FALSE
-        XY62    STR     0000000000000000000000000000000000001000000000000000000100001010
-        XY63    BOOL    FALSE
-        XY64    BOOL    FALSE
-        XY65    BOOL    FALSE
-        XY66    BOOL    FALSE
-        XY67    BOOL    FALSE
-        XY71    BOOL    FALSE
-        XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
-        XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
-        XY74    BOOL    FALSE
-        XY75    BOOL    FALSE
-        XY76    BOOL    FALSE
-END
+# PATTERN.CELL.SUBSET   METADATA        # List of chips and whether to do cell pattern correction
+#       XY01    BOOL    FALSE
+#       XY02    BOOL    FALSE
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+# #     XY06    STR     0101000000010000000110000100000000000000000000000000000000000000
+#       XY06    BOOL    FALSE
+#       XY10    BOOL    FALSE
+#       XY11    BOOL    FALSE
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#       XY14    STR     0000000000000000111111110000000000000000000000000000000000000000
+#       XY15    STR     1111111110000000100000000000000000000000000000000000000000000000
+# #     XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
+#       XY16    BOOL    FALSE
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+# #     XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
+#       XY24    BOOL    FALSE
+# #     XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
+#       XY25    BOOL    FALSE
+# #     XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
+#       XY26    BOOL    FALSE
+#       XY27    BOOL    FALSE
+#       XY30    BOOL    FALSE
+#       XY31    BOOL    FALSE
+#       XY32    BOOL    FALSE
+#       XY33    BOOL    FALSE
+# #     XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
+#       XY34    BOOL    FALSE
+#       XY35    BOOL    FALSE
+# #     XY36    STR     0001000000000000000000000000000000010000000000000000000000000000
+#       XY36    BOOL    FALSE
+# #     XY37    STR     0000000000000000000000000000000100010001000000001011000010110110 ?
+#       XY37    BOOL    FALSE
+# #     XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
+#       XY40    BOOL    FALSE
+#       XY41    BOOL    FALSE
+# #     XY42    BOOL    FALSE
+#       XY42    STR     0000000000000000000100000001000000000000000000000000000000000000
+# #     XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
+#       XY43    STR     0000000000000000000000000000000000000000000010000000000000000000
+#       XY44    BOOL    FALSE
+#       XY45    BOOL    FALSE
+#       XY46    BOOL    FALSE
+#       XY47    BOOL    FALSE
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    BOOL    FALSE
+#       XY60    BOOL    FALSE
+#       XY61    BOOL    FALSE
+# #     XY62    STR     0000000000000000000000000000000000000000000000000000000000000010
+#       XY62    BOOL    FALSE
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    BOOL    FALSE
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+# #     XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
+#       XY72    BOOL    FALSE
+# #     XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
+#       XY73    BOOL    FALSE
+#       XY74    BOOL    FALSE
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END

branches/meh_branches/ppstack_test/ippconfig/gpc1/format_20100723.config

@@ -185 +185 @@
         FPA.ALT         STR     ALT
         FPA.AZ          STR     AZ
-        # FPA.TEMP        STR     DETTEM
+         FPA.TEMP        STR     DETTEM
         FPA.M1X         STR     M1X
         FPA.M1Y         STR     M1Y   
@@ -506 +506 @@
 DATABASE        METADATA
         # this rule is fragile : does not match the camera
-        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
+#        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
 END
 
@@ -529 +529 @@
 PATTERN.ROW.SUBSET      METADATA        # List of chips and whether to do row pattern correction
         XY01    BOOL    FALSE
-        XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#       XY02    STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+        XY02    BOOL    FALSE
         XY03    BOOL    FALSE
         XY04    BOOL    FALSE
@@ -580 +581 @@
         XY64    BOOL    FALSE
         XY65    BOOL    FALSE
-        XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#       XY66    STR     0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+        XY66    BOOL    FALSE
         XY67    BOOL    FALSE
         XY71    BOOL    FALSE
@@ -590 +592 @@
 END
 
-# PATTERN.CELL  BOOL    TRUE            # by default, do not do any cell pattern correction
-PATTERN.CELL.SUBSET     METADATA        # List of chips and whether to do cell pattern correction
-        XY01    BOOL    FALSE
-        XY02    BOOL    FALSE
-        XY03    BOOL    FALSE
-        XY04    BOOL    FALSE
-        XY05    BOOL    FALSE
-        XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
-        XY10    BOOL    FALSE
-        XY11    BOOL    FALSE
-        XY12    BOOL    FALSE
-        XY13    BOOL    FALSE
-        XY14    STR     0000000000000000111111110000000000000000000000010000000000101101
-        XY15    STR     0011111100011000000001000000010000001001000111110001010000011111
-        XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
-        XY17    BOOL    FALSE
-        XY20    BOOL    FALSE
-        XY21    BOOL    FALSE
-        XY22    BOOL    FALSE
-        XY23    BOOL    FALSE
-        XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
-        XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
-        XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
-        XY27    BOOL    FALSE
-        XY30    BOOL    FALSE
-        XY31    BOOL    FALSE
-        XY32    BOOL    FALSE
-        XY33    BOOL    FALSE
-        XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
-        XY35    BOOL    FALSE
-        XY36    STR     0000000000000000000000000000000000010000000000000000000000000000
-        XY37    STR     0000000000000000000000000000000100010001000000001011000010110110
-        XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
-        XY41    BOOL    FALSE
-        XY42    BOOL    FALSE
-        XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
-        XY44    BOOL    FALSE
-        XY45    BOOL    FALSE
-        XY46    BOOL    FALSE
-        XY47    BOOL    FALSE
-        XY50    BOOL    FALSE
-        XY51    BOOL    FALSE
-        XY52    BOOL    FALSE
-        XY53    BOOL    FALSE
-        XY54    BOOL    FALSE
-        XY55    BOOL    FALSE
-        XY56    BOOL    FALSE
-        XY57    BOOL    FALSE
-        XY60    BOOL    FALSE
-        XY61    BOOL    FALSE
-        XY62    STR     0000000000000000000000000000000000001000000000000000000100001010
-        XY63    BOOL    FALSE
-        XY64    BOOL    FALSE
-        XY65    BOOL    FALSE
-        XY66    BOOL    FALSE
-        XY67    BOOL    FALSE
-        XY71    BOOL    FALSE
-        XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
-        XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
-        XY74    BOOL    FALSE
-        XY75    BOOL    FALSE
-        XY76    BOOL    FALSE
-END
+PATTERN.CONTINUITY BOOL TRUE
+ PATTERN.CELL   BOOL    FALSE           # by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET   METADATA        # List of chips and whether to do cell pattern correction
+#       XY01    BOOL    FALSE
+#       XY02    BOOL    FALSE
+#       XY03    BOOL    FALSE
+#       XY04    BOOL    FALSE
+#       XY05    BOOL    FALSE
+# #     XY06    STR     0101000000010000000110000100000000000000000000000000000000000000
+#       XY06    BOOL    FALSE
+#       XY10    BOOL    FALSE
+#       XY11    BOOL    FALSE
+#       XY12    BOOL    FALSE
+#       XY13    BOOL    FALSE
+#       XY14    STR     0000000000000000111111110000000000000000000000000000000000000000
+#       XY15    STR     1111111110000000100000000000000000000000000000000000000000000000
+# #     XY16    STR     0000000100000000000000000000000000000001000000000000000000000000
+#       XY16    BOOL    FALSE
+#       XY17    BOOL    FALSE
+#       XY20    BOOL    FALSE
+#       XY21    BOOL    FALSE
+#       XY22    BOOL    FALSE
+#       XY23    BOOL    FALSE
+# #     XY24    STR     0000000000100000000000000110100000100000001000000011100000000000
+#       XY24    BOOL    FALSE
+# #     XY25    STR     0100010000001001001011000000001000000111000110000000100000000010
+#       XY25    BOOL    FALSE
+# #     XY26    STR     0000000000000100000000000000000000001000001000000000000000000000
+#       XY26    BOOL    FALSE
+#       XY27    BOOL    FALSE
+#       XY30    BOOL    FALSE
+#       XY31    BOOL    FALSE
+#       XY32    BOOL    FALSE
+#       XY33    BOOL    FALSE
+# #     XY34    STR     0000000000000000000000000000000000000001000011000000101000111111
+#       XY34    BOOL    FALSE
+#       XY35    BOOL    FALSE
+# #     XY36    STR     0001000000000000000000000000000000010000000000000000000000000000
+#       XY36    BOOL    FALSE
+# #     XY37    STR     0000000000000000000000000000000100010001000000001011000010110110 ?
+#       XY37    BOOL    FALSE
+# #     XY40    STR     0000000000000000000000000010110000000000000001110000001000011111
+#       XY40    BOOL    FALSE
+#       XY41    BOOL    FALSE
+# #     XY42    BOOL    FALSE
+#       XY42    STR     0000000000000000000100000001000000000000000000000000000000000000
+# #     XY43    STR     0000000000000000000000010000000100000000000010000100000100000100
+#       XY43    STR     0000000000000000000000000000000000000000000010000000000000000000
+#       XY44    BOOL    FALSE
+#       XY45    BOOL    FALSE
+#       XY46    BOOL    FALSE
+#       XY47    BOOL    FALSE
+#       XY50    BOOL    FALSE
+#       XY51    BOOL    FALSE
+#       XY52    BOOL    FALSE
+#       XY53    BOOL    FALSE
+#       XY54    BOOL    FALSE
+#       XY55    BOOL    FALSE
+#       XY56    BOOL    FALSE
+#       XY57    BOOL    FALSE
+#       XY60    BOOL    FALSE
+#       XY61    BOOL    FALSE
+# #     XY62    STR     0000000000000000000000000000000000000000000000000000000000000010
+#       XY62    BOOL    FALSE
+#       XY63    BOOL    FALSE
+#       XY64    BOOL    FALSE
+#       XY65    BOOL    FALSE
+#       XY66    BOOL    FALSE
+#       XY67    BOOL    FALSE
+#       XY71    BOOL    FALSE
+# #     XY72    STR     0000000000000000000000000000000000000000000000000000000000000001
+#       XY72    BOOL    FALSE
+# #     XY73    STR     0001100000000000000000000000001000000000000000000000000000000000
+#       XY73    BOOL    FALSE
+#       XY74    BOOL    FALSE
+#       XY75    BOOL    FALSE
+#       XY76    BOOL    FALSE
+# END

branches/meh_branches/ppstack_test/ippconfig/gpc1/ppImage.config

@@ -166 +166 @@
   MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
   PATTERN.ROW        BOOL    TRUE            # Row pattern correction
-  PATTERN.CELL       BOOL    TRUE            # Cell pattern correction
+  PATTERN.CELL       BOOL    FALSE           # Cell pattern correction
+  PATTERN.CONTINUITY BOOL    TRUE            # Cell pattern correction using edge continuity
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+END
+
+# Chip processing for testing pattern correction
+CHIP_PATTERNTEST METADATA
+  BASE.FITS          BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS          BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    TRUE            # apply non-linearity correction 
+  BIAS               BOOL    FALSE           # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  REMNANCE           BOOL    FALSE           # Remnance masking
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  MASK.BUILD         BOOL    TRUE            # Build internal mask?
+  MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
+  PATTERN.ROW        BOOL    FALSE            # Row pattern correction
+  PATTERN.CELL       BOOL    FALSE           # Cell pattern correction
   FRINGE             BOOL    TRUE            # Fringe subtraction
   BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
@@ -1083 +1114 @@
 END
 
+PR_NOPATTERN       METADATA
+  BASE.FITS        BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS   BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL  FALSE           # Save base detrended image?
+  CHIP.FITS        BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS   BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL  TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN         BOOL    TRUE            # Overscan subtraction
+  NONLIN           BOOL    TRUE            # apply non-linearity correction 
+  BIAS             BOOL    FALSE           # Bias subtraction
+  DARK             BOOL    TRUE            # Dark subtraction
+  REMNANCE         BOOL    FALSE           # Remnance masking
+  SHUTTER          BOOL    FALSE           # Shutter correction
+  FLAT             BOOL    TRUE            # Flat-field normalisation
+  MASK             BOOL    TRUE            # Mask bad pixels
+  MASK.BUILD            BOOL    TRUE              # Build internal mask?
+  FRINGE           BOOL    FALSE           # Fringe subtraction
+  PATTERN.ROW      BOOL    FALSE           # Row pattern correction
+  PATTERN.CELL        BOOL    FALSE             # Cell pattern correction
+  BIN1.FITS        BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS        BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM           BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP      BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND       BOOL    FALSE            # Subtract background?
+  CROSSTALK.MEASURE  BOOL  TRUE            # Subtract model background?
+END
 
 # Standard chip processing without any background removal
@@ -1102 +1160 @@
   MASK.BUILD         BOOL    TRUE            # Build internal mask?
   MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
-  PATTERN.ROW        BOOL    FALSE           # Row pattern correction
-  PATTERN.CELL       BOOL    FALSE           # Cell pattern correction
+  PATTERN.ROW        BOOL    TRUE           # Row pattern correction
+  PATTERN.CELL       BOOL    TRUE            # Cell pattern correction
   FRINGE             BOOL    TRUE            # Fringe subtraction
   BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?

branches/meh_branches/ppstack_test/ippconfig/gpc1/ppStack.config

@@ -36 +36 @@
 END
 
-# for stages that want just unconvolved and deep stacks
+# for just unconvolved and deep stacks
 QUICKSTACK_DEEP    METADATA
-    CONVOLVE        BOOL   FALSE
-    COMBINE.REJ     F32    3.5          # Rejection threshold in combination (sigma). tune?
-    COMBINE.DISCARD F32    0.2          # Discard fraction for Olympic weighted mean. tune?
+    CONVOLVE        BOOL   FALSE    
+    COMBINE.REJ     F32    3.5          # Rejection threshold in combination (sigma). tune?
+    COMBINE.DISCARD F32    0.2          # Discard fraction for Olympic weighted mean. tune?
     OUTPUT.NOCOMP   BOOL    TRUE
     OUTPUT.LOGFLUX  BOOL    FALSE
-    PSF.INPUT.MAX           F32  7.5    # since not convolved limit, relax? to tune.
+    PSF.INPUT.MAX           F32  8.0    # since not convolved limit, relax? tune?
     PSF.INPUT.CLIP.NSIGMA   F32  5.0
 END

branches/meh_branches/ppstack_test/ippconfig/gpc1/psastro.config

@@ -344 +344 @@
   PSASTRO.MATCH.RADIUS.N7 F32    5
   PSASTRO.MATCH.FIT.NITER S32    5
+
+  PSASTRO.CATDIR        STR     STS.PP5.REFCAT
 END
 

branches/meh_branches/ppstack_test/ippconfig/gpc1/psphot.config

@@ -54 +54 @@
         SKY_STAT         STR   FITTED_MEAN_V4  # statistic used to measure background
 END
+
+CHIP_CONSTANT_WEIGHTPHOT METADATA
+        CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  TRUE
+END

branches/meh_branches/ppstack_test/ippconfig/lbc_red/filerules.mdc

@@ -136 +136 @@
 PSASTRO.OUTPUT.CMP    OUTPUT {OUTPUT}.{CHIP.NAME}.smp         CMP       NONE      CHIP       TRUE      NONE
 PSASTRO.OUT.CMF.SPL   OUTPUT {OUTPUT}.{CHIP.NAME}.smf         CMF       NONE      CHIP       TRUE      NONE
+PSASTRO.OUTPUT.CMF   OUTPUT {OUTPUT}.{CHIP.NAME}.smf         CMF       NONE      CHIP       TRUE      NONE
 PSASTRO.OUT.CMF.MEF   OUTPUT {OUTPUT}.smf                     CMF       NONE      FPA        TRUE      NONE
 PSASTRO.OUT.ASTROM    OUTPUT {OUTPUT}.ast                     ASTROM    NONE      FPA        TRUE      NONE

branches/meh_branches/ppstack_test/ippconfig/megacam/camera.config

@@ -154 +154 @@
 PHOTCODE.RULE           STR     {DETECTOR}.{FILTER.ID}.{CHIP.N}         # Rule for generating photcode
 
+BURNTOOL.STATE.GOOD        S16  0  # Value for burntool_state with the most recent bt version.
+BURNTOOL.STATE.GOOD.UPDATE S16  0  # for upddate processing accept earlier version
+
+FOV_REF                     F32     0   # Field of view of unvignetted region in FPA pixels.
+FOV_MAX                     F32     0
+NPIX_REF                    S32     0
+NPIX_MAX                    S32     0
+NPIX_INTERCHIP              S32     0
+
+# This sets the maximum size for the fwhm_major.  This is roughly 3", and 98.67% of all exposures in the database are less than this.
+MAX_ALLOWED_FWHM          F32         25
+
 # don't censor any masked pixels
 MASK.NO.CENSOR          U32 4294967295
+
+METADATA.COMPRESSION         STR      7f # compression mode (nM): n = 1-9, M = f (filtered), h (Huffman), R (run-length)

branches/meh_branches/ppstack_test/ippconfig/recipes/filerules-mef.mdc

@@ -42 +42 @@
 PSASTRO.INPUT         STR PSASTRO.INPUT.CMF
 PSASTRO.OUTPUT.MEF    STR PSASTRO.OUT.CMF.MEF
+#PSASTRO.OUTPUT.CMF    STR PSASTRO.OUT.CMF
 DVOCORR.OUTPUT        STR DVOCORR.MEF.OUTPUT
 DVOFLAT.OUTPUT        STR DVOFLAT.MEF.OUTPUT
@@ -243 +244 @@
 PSASTRO.OUT.CMF.SPL     OUTPUT {OUTPUT}.{CHIP.NAME}.smf          CMF       NONE       CHIP       TRUE      SPLIT
 PSASTRO.OUT.CMF.MEF     OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
+PSASTRO.OUTPUT.CMF      OUTPUT {OUTPUT}.cmf                      CMF       NONE       CHIP       TRUE      NONE
+#PSASTRO.OUT.CMF         OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      NONE
 PSASTRO.OUT.MODEL       OUTPUT {OUTPUT}.asm                ASTROM.MODEL    NONE       FPA        TRUE      NONE
 PSASTRO.OUT.REFSTARS    OUTPUT {OUTPUT}.aref.fits          ASTROM.REFSTARS NONE       FPA        TRUE      NONE
@@ -308 +311 @@
 PPSTAMP.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits                  MASK      COMP_MASK  FPA        TRUE      NONE
 PPSTAMP.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits                  VARIANCE  COMP_WT    FPA        TRUE      NONE
+PPSTAMP.OUTPUT.JPEG     OUTPUT {OUTPUT}.jpg                      JPEG      NONE       FPA        TRUE      NONE
+PPSTAMP.OUTPUT.JPEG.FLIP OUTPUT {OUTPUT}.jpg                     JPEG      NONE       FPA        TRUE      NONE
 PPSTAMP.CHIP.MEF        OUTPUT {OUTPUT}.ch.fits                  IMAGE     NONE       CHIP       FALSE     MEF
                                                                                      

branches/meh_branches/ppstack_test/ippconfig/recipes/filerules-simple.mdc

@@ -29 +29 @@
 PPIMAGE.SHUTTER           INPUT    @DETDB        CHIP       IMAGE     
 PPIMAGE.LINEARITY         INPUT    @DETDB        CHIP       LINEARITY
+
+## Files used by psvideophot
+PSVIDEOPHOT.INPUT             INPUT    @FILES        CHIP       IMAGE
+PSVIDEOPHOT.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+PSVIDEOPHOT.INPUT.VARIANCE    INPUT    @FILES        CHIP       VARIANCE
+PSVIDEOPHOT.INPUT.PSF         INPUT    @FILES        CHIP       PSF
+PSVIDEOPHOT.INPUT.SRC         INPUT    @FILES        CHIP       CMF
                           
 ## Files used by ppMerge  
@@ -193 +200 @@
 PSPHOT.PSF.RAW.SAVE          OUTPUT {OUTPUT}.psf                  PSF             NONE       FPA        TRUE      NONE
 PSPHOT.PSF.SKY.SAVE          OUTPUT {OUTPUT}.psf                  PSF             NONE       FPA        TRUE      NONE
+
+#psvideophot
+PSVIDEOPHOT.OUTPUT           OUTPUT {OUTPUT}.{CHIP.NAME}.vid          OBJ NONE CHIP TRUE NONE
+PSVIDEOPHOT.CHIP             OUTPUT {OUTPUT}.{CHIP.NAME}.vid          OBJ NONE CHIP TRUE NONE
 
 # used by staticsky with single input
@@ -280 +291 @@
 PPSTAMP.OUTPUT.MASK          OUTPUT {OUTPUT}.mk.fits              MASK            COMP_MASK  FPA        TRUE      NONE
 PPSTAMP.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.wt.fits              VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTAMP.OUTPUT.JPEG          OUTPUT {OUTPUT}.jpg                  JPEG            NONE       FPA        TRUE      NONE
+PPSTAMP.OUTPUT.JPEG.FLIP     OUTPUT {OUTPUT}.jpg                  JPEG            NONE       FPA        TRUE      NONE
 PPSTAMP.CHIP                 OUTPUT {OUTPUT}.ch.fits              IMAGE           NONE       CHIP       FALSE     NONE
                                                      

branches/meh_branches/ppstack_test/ippconfig/recipes/filerules-split.mdc

@@ -13 +13 @@
 SOURCE.PLOT.APRESID  STR SOURCE.PLOT.RAW.APRESID
 
-# PSASTRO.OUTPUT     STR PSASTRO.OUT.CMF.MEF
+PSASTRO.OUTPUT     STR PSASTRO.OUT.CMF.MEF
 # PSASTRO.OUTPUT.SPL STR PSASTRO.OUT.CMF.SPL
 # PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF
@@ -220 +220 @@
 
 #psvideophot
-PSVIDEOPHOT.OUTPUT           OUTPUT {OUTPUT}.{CHIP.NAME}.vid          OBJ NONE CHIP TRUE NONE
-PSVIDEOPHOT.CHIP             OUTPUT {OUTPUT}.{CHIP.NAME}.vid          OBJ NONE CHIP TRUE NONE
+PSVIDEOPHOT.OUTPUT           OUTPUT {OUTPUT}.vpt                      OBJ             NONE       CELL       TRUE      NONE
 
 # used by staticsky with single input
@@ -246 +245 @@
 # PSASTRO.OUTPUT.CMP         OUTPUT {OUTPUT}.{CHIP.NAME}.smp          CMP             NONE       CHIP       TRUE      NONE
 # PSASTRO.OUT.CMF.SPL        OUTPUT {OUTPUT}.{CHIP.NAME}.smf          CMF             NONE       CHIP       TRUE      NONE
-# PSASTRO.OUT.CMF.MEF        OUTPUT {OUTPUT}.smf                      CMF             NONE       FPA        TRUE      MEF
 PSASTRO.OUT.MODEL            OUTPUT {OUTPUT}.asm                      ASTROM.MODEL    NONE       FPA        TRUE      NONE
 PSASTRO.OUT.REFSTARS         OUTPUT {OUTPUT}.aref.fits                ASTROM.REFSTARS NONE       FPA        TRUE      NONE
-PSASTRO.OUTPUT               OUTPUT {OUTPUT}.smf                      CMF             NONE       FPA        TRUE      MEF
+PSASTRO.OUT.CMF.MEF          OUTPUT {OUTPUT}.smf                      CMF             NONE       FPA        TRUE      MEF
+PSASTRO.OUTPUT.CMF           OUTPUT {OUTPUT}.cmf                      CMF             NONE       FPA        TRUE      NONE
 PSASTRO.STATS                OUTPUT {OUTPUT}.stats                    STATS           NONE       FPA        TRUE      NONE
 PSASTRO.CONFIG               OUTPUT {OUTPUT}.psastro.mdc              TEXT            NONE       FPA        TRUE      NONE
@@ -323 +322 @@
 PPSTAMP.OUTPUT.MASK          OUTPUT {OUTPUT}.mk.fits                  MASK            COMP_MASK  FPA        TRUE      NONE
 PPSTAMP.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.wt.fits                  VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTAMP.OUTPUT.JPEG         OUTPUT {OUTPUT}.jpg                      JPEG            NONE       FPA        TRUE      NONE
+PPSTAMP.OUTPUT.JPEG.FLIP    OUTPUT {OUTPUT}.jpg                      JPEG            NONE       FPA        TRUE      NONE
 # mosaic image used for making stamps of raw images. Not saved.
 PPSTAMP.CHIP                 OUTPUT {OUTPUT}.ch.fits                  IMAGE           NONE       CHIP       FALSE     MEF
-PPSTAMP.OUTPUT.JPEG1         OUTPUT {OUTPUT}.jpg                      JPEG            NONE       FPA        TRUE      NONE
                                                                                                               
 PPSIM.OUTPUT                 OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      SPLIT

branches/meh_branches/ppstack_test/ippconfig/recipes/jpeg.mdc

@@ -254 +254 @@
 END
 
+PPSTAMP.OUTPUT.JPEG             METADATA
+        COLORMAP        STR     greyscale
+        SCALE.MODE      STR     RANGE
+        SCALE.MIN       F32      -5.0
+        SCALE.MAX       F32     +10.0
+        OPTIONS         STR     -SB,+X,+Y
+END
+
+PPSTAMP.OUTPUT.JPEG.FLIP        METADATA
+        COLORMAP        STR     greyscale
+        SCALE.MODE      STR     RANGE
+        SCALE.MIN       F32      -5.0
+        SCALE.MAX       F32     +10.0
+        OPTIONS         STR     -SB,-X,+Y
+END

branches/meh_branches/ppstack_test/ippconfig/recipes/nightly_science.config

@@ -2 +2 @@
 CLEAN_MODES METADATA
   MODE           STR CHIP
-  COMMAND        STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ -destreaked
+  COMMAND        STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
   RETENTION_TIME U16 21
 END
 CLEAN_MODES METADATA
   MODE           STR WARP
-  COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ -destreaked
+  COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
   RETENTION_TIME U16 7
 END
 CLEAN_MODES METADATA
   MODE           STR DIFF
-  COMMAND        STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ -destreaked
+  COMMAND        STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
   RETENTION_TIME S16 21
 END
@@ -93 +93 @@
   NAME      STR  MD02
   DISTRIBUTION STR MD02
-  TESS      STR MD02.V2
+  TESS      STR MD02.V3
   OBSMODE   STR MD
   OBJECT    STR MD02%
@@ -104 +104 @@
   NAME      STR MD03
   DISTRIBUTION STR MD03
-  TESS      STR MD03.V2
+  TESS      STR MD03.V3
   OBSMODE   STR MD
   OBJECT    STR MD03%
@@ -115 +115 @@
   NAME      STR MD04
   DISTRIBUTION STR MD04
-  TESS      STR MD04.V2
+  TESS      STR MD04.V3
   OBSMODE   STR MD
   OBJECT    STR MD04%
@@ -126 +126 @@
   NAME      STR MD05
   DISTRIBUTION STR MD05
-  TESS      STR MD05.V2
+  TESS      STR MD05.V3
   OBSMODE   STR MD
   OBJECT    STR MD05%
@@ -137 +137 @@
   NAME      STR MD06
   DISTRIBUTION STR MD06
-  TESS      STR MD06
+  TESS      STR MD06.V3
   OBSMODE   STR MD
   OBJECT    STR MD06%
@@ -148 +148 @@
   NAME      STR MD07
   DISTRIBUTION STR MD07
-  TESS      STR MD07
+  TESS      STR MD07.V3
   OBSMODE   STR MD
   OBJECT    STR MD07%
@@ -159 +159 @@
   NAME      STR MD08
   DISTRIBUTION STR MD08
-  TESS      STR MD08.V2
+  TESS      STR MD08.V3
   OBSMODE   STR MD
   OBJECT    STR MD08%
@@ -170 +170 @@
   NAME      STR MD09
   DISTRIBUTION STR MD09
-  TESS      STR MD09.V2
+  TESS      STR MD09.V3
   OBSMODE   STR MD
   OBJECT    STR MD09%
@@ -192 +192 @@
   NAME      STR MD11
   DISTRIBUTION STR MD11
-  TESS      STR MD11.V2
+  TESS      STR MD11.V3
   OBSMODE   STR MD
   OBJECT    STR MD11%
@@ -210 +210 @@
   REDUCTION STR STS_DATASET
   # bump the retention times for the time being
-  CHIP S16 60
-  WARP S16 60
-  DIFF S16 60
+  CHIP S16 7
+  WARP S16 7
+  DIFF S16 7
 END
 TARGETS METADATA
@@ -219 +219 @@
   TESS      STR RINGS.V3
   OBSMODE   STR SS
-  STACKABLE BOOL FALSE
+  STACKABLE BOOL TRUE
   DIFFABLE  BOOL TRUE
+  REDUCTION STR SWEETSPOT
+#  REDUCTION STR SSTF_4SIG
 #  WARP      S16 60
 END
@@ -228 +230 @@
   TESS         STR RINGS.V3
   OBSMODE      STR OSS
-  STACKABLE   BOOL FALSE
-  DIFFABLE    BOOL TRUE
+  STACKABLE   BOOL TRUE
+  DIFFABLE    BOOL TRUE
+  REDUCTION STR SWEETSPOT
+#  REDUCTION STR SSTF_4SIG
 END
 TARGETS METADATA
@@ -236 +240 @@
   TESS         STR RINGS.V3
   OBSMODE      STR ESS
-  STACKABLE   BOOL FALSE
-  DIFFABLE    BOOL TRUE
+  STACKABLE   BOOL TRUE
+  DIFFABLE    BOOL TRUE
+  REDUCTION STR SWEETSPOT
+#  REDUCTION STR SSTF_4SIG
 END
 TARGETS METADATA
@@ -244 +250 @@
   TESS         STR RINGS.V3
   OBSMODE      STR MSS
-  STACKABLE   BOOL FALSE
-  DIFFABLE    BOOL TRUE
+  STACKABLE   BOOL TRUE
+  DIFFABLE    BOOL TRUE
+  REDUCTION STR SWEETSPOT
+#  REDUCTION STR SSTF_4SIG
 END
 TARGETS METADATA
@@ -262 +270 @@
   STACKABLE   BOOL FALSE
   DIFFABLE    BOOL FALSE
+  CHIP        S16  800
+  WARP        S16  800
 END
 TARGETS METADATA

branches/meh_branches/ppstack_test/ippconfig/recipes/ppImage.config

@@ -27 +27 @@
 PATTERN.SUBSET     METADATA
 END
+PATTERN.CONTINUITY BOOL    FALSE
+PATTERN.CONTINUITY.WIDTH S32  50
+PATTERN.CONTINUITY.SUBSET BOOL TRUE
 FRINGE             BOOL    FALSE           # Fringe subtraction
 PHOTOM             BOOL    FALSE           # Source identification and photometry
@@ -177 +180 @@
   BACKGROUND         BOOL    TRUE            # Subtract background?
   MASK.STATS         BOOL    TRUE            # Calculate Mask statistics.
+END
+
+# Standard chip processing
+CHIP_PATTERNTEST        METADATA
+  BASE.FITS          BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS          BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS               BOOL    TRUE            # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  MASK.STATS         BOOL    TRUE            # Calculate Mask statistics.
+  PATTERN.CELL       BOOL    FALSE
+  PATTERN.ROW        BOOL    FALSE
 END
 

branches/meh_branches/ppstack_test/ippconfig/recipes/ppSim.config

@@ -46 +46 @@
 FORCED.PHOTCODE STR     r               # source of the forced photometry positions
 
-STARS.REAL      BOOL    TRUE            # Add stars from a catalogue?
-MATCH.DENSITY   BOOL    TRUE            # significance of faintest sources
+STARS.REAL      BOOL    TRUE            # Add stars from a catalogue?
+MATCH.DENSITY   BOOL    FALSE           # significance of faintest sources
 
 STARS.FAKE      BOOL    TRUE            # Add fake stars, randomly distributed?
-STARS.LUM       F32     0.35            # Stellar luminosity function slope (magnitude slope)
-STARS.MAG       F32     15.5            # Brightest magnitude for fake stars (choose based on real catalog limit)
-STARS.DENSITY   F32      1.0            # Stellar density (per square degree) at the brightest magnitude
+STARS.LUM       F32     0.40            # Stellar luminosity function slope (magnitude slope)
+STARS.MAG       F32     12.5            # Brightest magnitude for fake stars (choose based on real catalog limit)
+STARS.DENSITY   F32    100.0            # Stellar density (per square degree) at the brightest magnitude
 STARS.SIGMA.LIM F32      1.0            # significance of faintest sources
 
@@ -69 +69 @@
 GALAXY.FAKE     BOOL    FALSE           # Generate fake galaxies?
 
-GALAXY.LUM        F32   -0.8            # Stellar luminosity function slope
+GALAXY.LUM        F32   0.8             # Stellar luminosity function slope
 GALAXY.MAG        F32   15.0            # Brightest magnitude for fake stars
 GALAXY.DENSITY    F32   5.0             # Galaxy density (per square degree) at the brightest magnitude
@@ -83 +83 @@
 
 GALAXY.THETA.MIN F32    0.0             # Minimum position angle for galaxy models
-GALAXY.THETA.MAX F32    3.14            # Maximum position angle for galaxy models
+GALAXY.THETA.MAX F32    180.0           # Maximum position angle for galaxy models
 
 GALAXY.GRID        BOOL   FALSE         # Generate a (regular) grid of galaxy models?
-GALAXY.GRID.DX     S32    100             # Spacing between galaxies in grid in x
-GALAXY.GRID.DY     S32    200             # Spacing between galaxies in grid in y
+GALAXY.GRID.DX     S32    100           # Spacing between galaxies in grid in x
+GALAXY.GRID.DY     S32    200           # Spacing between galaxies in grid in y
 GALAXY.GRID.RANDOM BOOL   FALSE         # randomize shape parameters in grid (or sequence?)
-GALAXY.GRID.PEAK   F32    100.0         # peak flux of the grid galaxies
+GALAXY.GRID.PEAK   F32    100.0         # peak flux of the grid galaxies (deprecated)
+GALAXY.GRID.MAG    F32    17.0          # integrated magnitude of the grid galaxies
+GALAXY.GRID.XOFF   F32    0.0           # galaxy centroid offsets
+GALAXY.GRID.YOFF   F32    0.0           # galaxy centroid offsets
 
 GALAXY.MODEL     STR    PS_MODEL_GAUSS

branches/meh_branches/ppstack_test/ippconfig/recipes/ppStack.config

@@ -19 +19 @@
 POOR.FRACTION   F32     0.25            # Maximum fraction of bad variance for poor pixels
 THRESHOLD.MASK  F32     0.5             # Threshold for mask deconvolution (0..1)
-DECONV.LIMIT    F32     2.0             # Deconvolution fraction for rejecting entire image
+DECONV.LIMIT    F32     3.0             # Deconvolution fraction for rejecting entire image
 IMAGE.REJ       F32     0.1             # Rejected pixel fraction threshold for rejecting entire image
 MATCH.REJ       F32     3.0             # Rejection threshold for chi^2 values from matching

branches/meh_branches/ppstack_test/ippconfig/recipes/ppStatsFromMetadata.config

@@ -536 +536 @@
 # ENTRY  VAL  REPLICATE_OUTPUTS   F32  CONSTANT          -dtime_replicate  # time to replicate the outputs
 END
+
+STATICSKY_CAL METADATA
+  ENTRY MULTI
+  TYPE   VAL  KEYWORD             TYPE STATISTIC         FLAG 
+  ENTRY  VAL  CERROR              F32  CONSTANT         -sigma_ra          
+  ENTRY  VAL  CERROR              F32  CONSTANT         -sigma_dec         
+  ENTRY  VAL  DT_ASTR             F32  CONSTANT         -dtime_astrom      
+  ENTRY  VAL  NASTRO              S32  CONSTANT         -n_astrom          
+
+  ENTRY  VAL  ZPT_OBS             F32  CONSTANT         -zpt_obs
+  ENTRY  VAL  ZPT_ERR             F32  CONSTANT         -zpt_stdev
+
+  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
+END

branches/meh_branches/ppstack_test/ippconfig/recipes/ppSub.config

@@ -219 +219 @@
 END
 
+SSTF_DIFF METADATA
+        DUAL            BOOL    FALSE   # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
+        NOCONVOLVE      BOOL    TRUE
+        CONVOLVE.TARGET STR     SINGLE2 # convolution direction
+END
+ 
+
 # Gene's choice: multiplying by 1.75
 #@ISIS.WIDTHS   F32     1.8 3.3 5.8 10.2 17.9   # Gaussian FWHMs for ISIS kernels

branches/meh_branches/ppstack_test/ippconfig/recipes/psastro.config

@@ -258 +258 @@
 END
 
+STATICSKY_CAL   METADATA
+    REFSTAR_MASK                BOOL FALSE
+    PSASTRO.SAVE.REFMATCH       BOOL FALSE
+    PSASTRO.FIX.CHIPS           BOOL FALSE
+    PSASTRO.USE.MODEL           BOOL FALSE
+    PSASTRO.MOSAIC.MODE         BOOL FALSE
+END

branches/meh_branches/ppstack_test/ippconfig/recipes/psphot.config

@@ -199 +199 @@
  #PGAUSS_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_PGAUSS   20.0    TRUE
  #QGAUSS_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_QGAUSS   20.0    TRUE
- EXP_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_EXP      20.0    TRUE
- DEV_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_DEV      20.0    TRUE
- SER_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC   20.0    TRUE
+ EXP_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_EXP      10.0    TRUE
+ DEV_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_DEV      10.0    TRUE
+ SER_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC   10.0    TRUE
 END
 
@@ -216 +216 @@
 # @RADIAL.ANNULAR.BINS.UPPER           F32      1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1 345.0 539.1 841.0 1305.0 #
 
-# PS1 values?
-@RADIAL.ANNULAR.BINS.LOWER           F32      0.0 1.2 3.4 5.2  8.8 15.0 23.2 37.2 57.1  91.0 141.0  # perl parser fails without a comment ticket #1476
-@RADIAL.ANNULAR.BINS.UPPER           F32      1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1  # perl parser fails without a comment ticket #1476
+# PS1 values? (revised fpr PS1 @0.25 arcsec pixel scales) 
+@RADIAL.ANNULAR.BINS.LOWER           F32      0.0 0.96 2.72 4.16 7.04 12.0 18.56 29.76 45.68 72.80 112.80    # perl parser fails without a comment ticket #1476 still?
+@RADIAL.ANNULAR.BINS.UPPER           F32      0.96 2.72 4.16 7.04 12.0 18.56 29.76 45.68 72.80 112.80 176.88 # perl parser fails without a comment ticket #1476 still?
 
 # Extended source fit parameters
@@ -329 +329 @@
 
 # stack photometry parameters
-PSPHOT.STACK.MATCH.RADIUS           F32   1.0  # join detections from different images with this correlation radius (pixels)
+PSPHOT.STACK.MATCH.RADIUS           F32   5.0  # join detections from different images with this correlation radius (pixels)
 PSPHOT.STACK.MATCH.PSF              BOOL  T    # convolved input images to common target PSF
 PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
 PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
-@PSPHOT.STACK.TARGET.PSF.FWHM       F32   6.5 9.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
+@PSPHOT.STACK.TARGET.PSF.FWHM       F32   6.0 8.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
 PSPHOT.STACK.USE.RAW                BOOL  T
 
@@ -343 +343 @@
   EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_SN_LIM              F32   20.0
+  EXTENDED_SOURCE_SN_LIM              F32   10.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
   EXTENDED_SOURCE_ANNULI              BOOL  TRUE
@@ -349 +349 @@
   PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
   PSPHOT.STACK.USE.RAW                BOOL  F    # perform photometry & morphology analysis on the raw image
-  @PSPHOT.STACK.TARGET.PSF.FWHM       F32   6.5 8.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
+  @PSPHOT.STACK.TARGET.PSF.FWHM       F32   6.0 8.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
   RADIAL_APERTURES                    BOOL  T    # calculate flux in circular radial apertures?
   RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
   OUTPUT.FORMAT                       STR   PS1_SV1
+  PETROSIAN_FOR_STARS                 BOOL  FALSE
+
+  CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  TRUE 
+  POISSON.ERRORS.PHOT.LMM             BOOL  TRUE
 
   EXT_FIT_MAX_RADIUS                  F32   50.0
-  PSF_MODEL                           STR   PS_MODEL_QGAUSS 
-  EXT_MODEL                           STR   PS_MODEL_SERSIC
+  PSF_MODEL                           STR   PS_MODEL_GAUSS 
+  EXT_MODEL                           STR   PS_MODEL_QGAUSS
 END
 
 # Extended source fit parameters
 STACKPHOT_TEST                        METADATA
-  EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_SN_LIM              F32   20.0
-  EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+  EXTENDED_SOURCE_FITS                BOOL  F  # perform any of the aperture-like measurements?
+  EXTENDED_SOURCE_ANALYSIS            BOOL  F  # perform any of the aperture-like measurements?
+  EXTENDED_SOURCE_SN_LIM              F32   10.0
+  EXTENDED_SOURCE_PETROSIAN           BOOL  F
+  EXTENDED_SOURCE_ANNULI              BOOL  F
   PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
   PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
   PSPHOT.STACK.USE.RAW                BOOL  F    # perform photometry & morphology analysis on the raw image
-  @PSPHOT.STACK.TARGET.PSF.FWHM       F32   8.0 10.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
-  RADIAL_APERTURES                    BOOL  T    # calculate flux in circular radial apertures?
+  @PSPHOT.STACK.TARGET.PSF.FWHM       F32   6.0 8.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
+  RADIAL_APERTURES                    BOOL  F    # calculate flux in circular radial apertures?
   RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
   OUTPUT.FORMAT                       STR   PS1_SV1
 
   EXT_FIT_MAX_RADIUS                  F32   50.0
-  PSF_MODEL                           STR   PS_MODEL_QGAUSS 
-  EXT_MODEL                           STR   PS_MODEL_SERSIC
+  PSF_MODEL                           STR   PS_MODEL_GAUSS 
+  EXT_MODEL                           STR   PS_MODEL_QGAUSS
 END
 
@@ -481 +485 @@
 END
 
+CHIP_CONSTANT_WEIGHTPHOT METADATA
+END
+
 # Recipe overrides for PSPHOT in sdssmosaic
 PSPHOT_NOAP_PSF METADATA
@@ -500 +507 @@
   OUTPUT.FORMAT                     STR  PS1_DV2       # Format of output file
 END
+
+SSTF_DIFF METADATA
+  PEAKS_NSIGMA_LIMIT_2                F32   4.0             # peak significance threshold  
+  DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
+  OUTPUT.FORMAT                     STR  PS1_DV2       # Format of output file
+END
+
 
 # Recipe overrides for PR reduction
@@ -513 +527 @@
         SKY_STAT         STR   FITTED_MEAN_V4  # statistic used to measure background
 END
+

branches/meh_branches/ppstack_test/ippconfig/recipes/reductionClasses.mdc

@@ -164 +164 @@
         BACKGROUND_PSWARP       STR     BACKGROUND
         PSVIDEOPHOT             STR     PSVIDEOPHOT
-END
+        STATICSKY_CALIBRATION   STR     STATICSKY_CAL
+END
+
+
 
 # basic science analysis
@@ -216 +219 @@
 END
 
+# Sweetspot reduction class
+SWEETSPOT               METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     QUICKSTACK
+        STACK_PPSUB       STR     STACK
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     DIFF
+        DIFF_PSPHOT       STR     SSTF_DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        FAKEPHOT          STR     FAKEPHOT
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     DEFAULT_RECIPE
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+        PSVIDEOPHOT             STR     PSVIDEOPHOT
+END
+
+
+CONSTANT_WEIGHTPHOT             METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP_CONSTANT_WEIGHTPHOT
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     STACK
+        STACK_PPSUB       STR     STACK
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     DIFF
+        DIFF_PSPHOT       STR     DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        FAKEPHOT          STR     FAKEPHOT
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     DEFAULT_RECIPE
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+END
+
+
 DEFAULT_DARKTEST        METADATA
         CHIP_PPIMAGE      STR     CHIP_DARKTEST
@@ -239 +290 @@
 
 
+
 DEFAULT_MASKTEST                METADATA
         CHIP_PPIMAGE    STR     CHIP_MASKTEST
@@ -260 +312 @@
 END
 
+# SSTF tests
+SSTF_NOCONV             METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     STACK
+        STACK_PPSUB       STR     STACK
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     SSTF_DIFF
+        DIFF_PSPHOT       STR     DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        FAKEPHOT          STR     FAKEPHOT
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     DEFAULT_RECIPE
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+        PSVIDEOPHOT             STR     PSVIDEOPHOT
+END
+
+SSTF_4SIG               METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     STACK
+        STACK_PPSUB       STR     STACK
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     DIFF
+        DIFF_PSPHOT       STR     SSTF_DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        FAKEPHOT          STR     FAKEPHOT
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     DEFAULT_RECIPE
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+        PSVIDEOPHOT             STR     PSVIDEOPHOT
+END
+
+SSTF_NOCONV_4SIG                METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     STACK
+        STACK_PPSUB       STR     STACK
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     SSTF_DIFF
+        DIFF_PSPHOT       STR     SSTF_DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        FAKEPHOT          STR     FAKEPHOT
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     DEFAULT_RECIPE
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+        PSVIDEOPHOT             STR     PSVIDEOPHOT
+END
+
+
+
 # reduction class specifically for warpwarp diffs:
 WARPWARP        METADATA
@@ -337 +461 @@
 # quick deep stacks (for unconvolved refstacks and full,deep stacks)
 DEEP_QUICKSTACK            METADATA
-      STACK_PPSTACK   STR      QUICKSTACK_DEEP
-      STACK_PPSUB     STR      STACK
-      STACK_PSPHOT    STR      STACK
-END
-
+       STACK_PPSTACK   STR      QUICKSTACK_DEEP
+       STACK_PPSUB     STR      STACK
+       STACK_PSPHOT    STR      STACK
+END
 
 TESTSTACK            METADATA

branches/meh_branches/ppstack_test/ippconfig/system.config

@@ -16 +16 @@
         VYSOS5                  STR     vysos5/camera.config            # VYSOS 5in
         VYSOS20                 STR     vysos20/camera.config           # VYSOS 5in
+        SSP                     STR     ssp/camera.config               # Pan-STARRS spectroscopic sky probe
         SIMMOSAIC               STR     simmosaic/camera.config         # Simulated mosaic, for testing
         SIMTEST                 STR     simtest/camera.config           # Simulation test camera