Index: trunk/pstamp/scripts/pstampparse.pl
===================================================================
--- trunk/pstamp/scripts/pstampparse.pl	(revision 25320)
+++ trunk/pstamp/scripts/pstampparse.pl	(revision 25368)
@@ -218,6 +218,5 @@
 
     # Temporary hack so that MOPS can get at non-magicked data
-    if (($product eq "mops-pstamp-results") or ($product eq "pstampresults") 
-        or ($product eq "bills-results")) {
+    if ($product eq "mops-pstamp-results") {
         $need_magic = 0;
     }
@@ -368,4 +367,8 @@
 
         my $base = basename($image->{path_base});
+        # XXX: TODO use filerule for this. I don't have a camera defined here
+        if (($stage eq 'chip') and ($image->{camera} eq 'GPC1')) {
+            $base = "${base}.${component}";
+        }
 
         my $output_base = "$out_dir/${rownum}_${job_num}_${base}";