Changeset 14091

Timestamp:

Jul 9, 2007, 3:17:14 PM (19 years ago)

Author:

jhoblitt

Message:

• fix inhere. workdir rawExp to chipRun
• add option to supply workdir to addprocessedexp
• add 'reduction' to newExp and rawExp
• add inherit reduction from newexp -> rawExp and rawExp -> chipRun

Location:

trunk/ippTools

Files:

• scripts/regtest.sh (modified) (2 diffs)
• share/regtool_pendingexp.sql (modified) (1 diff)
• src/pxchip.c (modified) (1 diff)
• src/pxchip.h (modified) (1 diff)
• src/pxinject.c (modified) (2 diffs)
• src/pxinjectConfig.c (modified) (1 diff)
• src/regtool.c (modified) (7 diffs)
• src/regtoolConfig.c (modified) (1 diff)

trunk/ippTools/scripts/regtest.sh

@@ -8 +8 @@
 echo -e "YES\nipp\n\n" | pxadmin -recreate || exit 1
 
-exp_id1=`$inject -newExp -tmp_exp_name t10 -tmp_inst gpc -tmp_telescope ps1 -workdir file::///some/path -simple` || exit 1
+exp_id1=`$inject -newExp -tmp_exp_name t10 -tmp_inst gpc -tmp_telescope ps1 -workdir file::///some/path -reduction batman -simple` || exit 1
 
 for ID in `seq 0 3`; do
@@ -16 +16 @@
 $inject -updatenewExp -exp_id $exp_id1 -state run
 
-exp_id2=`$inject -newExp -tmp_exp_name t11 -tmp_inst gpc -tmp_telescope ps1 -workdir file::///some/path -simple` || exit 1
+exp_id2=`$inject -newExp -tmp_exp_name t11 -tmp_inst gpc -tmp_telescope ps1 -workdir file::///some/path -reduction robin -simple` || exit 1
 
 for ID in `seq 0 3`; do

trunk/ippTools/share/regtool_pendingexp.sql

@@ -1 @@
-SELECT DISTINCT * FROM
+-- output should match the format of newExp
+SELECT DISTINCT
+    exp_id,
+    tmp_exp_name,
+    tmp_camera,
+    tmp_telescope,
+    state,
+    workdir,
+    workdir_state,
+    reduction
+FROM
     (SELECT
        newExp.*,

trunk/ippTools/src/pxchip.c

@@ -74 +74 @@
     // create a chipRun
     if (!chipRunInsert(config->dbh,
-            0x0,
+            0x0, // chip_id
             (psS64)atoll(exp_id),
             "run",      // state                

trunk/ippTools/src/pxchip.h

@@ -31 +31 @@
                          psString workdir,
                          psString label,
-                         psString recipe,
+                         psString reduction,
                          psString expgroup,
                          psString dvodb);

trunk/ippTools/src/pxinject.c

@@ -115 +115 @@
     if (!workdir) {
         psError(PS_ERR_UNKNOWN, true, "-workdir is required");
+        return false;
+    }
+
+    psString reduction = psMetadataLookupStr(&status, config->args, "-reduction");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -reduction");
+        return false;
+    }
+    if (!reduction) {
+        psError(PS_ERR_UNKNOWN, true, "-reduction is required");
         return false;
     }
@@ -125 +135 @@
                 "reg", // state
                 workdir,
-                "dirty"
+                "dirty",
+                reduction
             )
         ) {

trunk/ippTools/src/pxinjectConfig.c

@@ -53 +53 @@
     psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-workdir",  0,
             "define workdir (required)", 0);
+    psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-reduction",  0,
+            "define reduction class (required)", 0);
     psMetadataAddBool(newExpArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);

trunk/ippTools/src/regtool.c

@@ -629 +629 @@
             return false;
         }
-        psFree(rawExp);
 
         // if this is a detrend image don't put it in the chip queue (and we're
@@ -641 +640 @@
                 }
                 psError(PS_ERR_UNKNOWN, false, "failed to change newExp.state for exp_id: %s", exp_id);
+                psFree(rawExp);
                 psFree(output);
                 return false;
@@ -655 +655 @@
             }
             psError(PS_ERR_UNKNOWN, false, "failed to change newExp.state for exp_id: %s", exp_id);
+            psFree(rawExp);
             psFree(output);
             return false;
@@ -661 +662 @@
         // insert an entry into the chipPendingExp table
         // this can only be run as the newExp's state has been set to stop
-        if (!pxchipQueueByExpTag(config, exp_id, NULL, NULL, NULL, NULL, NULL)) {
+        if (!pxchipQueueByExpTag(config,
+                    exp_id, // exp_id is the string version, rawExp->exp_id isa int
+                    rawExp->workdir,
+                    NULL, // label
+                    rawExp->reduction,
+                    NULL, // expgroup
+                    NULL  // dvodb
+        )) {
             // rollback
             if (!psDBRollback(config->dbh)) {
@@ -667 +675 @@
             }
             psError(PS_ERR_UNKNOWN, false, "failed to queue chipPendingExp");
+            psFree(rawExp);
             psFree(output);
             return false;
         }
+        psFree(rawExp);
     }
     psFree(output);
@@ -924 +934 @@
     }
 
+    psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
+        return false;
+    }
+
+    psString reduction = psMetadataLookupStr(&status, config->args, "-reduction");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -reduction");
+        return false;
+    }
+
     psString filter = psMetadataLookupStr(&status, config->args, "-filter");
     if (!status) {
@@ -1065 +1087 @@
         exp_type,
         filelevel,
-        exp->workdir,
+        workdir ? workdir : exp->workdir,
+        reduction ? reduction : exp->reduction,
         filter,
         airmass,

trunk/ippTools/src/regtoolConfig.c

@@ -176 +176 @@
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filelevel",  0,
         "define the data partitioning level of this file", NULL);
-    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-workdir",  0,
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-workdir",  0,
         "define the \"default\" workdir for this exposure", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-reduction",  0,
+        "define the \"default\" reduction class for this exposure", NULL);
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filter",  0,
         "define filter ", NULL);