Index: trunk/pstamp/scripts/pstampparse.pl
===================================================================
--- trunk/pstamp/scripts/pstampparse.pl	(revision 18985)
+++ trunk/pstamp/scripts/pstampparse.pl	(revision 19162)
@@ -152,6 +152,4 @@
     # trash the request.
     die "job_type is list_uri but mode is $mode" if ($job_type eq "list_uri") and ($mode ne "list_uri");
-
-
     my ($image_db, $lookup_class_id, $camera, $magic_required ) = resolve_project($project, $img_type, $class_id);
 
@@ -242,5 +240,5 @@
             }
 
-            if ($option_mask & $PSTAMP_SELECT_IMAGE) {
+            if ($option_mask & $PSTAMP_SELECT_MASK) {
                 $args .= " -mask $image->{mask}";
             }
@@ -255,17 +253,6 @@
             #}
 
-
             # XXX: TODO: here is where we need to check whether or not the source inputs still exist
             # and if not, queue a regeneration job and set the job state appropriately.
-
-
-#            # XXX TEMPORARY HACK won't work in general don't commit this
-#            if (($img_type eq "chip") && ($image_db eq "gpc1")) {
-#                my $astrom = $uri;
-#                $astrom =~ s/.ch.fits/.smf/;
-#                if ( -e $astrom ) {
-#                    $astrom_args .= " -astrom $astrom";
-#                }
-#            }
 
             my $command = "$pstamptool -addjob -req_id $req_id -job_type $job_type"
@@ -326,5 +313,5 @@
         $ret_magic = 0;
     } elsif ($project_name eq "simtest") {
-        $ret_dbname = "simtest";
+        $ret_dbname = "ps_simtest";
         $ret_class_id = "null";
         $ret_camera = "SIMTEST";