Changeset 12422

Timestamp:

Mar 12, 2007, 5:26:20 PM (19 years ago)

Author:

jhoblitt

Message:

add detRun.filelevel

Location:

trunk/ippTools

Files:

• configure.ac (modified) (2 diffs)
• scripts/dettest.sh (modified) (1 diff)
• share/detselect_search.sql (modified) (1 diff)
• src/dettool.c (modified) (7 diffs)
• src/dettoolConfig.c (modified) (4 diffs)

trunk/ippTools/configure.ac

@@ -1 +1 @@
 AC_PREREQ(2.59)
 
-AC_INIT([ipptools], [1.1.17], [ipp-support@ifa.hawaii.edu])
+AC_INIT([ipptools], [1.1.18], [ipp-support@ifa.hawaii.edu])
 AC_CONFIG_SRCDIR([autogen.sh])
 
@@ -18 +18 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.1.0])
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0])
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.17]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.18]) 
 
 PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}"

trunk/ippTools/scripts/dettest.sh

@@ -7 +7 @@
 ./regtest.sh -detrend || exit 1
 
-det_id=`dettool -definebyquery -det_type flat -exp_type fooflat -filter foo -airmass_min 1 -airmass_max 10 -exp_time_min 10 -exp_time_max 30.0 -workdir file::///some/path -simple | cut -f1 -d" "` || exit 1
+det_id=`dettool -definebyquery -det_type bias -filelevel fpa -select_exp_type bias -airmass_min 1 -airmass_max 10 -exp_time_min 10 -exp_time_max 30.0 -workdir file::///some/path -simple | cut -f1 -d" "` || exit 1
 
 dettool -raw || exit 1

trunk/ippTools/share/detselect_search.sql

@@ -2 +2 @@
     detRunSummary.det_id,
     detRunSummary.iteration,
-    rawExp.filelevel
+    detRun.filelevel
 FROM detRun
 JOIN detRunSummary

trunk/ippTools/src/dettool.c

@@ -242 +242 @@
     }
 
+    psString filelevel = psMetadataLookupStr(&status, config->args, "-filelevel");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filelevel");
+        return false;
+    }
+    if (!filelevel) {
+        psError(PS_ERR_UNKNOWN, true, "-filelevel is required");
+        return false;
+    }
+
     psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
     if (!status) {
@@ -509 +519 @@
             mode,
             "run",
+            filelevel,
             workdir,
             camera,
@@ -661 +672 @@
     }
 
+    psString filelevel = psMetadataLookupStr(&status, config->args, "-filelevel");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filelevel");
+        return false;
+    }
+    if (!filelevel) {
+        psError(PS_ERR_UNKNOWN, true, "-filelevel is required");
+        return false;
+    }
+
     psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
     if (!status) {
@@ -1162 +1183 @@
             mode,
             "run",  // state
+            filelevel,
             workdir,
             camera,
@@ -1367 +1389 @@
         psFree(detRun->exp_type);
         detRun->exp_type = psStringCopy(exp_type);
+    }
+
+    psString filelevel = psMetadataLookupStr(&status, config->args, "-set_filelevel");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_filelevel");
+        return false;
+    }
+    if (filelevel) {
+        psFree(detRun->filelevel);
+        detRun->filelevel = psStringCopy(filelevel);
+    }
+
+    psString workdir = psMetadataLookupStr(&status, config->args, "-set_workdir");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_workdir");
+        return false;
+    }
+    if (workdir) {
+        psFree(detRun->workdir);
+        detRun->workdir = psStringCopy(workdir);
     }
 
@@ -6103 +6145 @@
     }
 
+    psString filelevel = psMetadataLookupStr(&status, config->args, "-filelevel");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filelevel");
+        return false;
+    }
+    if (!filelevel) {
+        psError(PS_ERR_UNKNOWN, true, "-filelevel is required");
+        return false;
+    }
+
     psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
     if (!status) {
@@ -6313 +6365 @@
             mode,
             "reg",      // state
+            filelevel,
             workdir,
             camera,

trunk/ippTools/src/dettoolConfig.c

@@ -72 +72 @@
     psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-mode",  0,
             "define the mode of this detrend run", "master");
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-filelevel",  0,
+            "define filelevel (required)", NULL);
     psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-workdir",  0,
             "define workdir (required)", NULL);
@@ -119 +121 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-mode",  0,
             "define the mode of this detrend run", "master");
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filelevel",  0,
+            "define filelevel (required)", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir",  0,
             "define workdir (required)", NULL);
@@ -200 +204 @@
     psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_type",  0,
             "define exposure type", NULL);
+    psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_filelevel",  0,
+            "define filelevel", NULL);
     psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_workdir",  0,
             "define workdir", NULL);
@@ -706 +712 @@
     psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-mode",  0,
             "define the mode of this detrend run", "master");
+    psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-filelvel",  0,
+            "define filelevel (required)", NULL);
     psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-workdir",  0,
             "define workdir (required)", NULL);