Changeset 24191

Timestamp:

May 14, 2009, 5:01:49 PM (17 years ago)

Author:

Paul Price

Message:

Fixing bugs found when testing.

Location:

trunk/ippScripts/scripts

Files:

• ipp_mops_translate.pl (modified) (2 diffs)
• ipp_serial_mops.pl (modified) (4 diffs)

trunk/ippScripts/scripts/ipp_mops_translate.pl

@@ -78 +78 @@
 check_fitsio($status);
 
-# Plate scales
-my $cdelt1 = $$inHeader{'CDELT1'} or die("Can't find CDELT1");
-my $cdelt2 = $$inHeader{'CDELT2'} or die("Can't find CDELT2");
-
 # Read table data
 $inFits->movnam_hdu(BINARY_TBL, $extname, 0, $status) and check_fitsio($status);
@@ -109 +105 @@
 }
 
+# Plate scales
+#my $cdelt1 = $$inHeader{'CDELT1'} or die("Can't find CDELT1");
+#my $cdelt2 = $$inHeader{'CDELT2'} or die("Can't find CDELT2");
+### XXX WCS wasn't being set in inverse diffs, but it's available elsewhere
+my $cdelt1 = $$scale[0] / 3600;
+my $cdelt2 = $$scale[1] / 3600;
 
 # Parse the list of columns

trunk/ippScripts/scripts/ipp_serial_mops.pl

@@ -89 +89 @@
     JOIN diffInputSkyfile USING(diff_id)
     WHERE diffInputSkyfile.warp1 IS NOT NULL
+        AND diffRun.state = 'full'
         AND diffRun.exposure = 1
         $where_label
@@ -100 +101 @@
     JOIN diffInputSkyfile USING(diff_id)
     WHERE diffInputSkyfile.warp2 IS NOT NULL
+        AND diffRun.state = 'full'
         AND diffRun.exposure = 1
         AND diffRun.bothways = 1
@@ -108 +110 @@
 JOIN camRun USING(cam_id)
 JOIN chipRun USING(chip_id)
-WHERE diffRun.state = 'full'
-    AND rawExp.camera = '$camera'
+JOIN rawExp USING(exp_id)
+WHERE rawExp.camera = '$camera'
 GROUP BY exp_id;";
 
@@ -129 +131 @@
 
     foreach my $skycell ( @$skycells ) {
-        my $skycell_id = $diff->{skycell_id};
-        my $path_base = $diff->{path_base};
+        my $skycell_id = $skycell->{skycell_id};
+        my $path_base = $skycell->{path_base};
 
         my $sources = $inverse ? "PPSUB.INVERSE.SOURCES" : "PPSUB.OUTPUT.SOURCES";