Changeset 28096 for trunk/ippTools

Timestamp:

May 25, 2010, 3:05:00 PM (16 years ago)

Author:

eugene

Message:

more work on the staticsky interactions

Location:

trunk/ippTools

Files:

• share/pxadmin_create_tables.sql (modified) (1 diff)
• share/staticskytool_inputs.sql (modified) (1 diff)
• src/staticskytool.c (modified) (3 diffs)
• src/staticskytoolConfig.c (modified) (1 diff)

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1650 +1650 @@
       dtime_script FLOAT,              -- elapsed time for script
       sources INT,                     -- number of sources
+      num_inputs INT,                  -- number of input images
       hostname VARCHAR(64) NOT NULL,   -- host that executed script
       good_frac FLOAT,                 -- good fraction of skycell

trunk/ippTools/share/staticskytool_inputs.sql

@@ -1 +1 @@
 SELECT
   staticskyRun.*,
+  staticskyInput.stack_id,
   stackSumSkyfile.path_base
 FROM staticskyRun

trunk/ippTools/src/staticskytool.c

@@ -511 +511 @@
     // required
     PXOPT_LOOKUP_S64(sky_id, config->args, "-sky_id", true, false);
-    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
 
     // optional
@@ -520 +519 @@
     PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
     PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false);
+    PXOPT_LOOKUP_S32(num_inputs, config->args, "-num_inputs", false, false);
 
     // default values
@@ -533 +533 @@
     if (!staticskyResultInsert(config->dbh,
                                sky_id,
-                               stack_id,
                                path_base,
                                dtime_phot,
                                dtime_script,
                                sources,
+                               num_inputs,
                                hostname,
                                good_frac,

trunk/ippTools/src/staticskytoolConfig.c

@@ -90 +90 @@
     psMetadata *addresultArgs = psMetadataAlloc();
     psMetadataAddS64(addresultArgs, PS_LIST_TAIL, "-sky_id", 0, "define sky ID (required)", 0);
-    psMetadataAddS64(addresultArgs, PS_LIST_TAIL, "-stack_id", 0, "define stack ID (required)", 0);
     psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", 0);
     psMetadataAddF32(addresultArgs, PS_LIST_TAIL, "-dtime_phot", 0, "define photometry time", NAN);
     psMetadataAddF32(addresultArgs, PS_LIST_TAIL, "-dtime_script", 0, "define elapsed time in script (seconds)", NAN);
     psMetadataAddS32(addresultArgs, PS_LIST_TAIL, "-sources", 0, "number of sources", 0);
+    psMetadataAddS32(addresultArgs, PS_LIST_TAIL, "-num_inputs", 0, "number of inputs", 0);
     psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-hostname", 0, "define hostname", 0);
     psMetadataAddF32(addresultArgs, PS_LIST_TAIL, "-good_frac", 0, "define fraction of good pixels", NAN);