Changeset 30970

Timestamp:

Mar 18, 2011, 11:40:58 AM (15 years ago)

Author:

heather

Message:

these are the changes for addtool minidvodb verification - addtool is slightly
different than trunk because not all those changes had been merged up.

Location:

tags/ipp-20110218

Files:

• dbconfig/changes.txt (modified) (1 prop)
• dbconfig/minidvodb.md (modified) (1 diff, 1 prop)
• ippScripts/scripts/minidvodb_merge.pl (modified) (8 diffs, 1 prop)
• ippTools/src/addtool.c (modified) (6 diffs, 1 prop)
• ippTools/src/addtoolConfig.c (modified) (2 diffs, 1 prop)

tags/ipp-20110218/dbconfig/minidvodb.md

@@ -14 +14 @@
     dtime_resort    F32    0.0
     dtime_relphot   F32    0.0
+    dtime_verify    F32    0.0
     dtime_merge     F32    0.0
+    dtime_script    F32    0.0
     epoch           UTC    0001-01-01T00:00:00Z
     mergedvodb_path STR    255

tags/ipp-20110218/ippScripts/scripts/minidvodb_merge.pl

@@ -16 +16 @@
 my $dtime_relphot;
 my $dtime_merge;
+my $dtime_verify;
+my $dtime_script;
 
 use vars qw( $VERSION );
@@ -36 +38 @@
 my $relphot = can_run('relphot') or (warn "Can't find relphot" and $missing_tools = 1);
 my $relastro = can_run('relastro') or (warn "Can't find relastro" and $missing_tools = 1);
+my $dvoverify = can_run('dvoverify') or (warn "Can't find dvoverify" and $missing_tools = 1);
+
+
 if ($missing_tools) {
     warn("Can't find required tools.");
@@ -87 +92 @@
 unless ($no_op) {
     if (defined $mergedvodbReal) {
+
+        #this is chopped into several parts:  addstar, relphot, dvoverify, merge
+
+
+        #addstar
         {
             my $command  = "$addstar -resort";
@@ -105 +115 @@
             print "addstar -resort time $dtime_addstar\n";
         }
+
+        #relphot
 
         {
@@ -124 +136 @@
             print "relphot time $dtime_relphot\n";
         }
+        #dvoverify
+        {
+            my $command  = "$dvoverify -s $minidvodb";
+            print "$command\n";
+            my $mjd_dvoverify_start = DateTime->now->mjd;   # MJD of starting script
+
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                run(command => $command, verbose => $verbose);
+            unless ($success) {
+                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                &my_die("Unable to perform dvoverify: $error_code", $mergedvodb, $error_code);
+            }
+            $dtime_dvoverify = 86400.0*(DateTime->now->mjd - $mjd_dvoverify_start);   # MJD of starting script
+            print "dvoverify time $dtime_dvoverify\n";
+        }
+
+
+        #Merge
 
         my $this_is_the_first;
@@ -190 +220 @@
 
         {
+
+            $dtime_script = 86400.0*(DateTime->now->mjd - $mjd_start);
+
+
             my $command = "addtool -minidvodb_id $minidvodb_id";
             $command .= " -addminidvodbprocessed";
@@ -197 +231 @@
             $command .= " -dtime_resort $dtime_resort" if defined $dtime_resort;
             $command .= " -dtime_merge $dtime_merge" if defined $dtime_merge;
-            $command .= " -dbname $dbname" if defined $dbname;
+            $command .= " -dtime_script $dtime_script" if defined $dtime_script;
+            $command .= " -dtime_verify $dtime_dvoverify" if defined $dtime_dvoverify;
+            $command .= " -dbname $dbname" if defined $dbname;
             #print $command;
 
@@ -236 +272 @@
         $command .= " -dtime_resort $dtime_resort" if defined $dtime_resort;
         $command .= " -dtime_merge $dtime_merge" if defined $dtime_merge;
+    $command .= " -dtime_script $dtime_script" if defined $dtime_script;
+    $command .= " -dtime_verify $dtime_dvoverify" if defined $dtime_dvoverify;
         $command .= " -dbname $dbname" if defined $dbname;
 

tags/ipp-20110218/ippTools/src/addtool.c

@@ -1179 +1179 @@
   PXOPT_LOOKUP_F32(dtime_resort, config->args, "-dtime_resort", false, false);
   PXOPT_LOOKUP_F32(dtime_merge, config->args, "-dtime_merge", false, false);
+  PXOPT_LOOKUP_F32(dtime_verify, config->args, "-dtime_verify", false, false);
+  PXOPT_LOOKUP_F32(dtime_script, config->args, "-dtime_script", false, false);
+  
   PXOPT_LOOKUP_TIME(epoch, config->args, "-epoch", false, false);
   PXOPT_LOOKUP_S16(fault,         config->args, "-fault", false, false);
@@ -1230 +1233 @@
                dtime_resort,
                dtime_relphot,
+               dtime_verify,
                dtime_merge,
+               dtime_script,
                epoch,
                mergedvodb_path,
@@ -1293 +1298 @@
   psStringAppend(&query4, "update minidvodbProcessed set merge_order = %"PRIu64,m_order);
   psStringAppend(&query4," where minidvodb_id = %" PRIu64,  minidvodb_id);
-  printf("%s", query4);
+  //printf("%s", query4);
   if (!p_psDBRunQuery(config->dbh, query4)) {
     // rollback
@@ -1511 +1516 @@
   PXOPT_LOOKUP_F32(dtime_resort,  config->args, "-set_dtime_resort", false, false);
   PXOPT_LOOKUP_F32(dtime_merge,  config->args, "-set_dtime_merge", false, false);
-
+PXOPT_LOOKUP_F32(dtime_verify,  config->args, "-set_dtime_verify", false, false);
+PXOPT_LOOKUP_F32(dtime_script,  config->args, "-set_dtime_script", false, false);
   PXOPT_COPY_S64(config->args, where, "-minidvodb_id",     "minidvodbProcessed.minidvodb_id", "==");
   PXOPT_COPY_STR(config->args, where, "-minidvodb_name",     "minidvodbRun.minidvodb_name", "==");
@@ -1562 +1568 @@
     cnt++;
  }
+if (dtime_verify) {
+    if (cnt) {
+      psStringAppend(&query, "%s", comma);
+    }
+    psStringAppend(&query, " dtime_verify = %f", dtime_verify);
+    cnt++;
+ }
+if (dtime_script) {
+    if (cnt) {
+      psStringAppend(&query, "%s", comma);
+    }
+    psStringAppend(&query, " dtime_script = %f", dtime_script);
+    cnt++;
+ }
 
   psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
@@ -1567 +1587 @@
 
   if (!p_psDBRunQuery(config->dbh, query)) {
-   psError(PS_ERR_UNKNOWN, false, "database error");
+    psError(PS_ERR_UNKNOWN, false, "database error \n%s\n",query );
    psFree(query);
    return false;

tags/ipp-20110218/ippTools/src/addtoolConfig.c

@@ -195 +195 @@
     psMetadataAddF32(addminidvodbprocessedArgs, PS_LIST_TAIL, "-dtime_relphot",  0,    "define elapsed time for relphot (seconds)", NAN);
     psMetadataAddF32(addminidvodbprocessedArgs, PS_LIST_TAIL, "-dtime_resort", 0,    "define elapsed time for resort (seconds)", NAN);
+    psMetadataAddF32(addminidvodbprocessedArgs, PS_LIST_TAIL, "-dtime_verify",    0,    "define elapsed time for DVO verify (seconds)", NAN);
     psMetadataAddF32(addminidvodbprocessedArgs, PS_LIST_TAIL, "-dtime_merge",    0,    "define elapsed time for DVO merge (seconds)", NAN);
+    psMetadataAddF32(addminidvodbprocessedArgs, PS_LIST_TAIL, "-dtime_script",    0,    "define elapsed time for script (seconds)", NAN);
     psMetadataAddTime(addminidvodbprocessedArgs, PS_LIST_TAIL, "-epoch",         0,    "time merge is finished", NULL);
     psMetadataAddStr(addminidvodbprocessedArgs, PS_LIST_TAIL, "-mergedvodb_path",0,    "path of merged dvodb", NULL);
@@ -220 +222 @@
     psMetadataAddF32(updateminidvodbprocessedArgs, PS_LIST_TAIL, "-set_dtime_relphot",  0,    "define elapsed time for relphot (seconds)", 0);
     psMetadataAddF32(updateminidvodbprocessedArgs, PS_LIST_TAIL, "-set_dtime_resort", 0,    "define elapsed time for resort (seconds)", 0);
+    psMetadataAddF32(updateminidvodbprocessedArgs, PS_LIST_TAIL, "-set_dtime_verify",    0,    "define elapsed time for DVO verify (seconds)", 0);
     psMetadataAddF32(updateminidvodbprocessedArgs, PS_LIST_TAIL, "-set_dtime_merge",    0,    "define elapsed time for DVO merge (seconds)", 0);
-    
+    psMetadataAddF32(updateminidvodbprocessedArgs, PS_LIST_TAIL, "-set_dtime_script",    0,    "define elapsed time for script (seconds)", 0);
     psMetadata *argSets = psMetadataAlloc();
     psMetadata *modes = psMetadataAlloc();