Index: /tags/ipp-pv3-20140717/ippScripts/scripts/lap_queue_diff.pl
===================================================================
--- /tags/ipp-pv3-20140717/ippScripts/scripts/lap_queue_diff.pl	(revision 38286)
+++ /tags/ipp-pv3-20140717/ippScripts/scripts/lap_queue_diff.pl	(revision 38287)
@@ -25,5 +25,5 @@
 my ( $help, $verbose, $debug, $do_nothing);
 my ( $camera, $dbname);
-my ( $lap_id );
+my ( $lap_id, $data_group );
 my ( $queue_list );
 
@@ -38,12 +38,16 @@
     
     'lap_id=s'     => \$lap_id,
+    'data_group=s' => \$data_group,
     'queue_list=s' => \$queue_list,
     ) or pod2usage ( 2 );
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "--lap_id is required",
+    -msg => "--lap_id --data_group --queue_list are required",
     -exitval => 3,
     ) unless
-    defined $lap_id;
+    defined $lap_id and
+    defined $queue_list and
+    defined $data_group
+;
 
 unless (defined $dbname) {
@@ -91,5 +95,5 @@
 	    if ($can_diff == 1) {
 		# This needs a check to ensure it hasn't been done yet.
-		my $diff_id = &launch_diff($warp_id);
+		my $diff_id = &launch_diff($warp_id,$label,$data_group);
 		print "Made diff for $warp_id => $diff_id\n";
 		$Ndiff++;
@@ -255,15 +259,18 @@
     my $warp_id = shift;
     my $label = shift;
+    my $data_group = shift;
+    my $command = "$difftool -definewarpstack -available -bothways -good_frac 0.2 ";
+    $command   .= " -warp_label $label -stack_label $label -set_label $label ";
+    $command   .= " -set_data_group $data_group ";
+    $command   .= " -set_workdir neb://\@HOST\@.0/gpc1/${label}/${data_group}/ ";
+    $command   .= " -set_reduction WARPSTACK_PV3 ";
+    $command   .= " -warp_id ${warp_id} ";
+    $command .= " -dbname $dbname " if defined $dbname;
+    
     if (($debug)||($do_nothing)) {
+	print "DEBUG! WOULD RUN: >> $command\n";
 	return(99);
     }
     else {
-	my $command = "$difftool -definewarpstack -available -bothways -good_frac 0.2 ";
-	$command   .= " -warp_label $label -stack_label $label -set_label $label ";
-	$command   .= " -set_data_group ${label}.";
-	$command   .= " -set_workdir neb://@HOST@.0/gpc1/LAP.PV3.20140730/diff01.20150311/ ";
-	$command   .= " -set_reduction WARPSTACK_PV3 ";
-	$command   .= " -warp_id ${warp_id} ";
-	$command .= " -dbname $dbname " if defined $dbname;
 	my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
 	    run(command => $command, verbose => $verbose);