Changeset 39224 for branches/eam_branches/ipp-20151113/ippScripts/scripts/addstar_multi_run.pl

Timestamp:

Dec 3, 2015, 4:14:24 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

• . (modified) (1 prop)
• ippScripts/scripts/addstar_multi_run.pl (modified) (4 diffs)

branches/eam_branches/ipp-20151113/ippScripts/scripts/addstar_multi_run.pl

@@ -39 +39 @@
 my $minidvodb_path;
 
-my ( $label,$camera, $stage, $stage_id, $outroot, $stageroot, $dbname, $reduction, $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $image_only, $verbose, $no_update,
+my ( $label,$camera, $stage, $stage_id, $use_diff_inv, $outroot, $stageroot, $dbname, $reduction, $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $image_only, $verbose, $no_update,
      $no_op, $redirect, $save_temps);
 GetOptions(
@@ -46 +46 @@
     'stage|s=s'        => \$stage, # Camera
     'stage_id|w=s'   => \$stage_id,
+    'use_diff_inv'   => \$use_diff_inv, #use inv images for diff cmf? 
     'dbname|d=s'        => \$dbname, # Database name
     'outroot|w=s'       => \$outroot, # output file base name
@@ -137 +138 @@
             print "there are $num_components\n";
             foreach my $comp  (@$components) {
-            my  $mparsed = $comp->{stageroot};
+                my  $mparsed = $comp->{stageroot};
             
-            if (!defined($mparsed)) {
-                &my_die("Unable to parse stageroot", $stage_id,$stage,$label, $PS_EXIT_PROG_ERROR);
-            } #but just to make sure, have it grab a minidvodb_name, to make sure it's not junk.
-            print "found a value for stageroot:$mparsed\n";
-            my $fpaObjects = $mparsed.'.cmf';
-            my $realFile = $ipprc->file_resolve($fpaObjects);
-            if (!defined($realFile)) {
-                &my_die("unable to resolve real file from $mparsed",$stage_id, $stage, $label, 7);
+                if (!defined($mparsed)) {
+                    &my_die("Unable to parse stageroot", $stage_id,$stage,$label, $PS_EXIT_PROG_ERROR);
+                } #but just to make sure, have it grab a minidvodb_name, to make sure it's not junk.
+                print "found a value for stageroot:$mparsed\n";
+                my $fpaObjects = $mparsed.'.cmf';
+                my $realFile = $ipprc->file_resolve($fpaObjects);
+                if (!defined($realFile)) {
+                    &my_die("unable to resolve real file from $mparsed",$stage_id, $stage, $label, 7);
+                }
+                printf TEMPLIST "$realFile = $fpaObjects\n";
+                if ($stage =~ /diff/) { # hardwired  for now$use_diff_inv) {
+                    print "finding the inv.cmf files\n";
+                    my $fpaObjectsInv = $mparsed.'.inv.cmf';
+                    my $realFileInv = $ipprc->file_resolve($fpaObjectsInv);
+                    if (!defined($realFileInv)) {
+                        &my_die("unable to resolve real file from $mparsed",$stage_id, $stage, $label, 7);
+                    }
+                    printf TEMPLIST "$realFileInv = $fpaObjectsInv\n";
+                }
+                
             }
-            printf TEMPLIST "$realFile = $fpaObjects\n";
-            }
-    }
-
-}
-
+
+    }
+}
 close(TEMPLIST);
 print "saved $temp_file here\n";
@@ -238 +248 @@
             if ($stage =~ /diff/) {
                 $command .= " -accept-astrom";
+                if ($use_diff_inv) {
+                    $command .= " -diff-inv";
+                }
             }
+            
             if ($stage =~ /fullforce/) {
                 $command .= " -accept-astrom -xrad";