Index: trunk/psastro/src/psastroDefineFiles.c
===================================================================
--- trunk/psastro/src/psastroDefineFiles.c	(revision 15669)
+++ trunk/psastro/src/psastroDefineFiles.c	(revision 15891)
@@ -20,20 +20,17 @@
     output->save = true;
 
-    bool fixChips = psMetadataLookupBool (&status, recipe, "PSASTRO.FIX.CHIPS");
-    if (fixChips) {
-        if (!psastroDefineFile (config, input->fpa, "PSASTRO.REF.ASTROM", "REF.ASTROM", PM_FPA_FILE_ASTROM, PM_DETREND_TYPE_ASTROM)) {
-            psError (PS_ERR_IO, false, "Can't find a reference astrometry file");
+    bool fixChips = psMetadataLookupBool (&status, config->arguments, "PSASTRO.FIX.CHIPS");
+    if (!status) {
+	fixChips = psMetadataLookupBool (&status, recipe, "PSASTRO.FIX.CHIPS");
+    }
+    bool useModel = psMetadataLookupBool (&status, config->arguments, "PSASTRO.USE.MODEL");
+    if (!status) {
+	fixChips = psMetadataLookupBool (&status, recipe, "PSASTRO.USE.MODEL");
+    }
+    if (fixChips || useModel) {
+        if (!psastroDefineFile (config, input->fpa, "PSASTRO.MODEL", "ASTROM.MODEL", PM_FPA_FILE_ASTROM, PM_DETREND_TYPE_ASTROM)) {
+            psError (PS_ERR_IO, false, "Can't find an astrometry model file");
             return NULL;
         }
-    }
-
-    bool saveAstrom = psMetadataLookupBool (&status, recipe, "SAVE.REF.ASTROM");
-    if (saveAstrom) {
-	pmFPAfile *outAstrom = pmFPAfileDefineOutputFromFile (config, input, "PSASTRO.OUT.ASTROM");
-        if (!outAstrom) {
-            psError (PS_ERR_IO, false, "Can't find a reference astrometry file");
-            return NULL;
-        }
-	outAstrom->save = true;
     }