Changeset 29695

Timestamp:

Nov 8, 2010, 11:53:58 AM (16 years ago)

Author:

rhenders

Message:

improved args for rate plots

File:

• trunk/tools/czarplot.pl (modified) (6 diffs)

trunk/tools/czarplot.pl

@@ -15 +15 @@
 my $stage = undef;
 my $save_temps = undef;
-my $interval = undef;
+my $timeinpast = undef;
 my $begin = undef;
 my $end = undef;
@@ -24 +24 @@
 my $timeSeries = undef;
 my $rate = undef;
+my $rateInterval = undef;
 my $deriv = undef;
 my $showCleanup = undef;
@@ -35 +36 @@
         "label|l=s" => \$label,
         "stage|s=s" => \$stage,
-        "interval|i=s" => \$interval,
+        "timeinpast|p=s" => \$timeinpast,
+        "rateinterval|i=s" => \$rateInterval,
         "begin|b=s" => \$begin,
         "end|e=s" => \$end,
@@ -86 +88 @@
 if (!$stage) {
     print "* OPTIONAL: choose a stage                  -s <chip|cam|warp|etc>      (default=none)\n";}
-if (!$interval) {
-    print "* OPTIONAL: choose time interval in past    -i <'1 hour'|'1 day'|etc>   (default=none\n";} 
+if (!$timeinpast) {
+    print "* OPTIONAL: choose time interval in past    -p <'1 hour'|'1 day'|etc>   (default=none\n";} 
+if (!$rateInterval) {
+    $rateInterval = "1 HOUR";
+    print "* OPTIONAL: time interval for rate plot     -i <'1 hour'|'1 day'|etc>   (default=$rateInterval\n";} 
 if (!$begin) {
     print "* OPTIONAL: choose a begin time             -b <datetime>               (default=6:35am this morning)\n";} 
@@ -133 +138 @@
     if (!$begin) {
 
-        if ($interval) {$begin = $czarDb->subtractInterval($end, $interval);}
+        if ($timeinpast) {$begin = $czarDb->subtractInterval($end, $timeinpast);}
         else {$begin =  strftime('%Y-%m-%d 06:35',localtime);}
     }
@@ -140 +145 @@
 
 if ($rate) {
-
-    if (!$interval) {$interval = "1 HOUR";}
-    $plotter->createRateTimeSeries($label, $stage, $begin, $end, $interval, $log);
+    $plotter->createRateTimeSeries($label, $stage, $begin, $end, $rateInterval, $log);
     exit;
 }