Index: /trunk/PStamp/lib/PStamp/Job.pm
===================================================================
--- /trunk/PStamp/lib/PStamp/Job.pm	(revision 20149)
+++ /trunk/PStamp/lib/PStamp/Job.pm	(revision 20150)
@@ -123,7 +123,7 @@
     my $base_name;
     my $want_astrom;
-    my $use_class_id;
-
-    # special class_id value "null" means all 
+    my $set_class_id;
+
+    # special class_id value "null" means ignore
     if ($class_id eq "null") {
         $class_id = undef;
@@ -135,5 +135,5 @@
         $command .= " -class_id $class_id" if $class_id;
         $want_astrom = 1;
-        $use_class_id = 1;
+        $set_class_id = 1;
     } elsif ($img_type eq "chip") {
         $command = "$chiptool -processedimfile -dbname $image_db";
@@ -144,5 +144,5 @@
         $base_name    = "path_base"; # name of the field for the chiptool output
         $want_astrom  = 1;
-        $use_class_id = 1;
+        $set_class_id = 1;
     } elsif ($img_type eq "warp") {
         $command = "$warptool -warped -dbname $image_db";
@@ -204,6 +204,7 @@
         if ($base_name) {
             $base = $image->{$base_name};
-            # if base is undef then the output pruducts for thjis image are incomplete
-            # This may only happen for warps.
+            # if base is undef then the output pruducts for this image are incomplete
+            # This may only happen for warps. (Actually the test for ignored that I added
+            # just above probably solved the problem I was trying to solve with this test)
             next if !$base;
         }
@@ -218,5 +219,5 @@
         $out->{image}  = $image->{uri};
         $out->{state}  = $image->{state}; # state is undef for rawExp, but that's ok
-        $class_id = $image->{class_id} if $use_class_id;
+        $class_id = $image->{class_id} if $set_class_id;
 
         # find the mask and weight images
@@ -227,10 +228,4 @@
         $out->{camera} = $camera;
 
-#XXX gpc1 and mops data that I've been looking at was made with astrometry in chip processing
-#so the filerule doesn't match
-if ($camera ne "SIMTEST") {
-    $want_astrom = 0;
-}
-       
         $out->{astrom} = find_astrometry($ipprc, $image_db, $image, $verbose) if $want_astrom;
 
@@ -325,5 +320,6 @@
 
     if ($img_type eq "diff") {
-        # the $image is going to be returned directly so we need to do some more processing
+        # the $image is going to be returned directly in this case so we need to duplicate
+        # some of processing that lookup does for other img_types
         $image->{image} = $image->{uri};
         if ($image->{camera}) {
@@ -547,5 +543,4 @@
     my $proj_hash = parse_md_fast($mdcParser, $output);
 
-
     return $proj_hash->[0];
 }