Index: trunk/ippTools/src/camtool.c
===================================================================
--- trunk/ippTools/src/camtool.c	(revision 13633)
+++ trunk/ippTools/src/camtool.c	(revision 13649)
@@ -483,14 +483,4 @@
     }
 
-    psS32 nastro = psMetadataLookupS32(&status, config->args, "-nastro");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -nastro");
-        return false;
-    }
-    if (nastro < 0) {
-        psError(PS_ERR_UNKNOWN, true, "-nastro is required");
-        return false;
-    }
-
     psF32 zp_mean = psMetadataLookupF32(&status, config->args, "-zp_mean");
     if (!status) {
@@ -510,4 +500,64 @@
     if (isnan(zp_stdev)) {
         psError(PS_ERR_UNKNOWN, true, "-zp_stdev is required");
+        return false;
+    }
+
+    psF32 fwhm = psMetadataLookupF32(&status, config->args, "-fwhm");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm");
+        return false;
+    }
+    if (isnan(fwhm)) {
+        psError(PS_ERR_UNKNOWN, true, "-fwhm is required");
+        return false;
+    }
+
+    psF32 fwhm_range = psMetadataLookupF32(&status, config->args, "-fwhm_range");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm_range");
+        return false;
+    }
+    if (isnan(fwhm_range)) {
+        psError(PS_ERR_UNKNOWN, true, "-fwhm_range is required");
+        return false;
+    }
+
+    psS32 n_stars = psMetadataLookupS32(&status, config->args, "-n_stars");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_stars");
+        return false;
+    }
+    if (n_stars < 0) {
+        psError(PS_ERR_UNKNOWN, true, "-n_stars is required");
+        return false;
+    }
+
+    psS32 n_extended = psMetadataLookupS32(&status, config->args, "-n_extended");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_extended");
+        return false;
+    }
+    if (n_extended < 0) {
+        psError(PS_ERR_UNKNOWN, true, "-n_extended is required");
+        return false;
+    }
+
+    psS32 n_cr = psMetadataLookupS32(&status, config->args, "-n_cr");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_cr");
+        return false;
+    }
+    if (n_cr < 0) {
+        psError(PS_ERR_UNKNOWN, true, "-n_cr is required");
+        return false;
+    }
+
+    psS32 n_astrom = psMetadataLookupS32(&status, config->args, "-n_astrom");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_astrom");
+        return false;
+    }
+    if (n_astrom < 0) {
+        psError(PS_ERR_UNKNOWN, true, "-n_astrom is required");
         return false;
     }
@@ -576,8 +626,13 @@
         sigma_ra,
         sigma_dec,
-        nastro,
-        path_base,
         zp_mean,
         zp_stdev,
+	fwhm,
+	fwhm_range,
+	n_stars,
+	n_extended,
+	n_cr,
+	n_astrom,
+        path_base,
         code
     );