Changeset 24252 for trunk/ippScripts/scripts/ipp_serial_mops.pl

Timestamp:

May 26, 2009, 4:43:29 PM (17 years ago)

Author:

Paul Price

Message:

Use new binary to do translation.

File:

• trunk/ippScripts/scripts/ipp_serial_mops.pl (modified) (5 diffs)

trunk/ippScripts/scripts/ipp_serial_mops.pl

@@ -19 +19 @@
 # Look for programs we need
 my $missing_tools;
-my $mops = can_run('ipp_mops_translate.pl') or (warn "Can't find ipp_mops_translate.pl" and $missing_tools = 1);
+my $ppmops = can_run('ppMops') or (warn "Can't find ppMops" and $missing_tools = 1);
 my $dsreg = can_run('dsreg') or (warn "Can't find dsreg" and $missing_tools = 1);
 die "Can't find required tools.\n" if $missing_tools;
@@ -77 +77 @@
 -- Get a list of exposures on which magic may be performed
 SELECT
-    exp_id,
+    rawExp.exp_id,
+    camProcessedExp.zp_obs,
     MAX(diffWarps.diff_id) AS diff_id,
     -- The following trick pulls out the 'inverse' value for the maximum diff_id
@@ -110 +111 @@
 JOIN fakeRun USING(fake_id)
 JOIN camRun USING(cam_id)
+JOIN camProcessedExp USING(cam_id)
 JOIN chipRun USING(chip_id)
 JOIN rawExp USING(exp_id)
@@ -125 +127 @@
 foreach my $diff ( @$diffs ) {
     my $exp_id = $diff->{exp_id};
+    my $zp = $diff->{zp_obs};
     my $diff_id = $diff->{diff_id};
     my $inverse = $diff->{inverse};
@@ -146 +149 @@
         unless ($no_op) {
             $ipprc->file_prepare($output);
-            my $command = "$mops --input $input --extname SkyChip.psf --output $output";
+            my $command = "$ppmops $input $zp $output";
             my $success = run( command => $command, verbose => $verbose );
             (carp "Couldn't translate $input\n" and next) unless $success;