Changeset 29114 for trunk/tools/czartool

Timestamp:

Sep 2, 2010, 3:09:56 PM (16 years ago)

Author:

rhenders

Message:

Added log plots for timeseries

Location:

trunk/tools/czartool

Files:

• CzarDb.pm (modified) (4 diffs)
• Czarplot.pm (modified) (10 diffs)

trunk/tools/czartool/CzarDb.pm

@@ -242 +242 @@
 ###########################################################################
 sub createTimeSeriesData {
-    my ($self, $label, $stage, $fromTime, $toTime, $minX, $maxX, $minY, $maxY, $timeDiff) = @_;
-
-    my $dataFile = "/tmp/czarplot_gnuplot_".$label."_".$stage."_t.dat";
-    open (GNUDAT, ">$dataFile");
+    my ($self, $label, $stage, $fromTime, $toTime, $minX, $maxX, $minY, $maxY, $timeDiff, $dataFileLin, $dataFileLog) = @_;
+
+    ${$dataFileLin} = "/tmp/czarplot_gnuplot_lin_".$label."_".$stage."_t.dat";
+    ${$dataFileLog} = "/tmp/czarplot_gnuplot_log_".$label."_".$stage."_t.dat";
+    open (GNUDATLIN, ">${$dataFileLin}");
+    open (GNUDATLOG, ">${$dataFileLog}");
 
     my $query = $self->{_db}->prepare(<<SQL);
@@ -259 +261 @@
 SQL
 
-    if (!$query->execute) {return undef;}
+    if (!$query->execute) {return 0;}
 
     my $minProcessed = undef;
@@ -265 +267 @@
     ($minProcessed, ${$maxY}, ${$minY}, ${$maxX}, ${$minX}, ${$timeDiff}) = $query->fetchrow_array();
 
-    if (!defined $minProcessed) {return undef;}
+    if (!defined $minProcessed) {return 0;}
 
     $query = $self->{_db}->prepare(<<SQL);
@@ -280 +282 @@
     # loop round results
     while (my @row = $query->fetchrow_array()) {
-
         my ($timestamp, $pending, $faults, $processed) = @row;
+
+        my $processedLog = log($processed + 1);
+        my $pendingLog = log($pending + 1);
+        my $faultsLog = log($faults + 1);
+
     #    print  "'$timestamp' '$pending' '$faults' '$processed'\n";
-        print GNUDAT "$timestamp $pending $faults $processed\n";
-    }
-    close(GNUDAT);
-
-    return $dataFile;
+        print GNUDATLIN "$timestamp $pending $faults $processed\n";
+        print GNUDATLOG "$timestamp $pendingLog $faultsLog $processedLog\n";
+    }
+
+    close(GNUDATLIN);
+    close(GNUDATLOG);
+
+    return 1;
 }
 

trunk/tools/czartool/Czarplot.pm

@@ -33 +33 @@
 ###########################################################################
 sub createImageFileName {
-    my ($self, $label, $stage, $suffix) = @_;
+    my ($self, $label, $stage, $suffix, $isLog) = @_;
 
     my $prefix = $self->{_outputPath} ? $self->{_outputPath} : ".";
     my $stagePart = $stage ? $stage : "all_stages";
-    return $prefix . "/czarplot_" . $label . "_" . $stagePart . "_$suffix.png";
+    my $type = $isLog ? "log" : "linear";
+    return $prefix . "/czarplot_" . $type . "_" . $label . "_" . $stagePart . "_$suffix.png";
 }
 
@@ -46 +47 @@
 ###########################################################################
 sub createTimeSeries {
-    my ($self, $label, $selectedStage, $beginTime, $endTime) = @_;
-
-    my $outputFile = createImageFileName($self, $label, $selectedStage, "t");
+    my ($self, $label, $selectedStage, $beginTime, $endTime, $makeLinear, $makeLog) = @_;
 
     my ($minX, $maxX, $minY, $maxY, $timeDiff);
@@ -61 +60 @@
     else {$stages = ["$selectedStage"]};        
 
-    my %gnuplotFiles;
+    my %gnuplotFilesLin;
+    my %gnuplotFilesLog;
     my $stage = undef;
-    my $gnuplotFile = undef;
+    my $gnuplotFileLin = undef;
+    my $gnuplotFileLog = undef;
     foreach $stage (@{$stages}) {
 
-        $gnuplotFile = $self->{_czarDb}->createTimeSeriesData($label, $stage, $beginTime, $endTime, \$minX, \$maxX, \$minY, \$maxY, \$timeDiff);
-        if ($gnuplotFile) {$gnuplotFiles{$stage} = $gnuplotFile;}
+        if($self->{_czarDb}->createTimeSeriesData(
+                    $label, 
+                    $stage, 
+                    $beginTime, 
+                    $endTime, 
+                    \$minX, 
+                    \$maxX, 
+                    \$minY, 
+                    \$maxY, 
+                    \$timeDiff, 
+                    \$gnuplotFileLin,
+                    \$gnuplotFileLog)) {
+
+            $gnuplotFilesLin{$stage} = $gnuplotFileLin;
+            $gnuplotFilesLog{$stage} = $gnuplotFileLog;
+        }
 
     }                                                           
 
-    my $numOfPlots =  keys(%gnuplotFiles);
+    my $numOfPlots =  keys(%gnuplotFilesLin);
 
     if ($numOfPlots == 0 ) {
@@ -85 +100 @@
     }
 
-    plotTimeSeries($self, \%gnuplotFiles, $outputFile, $label, $beginTime, $endTime, $maxX, $minX, $maxY, $minY, $timeDiff);
+    my $outputFile;
+    if ($makeLinear) {
+
+        $outputFile = createImageFileName($self, $label, $selectedStage, "t", 0);
+        $self->plotTimeSeries(\%gnuplotFilesLin, $outputFile, $label, $beginTime, $endTime, $maxX, $minX, $maxY, $minY, $timeDiff, 0);
+    }
+    if ($makeLog) {
+
+        $outputFile = createImageFileName($self, $label, $selectedStage, "t", 1);
+        $self->plotTimeSeries(\%gnuplotFilesLog, $outputFile, $label, $beginTime, $endTime, $maxX, $minX, $maxY, $minY, $timeDiff, 1);
+    }
 }                                                    
 
@@ -96 +121 @@
     my ($self, $label, $beginTime, $endTime) = @_;
 
-    my $outputFile = createImageFileName($self, $label, undef, "h");
+    my $outputFile = createImageFileName($self, $label, undef, "h", 0);
 
     my $inputFile = "/tmp/czarplot_gnuplot_".$label."_h.dat"; # TODO use stage not table
-    open (GNUDAT, ">$inputFile");
+        open (GNUDAT, ">$inputFile");
 
     my ($processed, $pending, $faults);
@@ -216 +241 @@
 ###########################################################################
 sub plotTimeSeries {
-    my ($self, $gnuplotFiles, $outputFile, $label, $fromTime, $toTime, $maxX, $minX, $maxY, $minY, $timeDiff) = @_;
+    my ($self, $gnuplotFiles, $outputFile, $label, $fromTime, $toTime, $maxX, $minX, $maxY, $minY, $timeDiff, $isLog) = @_;
 
     $self->sortOutMaxMinY(\$minY, \$maxY);
@@ -222 +247 @@
     my $timeFormat = undef;
     my $divX = undef;
-
+    my $yTitle = undef;
+    if ($isLog) {$yTitle = "Log(Num of Exposures)";}
+    else {$yTitle = "Num of Exposures";}
     $self->getTimeSpacing($timeDiff, \$divX, \$timeFormat);
 
@@ -245 +272 @@
         "set xdata time;" .
         "set timefmt \"$self->{_dateFormat}\";" .
-    #    "set yrange [\"$minY\":\"$maxY\"];" .
+        #    "set yrange [\"$minY\":\"$maxY\"];" .
         "set xrange [\"$minX\":\"$maxX\"];" .
         "set format x \"$timeFormat\";" .
@@ -251 +278 @@
         "set grid xtics;" .
         "set xlabel \"Time\";" .
-        "set ylabel \"Exposures\";" .
+        "set ylabel \"$yTitle\";" .
         "plot ";
 
@@ -342 +369 @@
         "set boxwidth;" .
         "set style data histogram;" .
- "set style histogram rowstacked;" .
+        "set style histogram rowstacked;" .
         "set style fill solid border -1;" .
         "set ylabel \"Exposures\";" .