Index: /branches/eam_branch_20080719/ippTools/src/camtool.c
===================================================================
--- /branches/eam_branch_20080719/ippTools/src/camtool.c	(revision 18641)
+++ /branches/eam_branch_20080719/ippTools/src/camtool.c	(revision 18642)
@@ -74,4 +74,7 @@
         MODECASE(CAMTOOL_MODE_MASKED,               maskedMode);
         MODECASE(CAMTOOL_MODE_UNBLOCK,              unblockMode);
+        MODECASE(CAMTOOL_MODE_PENDINGCLEANUPRUN,    pendingcleanuprunMode);
+        MODECASE(CAMTOOL_MODE_PENDINGCLEANUPEXP,    pendingcleanupexpMode);
+        MODECASE(CAMTOOL_MODE_DONECLEANUP,          donecleanupMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -988,5 +991,5 @@
 
     psMetadata *where = psMetadataAlloc();
-    if (chip_id) {
+    if (cam_id) {
         PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
     }
Index: /branches/eam_branch_20080719/ippTools/src/camtool.h
===================================================================
--- /branches/eam_branch_20080719/ippTools/src/camtool.h	(revision 18641)
+++ /branches/eam_branch_20080719/ippTools/src/camtool.h	(revision 18642)
@@ -35,5 +35,8 @@
     CAMTOOL_MODE_BLOCK,
     CAMTOOL_MODE_MASKED,
-    CAMTOOL_MODE_UNBLOCK
+    CAMTOOL_MODE_UNBLOCK,
+    CAMTOOL_MODE_PENDINGCLEANUPRUN,
+    CAMTOOL_MODE_PENDINGCLEANUPEXP,
+    CAMTOOL_MODE_DONECLEANUP,
 } camtoolMode;
 
Index: /branches/eam_branch_20080719/ippTools/src/dettool.h
===================================================================
--- /branches/eam_branch_20080719/ippTools/src/dettool.h	(revision 18641)
+++ /branches/eam_branch_20080719/ippTools/src/dettool.h	(revision 18642)
@@ -92,6 +92,67 @@
 bool tocorrectimfileMode(pxConfig *config);
 bool addcorrectimfileMode(pxConfig *config);
+
 // register
 bool register_detrend_imfileMode(pxConfig *config);
 
+// processedimfile
+bool toprocessedimfileMode(pxConfig *config);
+bool addprocessedimfileMode(pxConfig *config);
+bool processedimfileMode(pxConfig *config);
+bool revertprocessedimfileMode(pxConfig *config);
+
+// processedexp
+bool toprocessedexpMode(pxConfig *config);
+bool addprocessedexpMode(pxConfig *config);
+bool processedexpMode(pxConfig *config);
+bool revertprocessedexpMode(pxConfig *config);
+
+// stackedimfile
+bool tostackedMode(pxConfig *config);
+bool addstackedMode(pxConfig *config);
+bool stackedMode(pxConfig *config);
+bool revertstackedMode(pxConfig *config);
+
+// normalizedstat
+bool tonormalizedstatMode(pxConfig *config);
+bool addnormalizedstatMode(pxConfig *config);
+bool normalizedstatMode(pxConfig *config);
+bool revertnormalizedstatMode(pxConfig *config);
+
+// normalizedimfile
+bool tonormalizeMode(pxConfig *config);
+bool addnormalizedimfileMode(pxConfig *config);
+bool normalizedimfileMode(pxConfig *config);
+bool revertnormalizedimfileMode(pxConfig *config);
+
+// normalizedexp
+bool tonormalizedexpMode(pxConfig *config);
+bool addnormalizedexpMode(pxConfig *config);
+bool normalizedexpMode(pxConfig *config);
+bool revertnormalizedexpMode(pxConfig *config);
+
+// residimfile
+bool toresidimfileMode(pxConfig *config);
+bool addresidimfileMode(pxConfig *config);
+bool residimfileMode(pxConfig *config);
+bool revertresidimfileMode(pxConfig *config);
+
+// residexp
+bool toresidexpMode(pxConfig *config);
+bool addresidexpMode(pxConfig *config);
+bool residexpMode(pxConfig *config);
+bool revertresidexpMode(pxConfig *config);
+bool updateresidexpMode(pxConfig *config);
+
+// detrunsummary
+bool todetrunsummaryMode(pxConfig *config);
+bool adddetrunsummaryMode(pxConfig *config);
+bool detrunsummaryMode(pxConfig *config);
+bool revertdetrunsummaryMode(pxConfig *config);
+bool updatedetrunsummaryMode(pxConfig *config);
+
+// other utilities
+bool startNewIteration(pxConfig *config, psS64 det_id);
+bool setDetRunState(pxConfig *config, psS64 det_id, const char *state);
+
 #endif // DETTOOL_H
Index: /branches/eam_branch_20080719/ippTools/src/faketool.c
===================================================================
--- /branches/eam_branch_20080719/ippTools/src/faketool.c	(revision 18641)
+++ /branches/eam_branch_20080719/ippTools/src/faketool.c	(revision 18642)
@@ -68,5 +68,5 @@
 
     switch (config->mode) {
-        MODECASE(FAKETOOL_MODE_DEFINEBYQUERY,                   definebyqueryMode);
+        MODECASE(FAKETOOL_MODE_DEFINEBYQUERY,           definebyqueryMode);
         MODECASE(FAKETOOL_MODE_UPDATERUN,               updaterunMode);
         MODECASE(FAKETOOL_MODE_PENDINGEXP,              pendingexpMode);
@@ -75,9 +75,12 @@
         MODECASE(FAKETOOL_MODE_PROCESSEDIMFILE,         processedimfileMode);
         MODECASE(FAKETOOL_MODE_REVERTPROCESSEDIMFILE,   revertprocessedimfileMode);
-        MODECASE(FAKETOOL_MODE_UPDATEPROCESSEDIMFILE,updateprocessedimfileMode);
+        MODECASE(FAKETOOL_MODE_UPDATEPROCESSEDIMFILE,   updateprocessedimfileMode);
         MODECASE(FAKETOOL_MODE_BLOCK,                   blockMode);
         MODECASE(FAKETOOL_MODE_MASKED,                  maskedMode);
         MODECASE(FAKETOOL_MODE_UNMASKED,                unmaskedMode);
         MODECASE(FAKETOOL_MODE_UNBLOCK,                 unblockMode);
+        MODECASE(FAKETOOL_MODE_PENDINGCLEANUPRUN,       pendingcleanuprunMode);
+        MODECASE(FAKETOOL_MODE_PENDINGCLEANUPIMFILE,    pendingcleanupimfileMode);
+        MODECASE(FAKETOOL_MODE_DONECLEANUP,             donecleanupMode);
         default:
             psAbort("invalid option (this should not happen)");
Index: /branches/eam_branch_20080719/ippTools/src/faketool.h
===================================================================
--- /branches/eam_branch_20080719/ippTools/src/faketool.h	(revision 18641)
+++ /branches/eam_branch_20080719/ippTools/src/faketool.h	(revision 18642)
@@ -38,5 +38,6 @@
     FAKETOOL_MODE_UNBLOCK,
     FAKETOOL_MODE_RETRYPROCESSEDIMFILE,
-    FAKETOOL_MODE_PENDINGCLEANUP,
+    FAKETOOL_MODE_PENDINGCLEANUPRUN,
+    FAKETOOL_MODE_PENDINGCLEANUPIMFILE,
     FAKETOOL_MODE_DONECLEANUP,
 } FAKETOOLMode;
Index: /branches/eam_branch_20080719/ippTools/src/warptool.c
===================================================================
--- /branches/eam_branch_20080719/ippTools/src/warptool.c	(revision 18641)
+++ /branches/eam_branch_20080719/ippTools/src/warptool.c	(revision 18642)
@@ -72,18 +72,21 @@
 
     switch (config->mode) {
-        MODECASE(WARPTOOL_MODE_DEFINERUN,         definerunMode);
-        MODECASE(WARPTOOL_MODE_UPDATERUN,         updaterunMode);
-        MODECASE(WARPTOOL_MODE_EXP,               expMode);
-        MODECASE(WARPTOOL_MODE_IMFILE,            imfileMode);
-        MODECASE(WARPTOOL_MODE_TOOVERLAP,         tooverlapMode);
-        MODECASE(WARPTOOL_MODE_ADDOVERLAP,        addoverlapMode);
-        MODECASE(WARPTOOL_MODE_SCMAP,             scmapMode);
-        MODECASE(WARPTOOL_MODE_TOWARPED,          towarpedMode);
-        MODECASE(WARPTOOL_MODE_ADDWARPED,         addwarpedMode);
-        MODECASE(WARPTOOL_MODE_WARPED,            warpedMode);
-        MODECASE(WARPTOOL_MODE_REVERTWARPED,      revertwarpedMode);
-        MODECASE(WARPTOOL_MODE_BLOCK,             blockMode);
-        MODECASE(WARPTOOL_MODE_MASKED,            maskedMode);
-        MODECASE(WARPTOOL_MODE_UNBLOCK,           unblockMode);
+        MODECASE(WARPTOOL_MODE_DEFINERUN,          definerunMode);
+        MODECASE(WARPTOOL_MODE_UPDATERUN,          updaterunMode);
+        MODECASE(WARPTOOL_MODE_EXP,                expMode);
+        MODECASE(WARPTOOL_MODE_IMFILE,             imfileMode);
+        MODECASE(WARPTOOL_MODE_TOOVERLAP,          tooverlapMode);
+        MODECASE(WARPTOOL_MODE_ADDOVERLAP,         addoverlapMode);
+        MODECASE(WARPTOOL_MODE_SCMAP,              scmapMode);
+        MODECASE(WARPTOOL_MODE_TOWARPED,           towarpedMode);
+        MODECASE(WARPTOOL_MODE_ADDWARPED,          addwarpedMode);
+        MODECASE(WARPTOOL_MODE_WARPED,             warpedMode);
+        MODECASE(WARPTOOL_MODE_REVERTWARPED,       revertwarpedMode);
+        MODECASE(WARPTOOL_MODE_BLOCK,              blockMode);
+        MODECASE(WARPTOOL_MODE_MASKED,             maskedMode);
+        MODECASE(WARPTOOL_MODE_UNBLOCK,            unblockMode);
+        MODECASE(WARPTOOL_MODE_PENDINGCLEANUPRUN,  pendingcleanuprunMode);
+        MODECASE(WARPTOOL_MODE_PENDINGCLEANUPWARP, pendingcleanupwarpMode);
+        MODECASE(WARPTOOL_MODE_DONECLEANUP,        donecleanupMode);
 
         default:
Index: /branches/eam_branch_20080719/ippTools/src/warptool.h
===================================================================
--- /branches/eam_branch_20080719/ippTools/src/warptool.h	(revision 18641)
+++ /branches/eam_branch_20080719/ippTools/src/warptool.h	(revision 18642)
@@ -41,4 +41,7 @@
     WARPTOOL_MODE_MASKED,
     WARPTOOL_MODE_UNBLOCK,
+    WARPTOOL_MODE_PENDINGCLEANUPRUN,
+    WARPTOOL_MODE_PENDINGCLEANUPWARP,
+    WARPTOOL_MODE_DONECLEANUP,
 } warptoolMode;