Changeset 33415 for branches/meh_branches/ppstack_test/ippMonitor/czartool/czarplot.pl

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippMonitor/czartool/czarplot.pl (modified) (9 diffs)

branches/meh_branches/ppstack_test/ippMonitor/czartool/czarplot.pl

@@ -25 +25 @@
 my $magicMask = undef;
 my $rateInterval = undef;
-my $deriv = undef;
 my $nebulous = undef;
 my $savingToFile = undef;
-my $analysis = undef;
 my $exposureId = undef;
 my $log = undef;
+my $psps = undef;
 
 GetOptions (
@@ -46 +45 @@
         "nebulous|n" => \$nebulous,
         "rate|r" => \$rate,
-        "deriv|f" => \$deriv,
-        "analysis|a" => \$analysis,
         "timeseries|t" => \$timeSeries,
         "verbose|v" => \$verbose,
         "log|g" => \$log,
+        "psps|u" => \$psps,
         );
 
@@ -60 +58 @@
     print "* UNKNKOWN: option                          @ARGV\n";
 }
-if ($analysis && !$stage) {
-    $quit = 1;
-    print "* REQUIRED: choose a stage for analsis      -s <chip|cam|warp|etc>      (default=none)\n";}
 if (!$histogram) {
     print "* OPTIONAL: plot histogram                  -h                          (default=off)\n";}
@@ -73 +68 @@
 if (!$rate) {
     print "* OPTIONAL: plot histogram of rate          -r                          (default=off)\n";} 
-if (!$deriv) {
-    $deriv = 0;
-    print "* OPTIONAL: plot first derivative           -f                          (default=$deriv)\n";} 
-if (!$analysis) {
-    $analysis = 0;
-    print "* OPTIONAL: include analysis                -a                          (default=$analysis)\n";} 
 if (!$log) {
     $log = 0;
@@ -94 +83 @@
     print "* OPTIONAL: time interval for rate plot     -i <'1 hour'|'1 day'|etc>   (default=depends on time frame)\n";} 
 if (!$begin) {
-    print "* OPTIONAL: choose a begin time             -b <datetime>               (default=6:35am this morning)\n";} 
+    print "* OPTIONAL: choose a begin time             -b <datetime>               (default=18:00)\n";} 
 if (!$end) {
     print "* OPTIONAL: choose an end time              -e <datetime>               (default=now)\n";} 
@@ -102 +91 @@
     print "* OPTIONAL: choose an output location       -o <path>                   (default=none)\n";
 } 
+if (!$psps) {
+    print "* OPTIONAL: plot ippToPsps stages           -u                          (default=off)\n";} 
 print "*\n*******************************************************************************\n";
 
@@ -109 +100 @@
 
 # default values
-if (!$rate && !$magicMask && !$nebulous && !$histogram && !$analysis && !$timeSeries) {$timeSeries = 1;}
+if (!$rate && !$magicMask && !$nebulous && !$histogram && !$timeSeries) {$timeSeries = 1;}
 if (!$verbose) {$verbose = 0;}
 if (!$save_temps) {$save_temps = 0;}
@@ -128 +119 @@
     $plotter = czartool::Plotter->new_display($config, $save_temps);
 }
+
+if ($psps) {$plotter->setIppToPspsMode();}
 
 # if a single day has been chosen 
@@ -182 +175 @@
 }
 
-if($analysis) {
-
-    my $stageMetrics = new czartool::StageMetrics($stage, $label, $begin, $end);
-    if ($czarDb->runAnalysis($stageMetrics)) {$stageMetrics->printMe();}
-}