Index: trunk/tools/czarplot.pl
===================================================================
--- trunk/tools/czarplot.pl	(revision 29737)
+++ trunk/tools/czarplot.pl	(revision 29765)
@@ -8,4 +8,5 @@
 
 use czartool::CzarDb;
+use czartool::Gpc1Db;
 use czartool::Plotter;
 use czartool::StageMetrics;
@@ -24,4 +25,5 @@
 my $timeSeries = undef;
 my $rate = undef;
+my $magicMask = undef;
 my $rateInterval = undef;
 my $deriv = undef;
@@ -30,4 +32,5 @@
 my $savingToFile = undef;
 my $analysis = undef;
+my $exposureId = undef;
 my $log = undef;
 
@@ -38,4 +41,6 @@
         "timeinpast|p=s" => \$timeinpast,
         "rateinterval|i=s" => \$rateInterval,
+        "exposureid|x=s" => \$exposureId,
+        "mask|m" => \$magicMask,
         "begin|b=s" => \$begin,
         "end|e=s" => \$end,
@@ -67,6 +72,10 @@
 if (!$timeSeries) {
     print "* OPTIONAL: plot timeseries                 -t                          (default=on)\n";} 
+if (!$magicMask) {
+    print "* OPTIONAL: plot magic mask for these times -m                          (default=off)\n";} 
+if (!$exposureId) {
+    print "* OPTIONAL: set exposure ID for magic mask  -x                          (default=none)\n";} 
 if (!$rate) {
-    print "* OPTIONAL: plot timeseries of rate         -r                          (default=off)\n";} 
+    print "* OPTIONAL: plot histogram of rate          -r                          (default=off)\n";} 
 if (!$deriv) {
     $deriv = 0;
@@ -106,5 +115,5 @@
 
 # default values
-if (!$nebulous && !$histogram && !$analysis && !$timeSeries) {$timeSeries = 1; $histogram = 0;}
+if (!$rate && !$magicMask && !$nebulous && !$histogram && !$analysis && !$timeSeries) {$timeSeries = 1;}
 if (!$verbose) {$verbose = 0;}
 if (!$save_temps) {$save_temps = 0;}
@@ -112,4 +121,5 @@
 else {$savingToFile = 1;}
 
+my $gpc1Db = new czartool::Gpc1Db("gpc1", "ippdb01", "ippuser", "ippuser");
 my $czarDb = new czartool::CzarDb($czarDbName, "ippdb01", "ipp", "ipp", $verbose, $save_temps);
 $czarDb->setDateFormat("%Y%m%d-%H%i%s");
@@ -117,4 +127,5 @@
 
 my $plotter = new czartool::Plotter(
+        $gpc1Db, 
         $czarDb, 
         "%Y%m%d-%H%M%S", 
@@ -151,5 +162,10 @@
 if ($nebulous && $timeSeries) {$plotter->plotStorageTimeSeries($begin, $end);}
 elsif ($nebulous) {$plotter->plotDiskUsageHistogram();}
+if ($magicMask) {
+    
+    if ($exposureId) {$plotter->plotMagicMaskFractionForThisExposure($exposureId);}
+    else {$plotter->plotMagicMaskFractionHistogram($begin, $end);}
 
+}
 
 if($analysis) {
