Index: /trunk/ippTools/src/detselect.h
===================================================================
--- /trunk/ippTools/src/detselect.h	(revision 18321)
+++ /trunk/ippTools/src/detselect.h	(revision 18322)
@@ -31,3 +31,98 @@
 pxConfig *detselectConfig(pxConfig *config, int argc, char **argv);
 
+#define addWhereStr(name) \
+{ \
+    psString str = NULL; \
+    bool status = false; \
+    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
+        if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
+            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
+            psFree(config); \
+            return NULL; \
+        } \
+    } \
+}
+
+#define addWhereStrAlias(name,realname) \
+{ \
+    psString str = NULL; \
+    bool status = false; \
+    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
+        if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #realname, 0, "==", str)) {\
+            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
+            psFree(config); \
+            return NULL; \
+        } \
+    } \
+}
+
+#define addWhereS32(name) \
+{ \
+    psS32 s32 = 0; \
+    bool status = false; \
+    if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \
+        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \
+            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
+            psFree(config); \
+            return NULL; \
+        } \
+    } \
+}
+
+#define addWhereF32(name) \
+{ \
+    psF32 var = 0; \
+    bool status = false; \
+    if ((var = psMetadataLookupF32(&status, config->args, "-" #name))) { \
+        if (!isnan(var)) { \
+            if (!psMetadataAddF32(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \
+                psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
+                psFree(config); \
+                return NULL; \
+            } \
+        } \
+    } \
+}
+
+#define addWhereF64(name) \
+{ \
+    psF64 var = 0; \
+    bool status = false; \
+    if ((var = psMetadataLookupF64(&status, config->args, "-" #name))) { \
+        if (!isnan(var))  { \
+            if (!psMetadataAddF64(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \
+                psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
+                psFree(config); \
+                return NULL; \
+            } \
+        } \
+    } \
+}
+
+#define addWhereTimeStr(name) \
+{ \
+    psString str = NULL; \
+    bool status = false; \
+    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
+        psTime *time = psTimeFromISO(str, PS_TIME_UTC); \
+        if (!time) { \
+            psError(PS_ERR_UNKNOWN, false, "failed to convert " #name " into a psTime object"); \
+            psFree(config); \
+            return NULL; \
+        } \
+        psMetadataItem *item = psMetadataLookup(config->args, "-" #name); \
+        if (item) { \
+            str = item->comment; \
+        } else { \
+            str = NULL; \
+        } \
+        if (!psMetadataAddTime(config->where, PS_LIST_TAIL, #name, 0, str, time)) {\
+            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
+            psFree(config); \
+            return NULL; \
+        } \
+        psFree(time); \
+    } \
+}
+
 #endif // DETSELECT_H
Index: /trunk/ippTools/src/detselectConfig.c
===================================================================
--- /trunk/ippTools/src/detselectConfig.c	(revision 18321)
+++ /trunk/ippTools/src/detselectConfig.c	(revision 18322)
@@ -47,36 +47,38 @@
     psMetadata *searchArgs = psMetadataAlloc();
     psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-inst", 0,
-            "search by camera", NULL);
+                     "search by camera", NULL);
     psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-telescope", 0,
-            "search by telescope", NULL);
+                     "search by telescope", NULL);
     psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-det_type", 0,
-            "search by detrend type", NULL);
+                     "search by detrend type", NULL);
+    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-type", 0,
+                     "search by detrend type (alias for -det_type)", NULL);
     psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-filter", 0,
-            "search by filter", NULL);
+                     "search by filter", NULL);
     psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-airmass", 0,
-            "define airmass", NAN);
+                     "define airmass", NAN);
     psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-exp_time", 0,
-            "search by exposure time", NAN);
+                     "search by exposure time", NAN);
     psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-ccd_temp", 0,
-            "search by ccd tempature", NAN);
+                     "search by ccd tempature", NAN);
     psMetadataAddF64(searchArgs, PS_LIST_TAIL, "-posang", 0,
-            "search by rotator position angle", NAN);
+                     "search by rotator position angle", NAN);
     psMetadataAddTime(searchArgs, PS_LIST_TAIL, "-time", 0,
-            "define time for desired detrend data", NULL);
+                      "define time for desired detrend data", NULL);
     psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-simple",  0,
-            "use the simple output format", false);
+                      "use the simple output format", false);
     psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-unlimit",  0,
-            "list all possible detruns, not just the best match", false);
+                      "list all possible detruns, not just the best match", false);
  
     // -select
     psMetadata *selectArgs = psMetadataAlloc();
     psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-det_id", 0,
-            "search by detrend ID", NULL);
+                     "search by detrend ID", NULL);
     psMetadataAddS32(selectArgs, PS_LIST_TAIL, "-iteration", 0,
-            "search by iteration number", 0);
+                     "search by iteration number", 0);
     psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-class_id", 0,
-            "search by class ID", NULL);
+                     "search by class ID", NULL);
     psMetadataAddBool(selectArgs, PS_LIST_TAIL, "-simple",  0,
-            "use the simple output format", false);
+                      "use the simple output format", false);
     
     psMetadata *argSets = psMetadataAlloc();
@@ -98,86 +100,4 @@
 
     // setup search criterion
-#define addWhereStr(name) \
-{ \
-    psString str = NULL; \
-    bool status = false; \
-    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
-        if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-    } \
-}
-
-#define addWhereS32(name) \
-{ \
-    psS32 s32 = 0; \
-    bool status = false; \
-    if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \
-        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-    } \
-}
-
-#define addWhereF32(name) \
-{ \
-    psF32 var = 0; \
-    bool status = false; \
-    if ((var = psMetadataLookupF32(&status, config->args, "-" #name))) { \
-        if (!isnan(var)) { \
-            if (!psMetadataAddF32(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \
-                psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-                psFree(config); \
-                return NULL; \
-            } \
-        } \
-    } \
-}
-
-#define addWhereF64(name) \
-{ \
-    psF64 var = 0; \
-    bool status = false; \
-    if ((var = psMetadataLookupF64(&status, config->args, "-" #name))) { \
-        if (!isnan(var))  { \
-            if (!psMetadataAddF64(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \
-                psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-                psFree(config); \
-                return NULL; \
-            } \
-        } \
-    } \
-}
-
-#define addWhereTimeStr(name) \
-{ \
-    psString str = NULL; \
-    bool status = false; \
-    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
-        psTime *time = psTimeFromISO(str, PS_TIME_UTC); \
-        if (!time) { \
-            psError(PS_ERR_UNKNOWN, false, "failed to convert " #name " into a psTime object"); \
-            psFree(config); \
-            return NULL; \
-        } \
-        psMetadataItem *item = psMetadataLookup(config->args, "-" #name); \
-        if (item) { \
-            str = item->comment; \
-        } else { \
-            str = NULL; \
-        } \
-        if (!psMetadataAddTime(config->where, PS_LIST_TAIL, #name, 0, str, time)) {\
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-        psFree(time); \
-    } \
-}
-
     // generate SQL where clause
     config->where = psMetadataAlloc();
@@ -186,18 +106,10 @@
     addWhereS32(iteration);
     addWhereStr(exp_id);
-    // convert '-inst' to 'camera'
-    {
-        psString str = NULL; 
-        bool status = false;
-        if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) {
-            if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item camera");
-                psFree(config);
-                return NULL;
-            }
-        }
-    }
+    addWhereStrAlias(inst,camera);
+
     addWhereStr(telescope);
     addWhereStr(det_type);
+    addWhereStrAlias(type,det_type);
+
     addWhereStr(exp_type);
     addWhereS32(imfiles);
@@ -205,9 +117,10 @@
     addWhereStr(class_id);
     addWhereStr(filter);
-//    addWhereF32(exp_time);
-//    addWhereF64(ccd_temp);
-//    addWhereF32(airmass);
-//    addWhereTimeStr(use_begin);
-//    addWhereTimeStr(use_end);
+
+    //    addWhereF32(exp_time);
+    //    addWhereF64(ccd_temp);
+    //    addWhereF32(airmass);
+    //    addWhereTimeStr(use_begin);
+    //    addWhereTimeStr(use_end);
 
     if (config->where->list->n < 1) {