Changeset 16049

Timestamp:

Jan 8, 2008, 4:14:22 PM (18 years ago)

Author:

jhoblitt

Message:

add tess_id & end_stage to chip/cam/warp

Location:

branches/end_stage/ippTools

Files:

• share/camtool_queue_chip_id.sql (modified) (1 diff)
• share/chiptool_completely_processed_exp.sql (modified) (1 diff)
• src/camtool.c (modified) (2 diffs)
• src/camtoolConfig.c (modified) (1 diff)
• src/chiptool.c (modified) (3 diffs)
• src/flatcorr.c (modified) (2 diffs)
• src/pxcam.c (modified) (2 diffs)
• src/pxcam.h (modified) (1 diff)
• src/pxchip.c (modified) (2 diffs)
• src/pxchip.h (modified) (1 diff)
• src/regtool.c (modified) (3 diffs)
• src/regtoolConfig.c (modified) (1 diff)
• src/warptool.c (modified) (3 diffs)
• src/warptoolConfig.c (modified) (1 diff)

branches/end_stage/ippTools/share/camtool_queue_chip_id.sql

@@ -11 +11 @@
         '%s',           -- reduction
         '%s',           -- expgroup
-        '%s'            -- dvodb 
+        '%s',           -- dvodb 
+        '%s',           -- tess_id
+        '%s'            -- end_stage
     FROM chipRun
     WHERE

branches/end_stage/ippTools/share/chiptool_completely_processed_exp.sql

@@ -9 +9 @@
     reduction,
     expgroup,
-    dvodb
+    dvodb,
+    tess_id,
+    end_stage
 FROM
     (SELECT 

branches/end_stage/ippTools/src/camtool.c

@@ -240 +240 @@
     }
 
+    psString tess_id = psMetadataLookupStr(&status, config->args, "-set_tess_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_tess_id");
+        return false;
+    }
+
+    psString end_stage = psMetadataLookupStr(&status, config->args, "-set_end_stage");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_end_stage");
+        return false;
+    }
+
     // find the exp_id of all the exposures that we want to queue up.
     psString query = pxDataGet("camtool_find_chip_id.sql");
@@ -303 +315 @@
                     reduction      ? reduction    : row->reduction,
                     expgroup    ? expgroup  : row->expgroup,
-                    dvodb       ? dvodb     : row->dvodb
+                    dvodb       ? dvodb     : row->dvodb,
+                    tess_id     ? tess_id   : row->tess_id,
+                    end_stage   ? end_stage : row->end_stage
         )) {
             if (!psDBRollback(config->dbh)) {

branches/end_stage/ippTools/src/camtoolConfig.c

@@ -138 +138 @@
     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb",  0,
             "define DVO db", NULL);
+    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_tess_id",  0,
+            "define tess ID", NULL);
+    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_end_stage",  0,
+            "define end stage", NULL);
 
     // -pendingexp

branches/end_stage/ippTools/src/chiptool.c

@@ -228 +228 @@
     }
 
+    psString tess_id = psMetadataLookupStr(&status, config->args, "-set_tess_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_tess_id");
+        return false;
+    }
+
+    psString end_stage = psMetadataLookupStr(&status, config->args, "-set_end_stage");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_end_stage");
+        return false;
+    }
+
     // find the exp_id of all the exposures that we want to queue up.
     psString query = pxDataGet("chiptool_find_rawexp.sql");
@@ -280 +292 @@
 
         // queue the exp
-        if (!pxchipQueueByExpTag(config, exp_id, workdir, label, reduction, expgroup, dvodb)) {
+        if (!pxchipQueueByExpTag(config, exp_id, workdir, label, reduction, expgroup, dvodb, tess_id, end_stage)) {
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -918 +930 @@
                     chipRun->reduction,
                     chipRun->expgroup,
-                    chipRun->dvodb
+                    chipRun->dvodb,
+                    chipRun->tess_id,
+                    chipRun->end_stage
         )) {
             // rollback

branches/end_stage/ippTools/src/flatcorr.c

@@ -219 +219 @@
     }
 
+    psString tess_id = psMetadataLookupStr(&status, config->args, "-set_tess_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_tess_id");
+        return false;
+    }
+
+    psString end_stage = psMetadataLookupStr(&status, config->args, "-set_end_stage");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_end_stage");
+        return false;
+    }
+
     // find the exp_id of all the exposures that we want to queue up.
     psString query = pxDataGet("chiptool_find_rawexp.sql");
@@ -293 +305 @@
 
         // queue the exp
-        psS64 chip_id = pxchipQueueByExpTag(config, exp_id, workdir, label, reduction, expgroup, dvodb);
+        psS64 chip_id = pxchipQueueByExpTag(config, exp_id, workdir, label, reduction, expgroup, dvodb, tess_id, end_stage);
         if (!chip_id) {
             if (!psDBRollback(config->dbh)) {

branches/end_stage/ippTools/src/pxcam.c

@@ -58 +58 @@
 bool pxcamQueueByChipID(pxConfig *config,
                     psS64 chip_id,
-                    psString workdir,
-                    psString label,
-                    psString recipe,
-                    psString expgroup,
-                    psString dvodb)
+                    char *workdir,
+                    char *label,
+                    char *recipe,
+                    char *expgroup,
+                    char *dvodb,
+                    char *tess_id,
+                    char *end_stage)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -88 +90 @@
                 expgroup ? expgroup : "NULL",
                 dvodb    ? dvodb    : "NULL",
+                tess_id  ? tess_id  : "NULL",
+                end_stage ? end_stage : "NULL",
                 (long long)chip_id
     )) {

branches/end_stage/ippTools/src/pxcam.h

@@ -29 +29 @@
 bool pxcamQueueByChipID(pxConfig *config,
                         psS64 chip_id,
-                        psString workdir,
-                        psString label,
-                        psString recipe,
-                        psString expgroup,
-                        psString dvodb);
+                        char *workdir,
+                        char *label,
+                        char *recipe,
+                        char *expgroup,
+                        char *dvodb,
+                        char *tess_id,
+                        char *end_stage);
 
 #endif // PXCAM_H

branches/end_stage/ippTools/src/pxchip.c

@@ -58 +58 @@
 psS64 pxchipQueueByExpTag(pxConfig *config,
                          psS64 exp_id,
-                         psString workdir,
-                         psString label,
-                         psString reduction,
-                         psString expgroup,
-                         psString dvodb)
+                         char *workdir,
+                         char *label,
+                         char *reduction,
+                         char *expgroup,
+                         char *dvodb,
+                         char *tess_id,
+                         char *end_stage)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -76 +78 @@
             reduction,
             expgroup,
-            dvodb)
+            dvodb,
+            tess_id,
+            end_stage)
     ) {
         psError(PS_ERR_UNKNOWN, false, "database error");

branches/end_stage/ippTools/src/pxchip.h

@@ -29 +29 @@
 psS64 pxchipQueueByExpTag(pxConfig *config,
                          psS64 exp_id,
-                         psString workdir,
-                         psString label,
-                         psString reduction,
-                         psString expgroup,
-                         psString dvodb);
+                         char *workdir,
+                         char *label,
+                         char *reduction,
+                         char *expgroup,
+                         char *dvodb,
+                         char *tess_id,
+                         char *end_stage);
 
 #endif // PXCHIP_H

branches/end_stage/ippTools/src/regtool.c

@@ -838 +838 @@
     }
 
+    psString dvodb = psMetadataLookupStr(&status, config->args, "-dvodb");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -dvodb");
+        return false;
+    }
+
+    psString tess_id = psMetadataLookupStr(&status, config->args, "-tess_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tess_id");
+        return false;
+    }
+
+    psString end_stage = psMetadataLookupStr(&status, config->args, "-end_stage");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -end_stage");
+        return false;
+    }
+
     psString query = pxDataGet("regtool_pendingexp.sql");
     if (!query) {
@@ -847 +865 @@
         // build a query to search by exp_id
         psMetadata *where = psMetadataAlloc();
-        bool status = false;
-        psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
-        if (!status) {
-            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
-            psFree(query);
-            return false;
-        }
         if (exp_id) {
             if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", 0, "==", exp_id)) {
@@ -975 +986 @@
                     rawExp->reduction,
                     NULL, // expgroup
-                    NULL  // dvodb
+                    dvodb,
+                    tess_id,
+                    end_stage
         )) {
             // rollback

branches/end_stage/ippTools/src/regtoolConfig.c

@@ -234 +234 @@
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-workdir",  0,
         "define the \"default\" workdir for this exposure", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dvodb",  0,
+        "define the dvodb for the next processing step", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-tess_id",  0,
+        "define the tess_id for the next processing step", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-end_stage",  0,
+        "define the end goal processing step", NULL);
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-reduction",  0,
         "define the \"default\" reduction class for this exposure", NULL);

branches/end_stage/ippTools/src/warptool.c

@@ -134 +134 @@
     }
 
+    psString dvodb = psMetadataLookupStr(&status, config->args, "-dvodb");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -dvodb");
+        return false;
+    }
+
+    psString tess_id = psMetadataLookupStr(&status, config->args, "-tess_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tess_id");
+        return false;
+    }
+
+    psString end_stage = psMetadataLookupStr(&status, config->args, "-end_stage");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -end_stage");
+        return false;
+    }
+
     psTime *registered = NULL;
     {
@@ -154 +172 @@
             "reg",      // state
             workdir,
-            NULL,       // dvodb
+            "dirty",    // workdir_state
+            dvodb,
+            tess_id,
+            end_stage,
             registered
     );
@@ -1071 +1092 @@
         "       USING(warp_id)\n"
         "   LEFT JOIN warpSkyfile\n"
-        "       USING(warp_id, skycell_id, tess_id)\n"
+        "       USING(warp_id, skycell_id)\n"
         "   WHERE\n"
         "       warpRun.state = 'run'\n"

branches/end_stage/ippTools/src/warptoolConfig.c

@@ -55 +55 @@
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0,
             "define workdir (required)", NULL);
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0,
+            "define dvodb", NULL);
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0,
+            "define tess_id", NULL);
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-end_stage", 0,
+            "define end stage", NULL);
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-registered",  0,
             "time detrend run was registered", now);