Changeset 38584 for trunk

Timestamp:

Jul 10, 2015, 11:52:20 AM (11 years ago)

Author:

heather

Message:

final tweaks for addstar multi mode

Location:

trunk

Files:

• ippScripts/scripts/addstar_multi_run.pl (modified) (2 diffs)
• ippScripts/scripts/minidvodb_createdb.pl (modified) (4 diffs)
• ippTasks/minidvodb.pro (modified) (3 diffs)

trunk/ippScripts/scripts/addstar_multi_run.pl

@@ -124 +124 @@
             run(command => $command, verbose => $verbose);
     &my_die( "Unable to get info on addRun", $stage_id,$stage, $label, $PS_EXIT_SYS_ERROR) unless $success;
-    if (scalar @$stdout_buf == 0 ) { #it lists nothing if it is the first
-        &my_die( "empty addRun", $stage_id,$stage,$label, $PS_EXIT_SYS_ERROR);
-        
+    if (scalar @$stdout_buf == 0 ) { 
+        #&my_die( "empty addRun", $stage_id,$stage,$label, $PS_EXIT_SYS_ERROR);
+        print "empty addRun, exiting... $stage,  $stage_id, $label\n";
+        exit 0;
     } else {
             my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
@@ -291 +292 @@
     carp($msg);
     if (defined $stage_id and not $no_update) {
-        my $command = "$addtool -stage_id $stage_id";
+        my $command = "$addtool -multiadd -stage_id $stage_id";
         $command .= " -addprocessedexp";
         $command .= " -fault $exit_code";

trunk/ippScripts/scripts/minidvodb_createdb.pl

@@ -39 +39 @@
 }
 
-my (  $outroot, $dbname, $dvodb, $minidvodb,$minidvodb_interval, $minidvodb_group, $camera,  $verbose, $no_update,
+my (  $outroot, $dbname, $dvodb, $minidvodb,$minidvodb_interval, $minidvodb_nums, $minidvodb_group, $camera,  $verbose, $no_update,
      $no_op, $redirect, $save_temps);
 GetOptions(
@@ -49 +49 @@
     'minidvodb|w=s'     => \$minidvodb, # output miniDVODB
     'interval|w=s'      => \$minidvodb_interval, #interval between creation of minidvodbs (default = 1day)
+    'num|w=s'      => \$minidvodb_nums, #interval between creation of minidvodbs (default = 500 addRuns)
     'verbose'           => \$verbose,   # Print to stdout
     'no-update'         => \$no_update, # Update the database?
@@ -111 +112 @@
     $minidvodb_interval = 1;
 }
+if (!defined $minidvodb_nums) {
+    $minidvodb_nums = 500
+}
 
 
@@ -207 +211 @@
 
 
-    if ($addRun_count > 500) {
+    if ($addRun_count > $minidvodb_nums) {
         #it's too big, create_new
         $create_new = 1;

trunk/ippTasks/minidvodb.pro

@@ -131 +131 @@
 ## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run.
 macro add.minidvodb
-  if ($0 != 6)
-    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (camera)"
+  if ($0 != 7)
+    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera)"
     break
   end
@@ -159 +159 @@
   book setword MINIDVODB_CREATE $1 DVODB $3
   book setword MINIDVODB_CREATE $1 DVODB_DAYS $4
-  book setword MINIDVODB_CREATE $1 CAMERA $5  
+  book setword MINIDVODB_CREATE $1 DVODB_NUM $5
+  book setword MINIDVODB_CREATE $1 CAMERA $6  
   book setword MINIDVODB_CREATE $1 STATE PENDING  
 end
@@ -549 +550 @@
     book getword MINIDVODB_CREATE $minidvodb_group DVODB -var dvodb 
     book getword MINIDVODB_CREATE $minidvodb_group DVODB_DAYS -var dvodb_days
+    book getword MINIDVODB_CREATE $minidvodb_group DVODB_NUM -var dvodb_num
     book getword MINIDVODB_CREATE $minidvodb_group CAMERA -var camera
-    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days
+    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num
  
     if ($DB:n == 0)