Changeset 27840 for branches/simtest_nebulous_branches/ippTools/src/dettool.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/dettool.h (modified) (7 diffs)

branches/simtest_nebulous_branches/ippTools/src

@@ +1 @@
+*.la
+*.lo
 .deps
 .gdb_history
@@ -4 +6 @@
 Makefile
 Makefile.in
+addtool
+caltool
+camtool
+chiptool
 config.h
 config.h.in
-stamp-h1
-*.la
-*.lo
+detselect
+dettool
+difftool
+disttool
+dqstatstool
+faketool
+flatcorr
+guidetool
+magicdstool
+magictool
+pstamptool
+pubtool
+pxadmin
+pxdata.c
+pxinject
 pxtoolsErrorCodes.c
 pxtoolsErrorCodes.h
-pxadmin
-pxinject
-pztool
 pzgetexp
 pzgetimfiles
+pztool
+receivetool
 regtool
-guidetool
-chiptool
-camtool
+stacktool
+stamp-h1
 warptool
-difftool
-stacktool
-faketool
-dettool
-detselect
-pxdata.c
-magictool
-magicdstool
-caltool
-flatcorr
-pstamptool
-disttool
-receivetool
-
-pubtool

@@ +1 @@
+*.la
+*.lo
 .deps
 .gdb_history
@@ -4 +6 @@
 Makefile
 Makefile.in
+addtool
+caltool
+camtool
+chiptool
 config.h
 config.h.in
-stamp-h1
-*.la
-*.lo
+detselect
+dettool
+difftool
+disttool
+dqstatstool
+faketool
+flatcorr
+guidetool
+magicdstool
+magictool
+pstamptool
+pubtool
+pxadmin
+pxdata.c
+pxinject
 pxtoolsErrorCodes.c
 pxtoolsErrorCodes.h
-pxadmin
-pxinject
-pztool
 pzgetexp
 pzgetimfiles
+pztool
+receivetool
 regtool
-guidetool
-chiptool
-camtool
+stacktool
+stamp-h1
 warptool
-difftool
-stacktool
-faketool
-dettool
-detselect
-pxdata.c
-magictool
-magicdstool
-caltool
-flatcorr
-pstamptool
-disttool
-receivetool
-
-pubtool

branches/simtest_nebulous_branches/ippTools/src/dettool.h

@@ -57 +57 @@
     DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDEXP,
     DETTOOL_MODE_DONECLEANUP_PROCESSEDEXP,
+    DETTOOL_MODE_UPDATESTATE_PROCESSED,
 
     DETTOOL_MODE_TOSTACKED,
@@ -105 +106 @@
     DETTOOL_MODE_PENDINGCLEANUP_RESIDEXP,
     DETTOOL_MODE_DONECLEANUP_RESIDEXP,
+    DETTOOL_MODE_UPDATESTATE_RESID,
 
     DETTOOL_MODE_TODETRUNSUMMARY,
@@ -111 +113 @@
     DETTOOL_MODE_REVERTDETRUNSUMMARY,
     DETTOOL_MODE_UPDATEDETRUNSUMMARY,
+    DETTOOL_MODE_PENDINGCLEANUP_DETRUNSUMMARY,
     DETTOOL_MODE_UPDATEDETRUN,
     DETTOOL_MODE_RERUN,
@@ -148 +151 @@
 bool pendingcleanup_processedexpMode(pxConfig *config);
 bool donecleanup_processedexpMode(pxConfig *config);
+bool updatestateprocessedMode(pxConfig *config);
 
 // stackedimfile
@@ -202 +206 @@
 bool pendingcleanup_residexpMode(pxConfig *config);
 bool donecleanup_residexpMode(pxConfig *config);
+bool updatestateresidMode(pxConfig *config);
 
 // detrunsummary
@@ -209 +214 @@
 bool revertdetrunsummaryMode(pxConfig *config);
 bool updatedetrunsummaryMode(pxConfig *config);
+bool pendingcleanup_detrunsummaryMode(pxConfig *config);
 
 // other utilities
@@ -218 +224 @@
 
 // functions to set the 'data_state' for stages
-bool setProcessedImfileDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *class_id, const char *data_state);
-bool setProcessedExpDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *data_state);
+bool setProcessedImfileDataState(pxConfig *config, psMetadata *where, const char *data_state);
+bool setProcessedExpDataState(pxConfig *config, psMetadata *where, const char *data_state);
+bool setResidImfileDataState(pxConfig *config, psMetadata *where, const char *data_state);
+bool setResidExpDataState(pxConfig *config, psMetadata *where, const char *data_state);
+
 bool setStackedImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state);
 bool setNormStatImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state);
 bool setNormImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state);
 bool setNormExpDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *data_state);
-bool setResidImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *class_id, const char *data_state);
-bool setResidExpDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *data_state);
 
 #endif // DETTOOL_H

@@ +1 @@
+*.la
+*.lo
 .deps
 .gdb_history
@@ -4 +6 @@
 Makefile
 Makefile.in
+addtool
+caltool
+camtool
+chiptool
 config.h
 config.h.in
-stamp-h1
-*.la
-*.lo
+detselect
+dettool
+difftool
+disttool
+dqstatstool
+faketool
+flatcorr
+guidetool
+magicdstool
+magictool
+pstamptool
+pubtool
+pxadmin
+pxdata.c
+pxinject
 pxtoolsErrorCodes.c
 pxtoolsErrorCodes.h
-pxadmin
-pxinject
-pztool
 pzgetexp
 pzgetimfiles
+pztool
+receivetool
 regtool
-guidetool
-chiptool
-camtool
+stacktool
+stamp-h1
 warptool
-difftool
-stacktool
-faketool
-dettool
-detselect
-pxdata.c
-magictool
-magicdstool
-caltool
-flatcorr
-pstamptool
-disttool
-receivetool
-
-pubtool