Index: trunk/ppSub/src/ppSubArguments.c
===================================================================
--- trunk/ppSub/src/ppSubArguments.c	(revision 13750)
+++ trunk/ppSub/src/ppSubArguments.c	(revision 14107)
@@ -17,7 +17,5 @@
 {
     fprintf(stderr, "\nPan-STARRS PSF-matched image subtraction\n\n");
-    fprintf(stderr, "Usage: %s INPUT.fits REFERENCE.fits OUTPUT_ROOT \n"
-            "\t[-psf REFERENCE.psf.fits|-psflist REFERENCE.list]\n",
-            program);
+    fprintf(stderr, "Usage: %s INPUT.fits REFERENCE.fits OUTPUT_ROOT\n", program);
     fprintf(stderr, "\n");
     psArgumentHelp(arguments);
@@ -57,20 +55,4 @@
     } \
     psMetadataAdd##TYPE(config->arguments, PS_LIST_TAIL, RECIPENAME, 0, NULL, value); \
-}
-
-// Get a mask value from the command-line or recipe, and add it to the arguments
-#define VALUE_ARG_RECIPE_MASK(ARGNAME, RECIPENAME) { \
-    bool mdok; \
-    const char *name = psMetadataLookupStr(&mdok, arguments, ARGNAME); \
-    if (!mdok || !name || strlen(name) == 0) { \
-        name = psMetadataLookupStr(NULL, recipe, RECIPENAME); \
-        if (!name) { \
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to find %s in recipe %s", \
-                RECIPENAME, PPSUB_RECIPE); \
-            goto ERROR; \
-        } \
-    } \
-    psMaskType value = pmConfigMask(name, config); \
-    psMetadataAddU8(config->arguments, PS_LIST_TAIL, RECIPENAME, 0, NULL, value); \
 }
 
@@ -152,28 +134,8 @@
 }
 
-// Add a single filename to the arguments as an array, so that it can be used with pmFPAfileBindFromArgs, etc
-static void fileList(const char *file, // The symbolic name for the file
-                     const char *name, // The name of the file
-                     const char *comment, // Description of the file
-                     pmConfig *config // Configuration
-    )
-{
-    psArray *files = psArrayAlloc(1); // Array with file names
-    files->data[0] = psStringCopy(name);
-    psMetadataAddArray(config->arguments, PS_LIST_TAIL, file, 0, comment, files);
-    psFree(files);
-    return;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 bool ppSubArguments(int argc, char *argv[], pmConfig *config)
 {
     assert(config);
-
-    psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PHOTOMETRY", 0, "Do photometry?",
-                      (psArgumentGet(argc, argv, "-psf") || psArgumentGet(argc, argv, "-psflist")) ?
-                      true : false);
-    pmConfigFileSetsMD(config->arguments, &argc, argv, "PSPHOT.PSF", "-psf", "-psflist");
 
     psMetadata *arguments = psMetadataAlloc(); // Command-line arguments
@@ -182,11 +144,13 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-refmask", 0, "Referencemask image", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-refweight", 0, "Referenceweight image", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "Statistics file", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-stat", 0, "Statistics file", NULL);
 
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-size", 0, "Kernel half-size (pixels)", 0);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-order", 0, "Spatial polynomial order", 0);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-type", 0, "Kernel type (POIS or ISIS)", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-type", 0, "Kernel type (ISIS|POIS|SPAM|FRIES)", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-isis-widths", 0, "ISIS Gaussian widths (comma-separated)", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-isis-orders", 0, "ISIS polynomial orders (comma-separated)", NULL);
+    psMetadataAddS32(arguments, PS_LIST_TAIL, "-inner", 0, "SPAM and FRIES inner radius", 0);
+    psMetadataAddS32(arguments, PS_LIST_TAIL, "-spam-binning", 0, "SPAM kernel binning", 2);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-spacing", 0, "Typical stamp spacing (pixels)", NAN);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-footprint", 0, "Stamp footprint half-size (pixels)", 0);
@@ -202,27 +166,19 @@
     }
 
-    fileList("INPUT", argv[1], "Name of the input image",     config);
-    fileList("REF",   argv[2], "Name of the reference image", config);
+    psArray *files = psArrayAlloc(1);   // Array with file names
+    files->data[0] = psStringCopy(argv[1]);
+    psMetadataAddArray(config->arguments, PS_LIST_TAIL, "INPUT", 0, "Name of the input image", files);
+    psFree(files);
+    files = psArrayAlloc(1);
+    files->data[0] = psStringCopy(argv[2]);
+    psMetadataAddArray(config->arguments, PS_LIST_TAIL, "REF", 0, "Name of the reference image", files);
+    psFree(files);
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image", argv[3]);
 
-    const char *inMask = psMetadataLookupStr(NULL, arguments, "-inmask"); // Name of input mask
-    if (inMask && strlen(inMask) > 0) {
-        fileList("INPUT.MASK", inMask, "Name of the input mask image", config);
-    }
-    const char *inWeight = psMetadataLookupStr(NULL, arguments, "-inweight"); // Name of input weight
-    if (inWeight && strlen(inWeight) > 0) {
-        fileList("INPUT.WEIGHT", inWeight, "Name of the input weight image", config);
-    }
-
-    const char *refMask = psMetadataLookupStr(NULL, arguments, "-refmask"); // Name of reference mask
-    if (refMask && strlen(refMask) > 0) {
-        fileList("REF.MASK", refMask, "Name of the reference mask image", config);
-    }
-    const char *refWeight = psMetadataLookupStr(NULL, arguments, "-refweight"); // Name of reference weight
-    if (refWeight && strlen(refWeight) > 0) {
-        fileList("REF.WEIGHT", refWeight, "Name of the reference weight image", config);
-    }
-
-    valueArgStr(config, arguments, "-stats",      "STATS",         config->arguments);
+    valueArgStr(config, arguments, "-inmask",    "INPUT.MASK",    config->arguments);
+    valueArgStr(config, arguments, "-inweight",  "INPUT.WEIGHT",  config->arguments);
+    valueArgStr(config, arguments, "-refmask",   "REF.MASK",      config->arguments);
+    valueArgStr(config, arguments, "-refweight", "REF.WEIGHT",    config->arguments);
+    valueArgStr(config, arguments, "-stat",      "STATS",         config->arguments);
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSUB_RECIPE); // Recipe for ppSim
@@ -232,13 +188,15 @@
     }
 
-    VALUE_ARG_RECIPE_INT("-size",        "KERNEL.SIZE",     S32, 0);
-    VALUE_ARG_RECIPE_INT("-order",       "SPATIAL.ORDER",   S32, 0);
-    VALUE_ARG_RECIPE_FLOAT("-spacing",   "STAMP.SPACING",   F32);
-    VALUE_ARG_RECIPE_INT("-footprint",   "STAMP.FOOTPRINT", S32, 0);
-    VALUE_ARG_RECIPE_FLOAT("-threshold", "STAMP.THRESHOLD", F32);
-    VALUE_ARG_RECIPE_INT("-iter",        "ITER",            S32, 0);
-    VALUE_ARG_RECIPE_FLOAT("-rej",       "REJ",             F32);
-    VALUE_ARG_RECIPE_MASK("-mask-bad",   "MASK.BAD");
-    VALUE_ARG_RECIPE_MASK("-mask-blank", "MASK.BLANK");
+    VALUE_ARG_RECIPE_INT("-size",         "KERNEL.SIZE",     S32, 0);
+    VALUE_ARG_RECIPE_INT("-order",        "SPATIAL.ORDER",   S32, 0);
+    VALUE_ARG_RECIPE_FLOAT("-spacing",    "STAMP.SPACING",   F32);
+    VALUE_ARG_RECIPE_INT("-inner",        "INNER",           S32, 0);
+    VALUE_ARG_RECIPE_INT("-spam-binning", "SPAM.BINNING",    S32, 0);
+    VALUE_ARG_RECIPE_INT("-footprint",    "STAMP.FOOTPRINT", S32, 0);
+    VALUE_ARG_RECIPE_FLOAT("-threshold",  "STAMP.THRESHOLD", F32);
+    VALUE_ARG_RECIPE_INT("-iter",         "ITER",            S32, 0);
+    VALUE_ARG_RECIPE_FLOAT("-rej",        "REJ",             F32);
+    VALUE_ARG_RECIPE_INT("-mask-bad",     "MASK.BAD",        U8, 0);
+    VALUE_ARG_RECIPE_INT("-mask-blank",   "MASK.BLANK",      U8, 0);
 
     vectorArgRecipe(config, arguments, "-isis-widths", recipe, "ISIS.WIDTHS", config->arguments, PS_TYPE_F32);
@@ -269,4 +227,8 @@
     } else if (strcasecmp(type, "ISIS") == 0) {
         kernelType = PM_SUBTRACTION_KERNEL_ISIS;
+    } else if (strcasecmp(type, "SPAM") == 0) {
+        kernelType = PM_SUBTRACTION_KERNEL_SPAM;
+    } else if (strcasecmp(type, "FRIES") == 0) {
+        kernelType = PM_SUBTRACTION_KERNEL_FRIES;
     } else {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised kernel type: %s", type);