Changeset 36837 for trunk/psastro/src/psastroArguments.c

Timestamp:

Jun 8, 2014, 9:27:56 AM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20140423: add Koppehoefer correction; make sure psastro failures are noted clearl in the output header; do not load the model if we choose skipastro

File:

• trunk/psastro/src/psastroArguments.c (modified) (2 diffs)

trunk/psastro/src/psastroArguments.c

@@ -60 +60 @@
         psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.USE.MODEL", PS_META_REPLACE, "", true);
     }
-    // define the reference astrometry file
+    // define the reference astrometry file (add a container ASTROM.MODEL to config->arguments if -astrommodel (file) is found)
     status = pmConfigFileSetsMD (config->arguments, &argc, argv, "ASTROM.MODEL", "-astrommodel", "-astrommodellist");
+
+    // define the koppenhoefer correction file (add a container KH.CORRECT to config->arguments if -kh-correct (file) is found)
+    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "KH.CORRECT", "-kh-correct", NULL);
 
     // define the reference astrometry file
@@ -108 +111 @@
         }
         psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.SKIP.ASTRO", PS_META_REPLACE, "", true);
+
+        // SKIP.ASTRO and USE.MODEL are fundamentally incompatible
+        psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.USE.MODEL", PS_META_REPLACE, "", false);
     }