Changeset 42712 for trunk/ippScripts

Timestamp:

Jul 18, 2024, 2:55:58 PM (2 years ago)

Author:

cclin33

Message:

fix mis-match mosaic issue when running addstar, optimize addstar program

Location:

trunk/ippScripts/scripts

Files:

• addstar_run.pl (modified) (7 diffs)
• minidvodb_premerge.pl (modified) (2 diffs)

trunk/ippScripts/scripts/addstar_run.pl

@@ -45 +45 @@
 
 my ( $add_id, $camera, $stage, $stage_id, $stage_extra1, $outroot, $stageroot, $dbname, $reduction,
-     $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $minidvodb_host, $image_only, $verbose,
-     $no_update, $no_op, $redirect, $save_temps, $dvodbhost);
+     $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $image_only, $verbose,
+     $no_update, $no_op, $redirect, $save_temps, $addrun_host);
 GetOptions(
     'add_id=s'          => \$add_id, # Camtool identifier
@@ -67 +67 @@
     'redirect-output'   => \$redirect,
     'save-temps'        => \$save_temps, # Save temporary files?
-    'dvodbhost|w=s' => \$dvodbhost, # miniDVO database group
+    'addrun_host|w=s' => \$addrun_host, # miniDVO database host
     ) or pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-          -msg => "Required options: --add_id --camera --outroot --dvodb --stageroot --stage --dbname --dvodbhost",
+          -msg => "Required options: --add_id --camera --outroot --dvodb --stageroot --stage --dbname --addrun_host",
           -exitval => 3,
           ) unless
@@ -81 +81 @@
     defined $dvodb and
     defined $dbname and
-    defined $dvodbhost and
+    defined $addrun_host and
     defined $camera;
 if ($stage =~ /cam/ && !defined $stage_id) {
@@ -300 +300 @@
         $minidvodb_path = $comp->{minidvodb_path};
         $minidvodb_name = $comp->{minidvodb_name};
-        $minidvodb_host = $comp->{minidvodb_host};
+        $addrun_host = $comp->{addrun_host};
 
         if (!defined($minidvodb_path)) {
@@ -350 +350 @@
                 # require a defined output dvo database to run addstar (ie, refuse to use the .ptolemyrc default)
                 $command  = "$addstar -update"; # XXX optionally set -update?
+                $command .= " -force-single-time"; # IPP-676 time difference for chips causes dvo mosaic issue
                 $command .= " -D CAMERA $camdir";
                 $command .= " -D CATDIR $minidvodb_path";
@@ -426 +427 @@
 $fpaCommand .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path;
 $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
-$fpaCommand .= " -minidvodb_host $dvodbhost" if defined $dvodbhost;
+$fpaCommand .= " -addrun_host $addrun_host" if defined $addrun_host;
 $fpaCommand .= " -dbname $dbname" if defined $dbname;
 
@@ -464 +465 @@
         $command .= (" -dtime_addstar " . ((DateTime->now->mjd - $mjd_start) * 86400));
         $command .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name; # dont think we want it recorded (not sure)
-        $command .= " -minidvodb_host $dvodbhost" if defined $dvodbhost; # dont think we want it recorded (not sure)
+        $command .= " -addrun_host $addrun_host" if defined $addrun_host; 
         $command .= " -stage_extra1 $stage_extra1" if defined $stage_extra1;
         $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/minidvodb_premerge.pl

@@ -47 +47 @@
 }
 
-my ( $minidvodb, $minidvodb_id, $minidvodb_group, $camera, $dbname,$verbose, $logfile, $no_op, $redirect, $save_temps);
+my ( $minidvodb, $minidvodb_id, $minidvodb_group, $minidvodb_host, $camera, $dbname,$verbose, $logfile, $no_op, $redirect, $save_temps);
 GetOptions(
-    'minidvodb|w=s'     => \$minidvodb, #minidvodb database
-    'minidvodb_id|w=s'  => \$minidvodb_id, #minidvodb_id
-    'minidvodb_group|w=s'  => \$minidvodb_group, #minidvodb_id
-    'camera|c=s'        => \$camera, # Camera
-    'dbname|d=s'        => \$dbname, # Database name
-    'verbose'           => \$verbose,   # Print to stdout
-    'no-op'             => \$no_op, # Don't do any operations?
-    'logfile=s'         => \$logfile,
-    'save-temps'        => \$save_temps, # Save temporary files?
+    'minidvodb|w=s'        => \$minidvodb, #minidvodb database
+    'minidvodb_id|w=s'     => \$minidvodb_id, #minidvodb_id
+    'minidvodb_group|w=s'  => \$minidvodb_group, #minidvodb_group
+    'minidvodb_host|w=s'   => \$minidvodb_host, #minidvodb_host
+    'camera|c=s'           => \$camera, # Camera
+    'dbname|d=s'           => \$dbname, # Database name
+    'verbose'              => \$verbose,   # Print to stdout
+    'no-op'                => \$no_op, # Don't do any operations?
+    'logfile=s'            => \$logfile,
+    'save-temps'           => \$save_temps, # Save temporary files?
     ) or pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-          -msg => "Required options: --minidvodb --minidvodb_id -- minidvodb_group --camera",
+          -msg => "Required options: --minidvodb --minidvodb_id --minidvodb_group --minidvodb_host --camera ",
           -exitval => 3,
           ) unless
@@ -68 +69 @@
     defined $minidvodb_id and
     defined $minidvodb_group and
+    defined $minidvodb_host and
     defined $camera;