Index: branches/pap/ippTools/src/dettool.c
===================================================================
--- branches/pap/ippTools/src/dettool.c	(revision 23948)
+++ branches/pap/ippTools/src/dettool.c	(revision 25027)
@@ -276,6 +276,6 @@
     PXOPT_LOOKUP_F64(posang_min, config->args, "-posang_min", false, false);
     PXOPT_LOOKUP_F64(posang_max, config->args, "-posang_max", false, false);
-    PXOPT_LOOKUP_F64(solang_min, config->args, "-solang_min", false, false);
-    PXOPT_LOOKUP_F64(solang_max, config->args, "-solang_max", false, false);
+    PXOPT_LOOKUP_F64(solang_min, config->args, "-sun_angle_min", false, false);
+    PXOPT_LOOKUP_F64(solang_max, config->args, "-sun_angle_max", false, false);
     PXOPT_LOOKUP_TIME(time_begin, config->args, "-time_begin", false, false);
     PXOPT_LOOKUP_TIME(time_end, config->args, "-time_end", false, false);
@@ -521,6 +521,6 @@
     PXOPT_LOOKUP_F64(posang_min, config->args, "-posang_min", false, false);
     PXOPT_LOOKUP_F64(posang_max, config->args, "-posang_max", false, false);
-    PXOPT_LOOKUP_F64(solang_min, config->args, "-solang_min", false, false);
-    PXOPT_LOOKUP_F64(solang_max, config->args, "-solang_max", false, false);
+    PXOPT_LOOKUP_F64(solang_min, config->args, "-sun_angle_min", false, false);
+    PXOPT_LOOKUP_F64(solang_max, config->args, "-sun_angle_max", false, false);
 
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
@@ -557,6 +557,16 @@
     PXOPT_COPY_F64(config->args, where, "-select_posang_min", "posang", ">=");
     PXOPT_COPY_F64(config->args, where, "-select_posang_max", "posang", "<=");
-    PXOPT_COPY_F64(config->args, where, "-select_solang_min", "solang", ">=");
-    PXOPT_COPY_F64(config->args, where, "-select_solang_max", "solang", "<=");
+    PXOPT_COPY_F64(config->args, where, "-select_sun_angle_min", "sun_angle", ">=");
+    PXOPT_COPY_F64(config->args, where, "-select_sun_angle_max", "sun_angle", "<=");
+    PXOPT_COPY_F64(config->args, where, "-select_sun_alt_min", "sun_alt", ">=");
+    PXOPT_COPY_F64(config->args, where, "-select_sun_alt_max", "sun_alt", "<=");
+
+    PXOPT_COPY_F64(config->args, where, "-select_moon_angle_min", "moon_angle", ">=");
+    PXOPT_COPY_F64(config->args, where, "-select_moon_angle_max", "moon_angle", "<=");
+    PXOPT_COPY_F64(config->args, where, "-select_moon_alt_min", "moon_alt", ">=");
+    PXOPT_COPY_F64(config->args, where, "-select_moon_alt_max", "moon_alt", "<=");
+    PXOPT_COPY_F64(config->args, where, "-select_moon_phase_min", "moon_phase", ">=");
+    PXOPT_COPY_F64(config->args, where, "-select_moon_phase_max", "moon_phase", "<=");
+    PXOPT_COPY_STR(config->args, where, "-comment", "comment", "LIKE");
 
     if (!psListLength(where->list)) {
@@ -767,6 +777,6 @@
     PXOPT_LOOKUP_F64(posang_min, config->args, "-set_posang_min", false, false);
     PXOPT_LOOKUP_F64(posang_max, config->args, "-set_posang_max", false, false);
-    PXOPT_LOOKUP_F64(solang_min, config->args, "-set_solang_min", false, false);
-    PXOPT_LOOKUP_F64(solang_max, config->args, "-set_solang_max", false, false);
+    PXOPT_LOOKUP_F64(solang_min, config->args, "-set_sun_angle_min", false, false);
+    PXOPT_LOOKUP_F64(solang_max, config->args, "-set_sun_angle_max", false, false);
     PXOPT_LOOKUP_TIME(registered, config->args, "-set_registered", false, false);
     PXOPT_LOOKUP_TIME(time_begin, config->args, "-set_time_begin", false, false);
@@ -1605,6 +1615,6 @@
     PXOPT_LOOKUP_F64(posang_min, config->args, "-posang_min", false, false);
     PXOPT_LOOKUP_F64(posang_max, config->args, "-posang_max", false, false);
-    PXOPT_LOOKUP_F64(solang_min, config->args, "-solang_min", false, false);
-    PXOPT_LOOKUP_F64(solang_max, config->args, "-solang_max", false, false);
+    PXOPT_LOOKUP_F64(solang_min, config->args, "-sun_angle_min", false, false);
+    PXOPT_LOOKUP_F64(solang_max, config->args, "-sun_angle_max", false, false);
     PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
     PXOPT_LOOKUP_TIME(time_begin, config->args, "-time_begin", false, false);