Index: trunk/tools/czartool/Czarplot.pm
===================================================================
--- trunk/tools/czartool/Czarplot.pm	(revision 28719)
+++ trunk/tools/czartool/Czarplot.pm	(revision 28728)
@@ -35,9 +35,9 @@
 ###########################################################################
 sub createImageFileName {
-    my ($self, $label, $suffix) = @_;
+    my ($self, $label, $stage, $suffix) = @_;
 
     my $prefix = $self->{_outputPath} ? $self->{_outputPath} : ".";
-
-    return $prefix . "/czarplot_" . $label . "_$suffix.png";
+    my $stagePart = $stage ? $stage : "all_stages";
+    return $prefix . "/czarplot_" . $label . "_" . $stagePart . "_$suffix.png";
 }
 
@@ -50,5 +50,5 @@
     my ($self, $label, $selectedStage, $beginTime, $endTime) = @_;
 
-    my $outputFile = createImageFileName($self, $label, "t");
+    my $outputFile = createImageFileName($self, $label, $selectedStage, "t");
 
     my ($minX, $maxX, $minY, $maxY, $timeDiff);
@@ -81,5 +81,5 @@
     my ($self, $label, $beginTime, $endTime) = @_;
 
-    my $outputFile = createImageFileName($self, $label, "h");
+    my $outputFile = createImageFileName($self, $label, undef, "h");
 
     my ($tempFile, $inputFile) = tempfile( "/tmp/czartool_gnuplot_histogram.XXXX", UNLINK => !$self->{_save_temps});