Index: trunk/ippScripts/scripts/warp_overlap.pl
===================================================================
--- trunk/ippScripts/scripts/warp_overlap.pl	(revision 12416)
+++ trunk/ippScripts/scripts/warp_overlap.pl	(revision 12421)
@@ -78,4 +78,14 @@
 }
 
+# Make sure everything is from the same exposure, and get the exposure tag
+my $exp_tag;			# Exposure tag
+foreach my $imfile ( @$imfiles ) {
+    unless (defined $exp_tag) {
+	$exp_tag = $imfile->{exp_tag};
+    } elsif ($exp_tag ne $imfile->{exp_tag}) {
+	&my_die("Multiple exposures in the same warp.", $warp_id, $PS_EXIT_SYS_ERROR);
+    }
+}
+
 unless ($no_op) {
 
@@ -93,4 +103,5 @@
 if (defined $workdir) {
     $workdir = $ipprc->convert_filename_absolute( $workdir );
+    $workdir = File::Spec->catdir( $workdir, $exp_tag );
 } else {
     my $example = $ipprc->convert_filename_absolute( $$imfiles[0]->{uri} );
@@ -98,6 +109,4 @@
     $workdir = $dir;
 }
-
-$workdir = File::Spec->catfile( $workdir, "warp$warp_id" );
 system "mkdir -p $workdir" unless -d $workdir;
 
@@ -108,11 +117,10 @@
 foreach my $imfile (@$imfiles) {
     print $overlapFile "warpSkyCellMap\tMETADATA\n";
-    print $overlapFile "\twarp_id\tS32\t" . $warp_id . "\n";
+    print $overlapFile "\twarp_id\t\tS32\t" . $warp_id . "\n";
     print $overlapFile "\tskycell_id\tSTR\t" . $imfile->{skycell_id} . "\n";
     print $overlapFile "\ttess_id\t\tSTR\t" . $imfile->{tess_id} . "\n";
-    print $overlapFile "\texp_tag\t\tSTR\t" . $imfile->{exp_tag} . "\n";
-    print $overlapFile "\tcam_version\tS32\t" . $imfile->{cam_version} . "\n";
-    print $overlapFile "\tclass_id\t\tSTR\t" . $imfile->{class_id} . "\n";
-    print $overlapFile "\tfault\tS16\t" . $imfile->{fault} . "\n";
+    print $overlapFile "\tcam_id\t\tS32\t" . int($imfile->{cam_id}) . "\n";
+    print $overlapFile "\tclass_id\tSTR\t" . $imfile->{class_id} . "\n";
+    print $overlapFile "\tfault\t\tS16\t" . $imfile->{fault} . "\n";
     print $overlapFile "END\n\n";
 }