IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 31, 2012, 2:20:53 PM (14 years ago)
Author:
Serge CHASTEL
Message:

Enlarged nebulous view of the storage partitions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippMonitor/czartool/czarplot.pl

    r32796 r34249  
    6161    print "* OPTIONAL: plot histogram                  -h                          (default=off)\n";}
    6262if (!$timeSeries) {
    63     print "* OPTIONAL: plot timeseries                 -t                          (default=on)\n";} 
     63    print "* OPTIONAL: plot timeseries                 -t                          (default=on)\n";}
    6464if (!$magicMask) {
    65     print "* OPTIONAL: plot magic mask for these times -m                          (default=off)\n";} 
     65    print "* OPTIONAL: plot magic mask for these times -m                          (default=off)\n";}
    6666if (!$exposureId) {
    67     print "* OPTIONAL: set exposure ID for magic mask  -x                          (default=none)\n";} 
     67    print "* OPTIONAL: set exposure ID for magic mask  -x                          (default=none)\n";}
    6868if (!$rate) {
    69     print "* OPTIONAL: plot histogram of rate          -r                          (default=off)\n";} 
     69    print "* OPTIONAL: plot histogram of rate          -r                          (default=off)\n";}
    7070if (!$log) {
    7171    $log = 0;
    7272    print "* OPTIONAL: use log plots                   -g                          (default=$log)\n";}
    7373if (!$nebulous) {
    74     print "* OPTIONAL: plot nebulous disk space        -n                          (default=off)\n";} 
     74    print "* OPTIONAL: plot nebulous disk space        -n                          (default=off)\n";}
    7575if (!$label) {
    7676    $label = "all_stdscience_labels";
    … …  
    7979    print "* OPTIONAL: choose a stage                  -s <chip|cam|warp|etc>      (default=none)\n";}
    8080if (!$timeinpast) {
    81     print "* OPTIONAL: choose time interval in past    -p <'1 hour'|'1 day'|etc>   (default=none\n";} 
     81    print "* OPTIONAL: choose time interval in past    -p <'1 hour'|'1 day'|etc>   (default=none\n";}
    8282if (!$rateInterval) {
    83     print "* OPTIONAL: time interval for rate plot     -i <'1 hour'|'1 day'|etc>   (default=depends on time frame)\n";} 
     83    print "* OPTIONAL: time interval for rate plot     -i <'1 hour'|'1 day'|etc>   (default=depends on time frame)\n";}
    8484if (!$begin) {
    85     print "* OPTIONAL: choose a begin time             -b <datetime>               (default=18:00)\n";} 
     85    print "* OPTIONAL: choose a begin time             -b <datetime>               (default=18:00)\n";}
    8686if (!$end) {
    87     print "* OPTIONAL: choose an end time              -e <datetime>               (default=now)\n";} 
     87    print "* OPTIONAL: choose an end time              -e <datetime>               (default=now)\n";}
    8888if (!$day) {
    89     print "* OPTIONAL: choose a single day to plot     -d <date>                   (default=today)\n";} 
     89    print "* OPTIONAL: choose a single day to plot     -d <date>                   (default=today)\n";}
    9090if (!$path) {
    9191    print "* OPTIONAL: choose an output location       -o <path>                   (default=none)\n";
    92 } 
     92}
    9393if (!$psps) {
    94     print "* OPTIONAL: plot ippToPsps stages           -u                          (default=off)\n";} 
     94    print "* OPTIONAL: plot ippToPsps stages           -u                          (default=off)\n";}
    9595print "*\n*******************************************************************************\n";
    9696
    … …  
    110110my $newDayTime =  $config->getMetricsStartTime();
    111111
    112 my $plotter = undef; 
     112my $plotter = undef;
    113113if ($savingToFile) {
    114114
    … …  
    122122if ($psps) {$plotter->setIppToPspsMode();}
    123123
    124 # if a single day has been chosen 
     124# if a single day has been chosen
    125125if($day) {
    126126
    … …  
    134134        # plots should span 24 housr from previous day
    135135        my $dayBefore = $czarDb->subtractInterval($day, "1 DAY");
    136                
     136
    137137        $begin = "$dayBefore $newDayTime";
    138138        $end = "$day $newDayTime";
    … …  
    147147        my $yesterday = $czarDb->subtractInterval($today, "1 DAY");
    148148
    149        
     149
    150150        if ($timeinpast) {$begin = $czarDb->subtractInterval($end, $timeinpast);}
    151151        elsif ($czarDb->isBefore($end, "$today $newDayTime")) {$begin = "$yesterday $newDayTime";}
    … …  
    166166
    167167if ($histogram) {$plotter->createHistogram($label, $begin, $end);}
    168 if ($nebulous && $timeSeries) {$plotter->plotStorageTimeSeries($begin, $end);}
    169 elsif ($nebulous) {$plotter->plotDiskUsageHistogram();}
     168if ($nebulous && $timeSeries) {
     169    $plotter->plotStorageTimeSeries($begin, $end);
     170}
     171elsif ($nebulous) {
     172    $plotter->plotDiskUsageHistogram();
     173    $plotter->plotDiskUsageHistogramLarge();
     174}
    170175if ($magicMask) {
    171176
Note: See TracChangeset for help on using the changeset viewer.