Changeset 29060 for branches/sc_branches/trunkTest/tools/czartool/Czarplot.pm

Timestamp:

Aug 26, 2010, 9:18:39 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Merging trunk in branch

Location:

branches/sc_branches/trunkTest

Files:

• . (modified) (1 prop)
• tools/czartool/Czarplot.pm (modified) (5 diffs)

branches/sc_branches/trunkTest/tools/czartool/Czarplot.pm

@@ -5 +5 @@
 use strict;
 
-my @allStages = ("chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist");
+my @allStages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist");
 
 
@@ -75 +75 @@
     if ($numOfPlots == 0 ) {
 
-        print "Warning: No plots could be generated for '$label' during time period '$beginTime', '$endTime'\n";
+        print "Warning: No plots could be generated for stage '$selectedStage' and label '$label' during time period '$beginTime', '$endTime'\n";
         return;
     } 
@@ -103 +103 @@
     my ($processed, $pending, $faults);
     my $stage = undef;
+    my $pendingMinusFaults = undef;
     foreach $stage (@allStages) {
 
         $self->{_czarDb}->countProcessedPendingAndFaults($label, $stage, $beginTime, $endTime, \$processed, \$pending, \$faults);
-        print GNUDAT "$stage $processed, $pending, $faults\n";
+
+        $pendingMinusFaults = $pending - $faults;
+        print GNUDAT "$stage $faults $processed, $pendingMinusFaults\n";
     }
 
@@ -258 +261 @@
         if ($numOfPlots == 1) {
 
-            print GP "'" . $gnuplotFiles->{$stage} . "' using 1:4 title \"Processed\" with lines lt 2,";
-            print GP "'" . $gnuplotFiles->{$stage} . "' using 1:2 title \"Pending\" with lines lt 4,";
-            print GP "'" . $gnuplotFiles->{$stage} . "' using 1:3 title \"Faults\" with lines lt 7";
+            print GP "'" . $gnuplotFiles->{$stage} . "' using 1:4 title \"Processed\" with lines lt 2 lw 2,";
+            print GP "'" . $gnuplotFiles->{$stage} . "' using 1:2 title \"Pending\" with lines lt 4 lw 2,";
+            print GP "'" . $gnuplotFiles->{$stage} . "' using 1:3 title \"Faults\" with lines lt 7 lw 2";
         }
         # when plotting multiple stages, show only processed
         else {
-            print GP "'" . $gnuplotFiles->{$stage} . "' using 1:4 title \"$stage\" with lines";
+            print GP "'" . $gnuplotFiles->{$stage} . "' using 1:4 title \"$stage\" with lines lw 2";
         }
         $firstIn = 0;
@@ -339 +342 @@
         "set boxwidth;" .
         "set style data histogram;" .
-        "set style histogram cluster gap 3;" .
+ "set style histogram rowstacked;" .
         "set style fill solid border -1;" .
-        "set bmargin 5;" .
         "set ylabel \"Exposures\";" .
-        "plot '$inputFile' using 2:xtic(1) title \"Processed\" lt 2, '' using 3 title \"Pending\" lt 4, '' using 4 title \"Faults\" lt 7;" . 
+        "set boxwidth 0.75;" .
+        "plot '$inputFile' using 2:xtic(1) title \"Faults\" lt 1, '' using 3 title \"Processed\" lt 2, '' using 4 title \"Pending\" lt 7;" . 
         "\n";
+
+
 
     close GP;