Changeset 24557 for branches/eam_branches/20090522/ippScripts/scripts/ipp_serial_mops.pl

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

• . (modified) (1 prop)
• ippScripts/scripts/ipp_serial_mops.pl (modified) (7 diffs)

branches/eam_branches/20090522/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;
@@ -72 +72 @@
     die "Unable to connect to database: $DBI::errstr";
 
-my $where_label = defined $label ? "AND label = '$label'" : ""; # WHERE for label
+my $where_label = defined $label ? "AND diffRun.label = '$label'" : ""; # WHERE for label
 
 my $sql = "
 -- Get a list of exposures on which magic may be performed
 SELECT
-    exp_id,
+    rawExp.exp_id,
     MAX(diffWarps.diff_id) AS diff_id,
-    -- The following trick pulls out the 'inverse' value for the maximum diff_id
+    -- The following trick pulls out the appropriate values for the maximum diff_id
+    SUBSTRING_INDEX(GROUP_CONCAT(camProcessedTemplate.zpt_obs ORDER BY diffWarps.diff_id), ',', 1) AS zpt_obs,
+    SUBSTRING_INDEX(GROUP_CONCAT(rawTemplate.exp_time ORDER BY diffWarps.diff_id), ',', 1) AS exp_time,
     CONVERT(SUBSTRING_INDEX(GROUP_CONCAT(diffWarps.inverse ORDER BY diffWarps.diff_id), ',', 1), UNSIGNED) AS inverse
 FROM (
@@ -86 +88 @@
         diffRun.diff_id,
         warp1 AS warp_id,
+        warp1 AS template_warp,
         0 AS inverse
     FROM diffRun
@@ -98 +101 @@
         diffRun.diff_id,
         warp2 AS warp_id,
+        warp1 AS template_warp,
         1 AS inverse
     FROM diffRun
@@ -112 +116 @@
 JOIN chipRun USING(chip_id)
 JOIN rawExp USING(exp_id)
+JOIN warpRun AS warpTemplate ON warpTemplate.warp_id = diffWarps.template_warp
+JOIN fakeRun AS fakeTemplate ON fakeTemplate.fake_id = warpTemplate.fake_id
+JOIN camRun AS camTemplate ON camTemplate.cam_id = fakeTemplate.cam_id
+JOIN camProcessedExp AS camProcessedTemplate ON camProcessedTemplate.cam_id = camTemplate.cam_id
+JOIN chipRun AS chipTemplate ON chipTemplate.chip_id = camTemplate.chip_id
+JOIN rawExp AS rawTemplate ON rawTemplate.exp_id = chipTemplate.exp_id
 WHERE rawExp.camera = '$camera'
 GROUP BY exp_id;";
@@ -125 +135 @@
 foreach my $diff ( @$diffs ) {
     my $exp_id = $diff->{exp_id};
+    my $zp = $diff->{zpt_obs};
+    my $exp_time = $diff->{exp_time};
     my $diff_id = $diff->{diff_id};
     my $inverse = $diff->{inverse};
+
+    (carp "Bad ZP or EXPTIME for $exp_id" and next) if not defined $zp or not defined $exp_time;
+    $zp += 2.5 * log($exp_time) / log(10);
 
     my $sql = "SELECT * FROM diffSkyfile WHERE diff_id = $diff_id AND fault = 0 AND quality = 0;";
@@ -146 +161 @@
         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;