Changeset 8965

Timestamp:

06/16/08 15:58:28 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• datacenter/macros/plotdb.C (modified) (4 diffs)
• mbase/MLog.cc (modified) (4 diffs)
• mbase/MStatusDisplay.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2008/06/15 Thomas Bretz
+
+   * datacenter/macros/plotdb.C:
+     - SetSelectedPad to 0 before calling DrawClone of TGraph
+     - small reordering of the tabs
+     - removed tab with absolute effective on time
+
+   * mbase/MLog.cc:
+     - make sure that the correct output level is restored after root
+       called the error handler
+
+   * mbase/MStatusDisplay.cc:
+     - Changed backround color to white (_not_ kWhite)
+     - made a sunken border around the canvas
+     - SetFrameBorderMode(0) per default
+
 
 
@@ -74 +92 @@
      - UpdatePSHeader not long needed in root >=5.12
      - reorganized header file
-     - Changed backround color to white (_not_ kWhite)
-     - made a sunken border around the canvas
 
    * mreport/MReportCC.[h,cc]:

trunk/MagicSoft/Mars/datacenter/macros/plotdb.C

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.44 2008-06-15 19:09:19 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.45 2008-06-16 14:58:26 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -280 +280 @@
 
         // draw TGraph
+        gROOT->SetSelectedPad(0);
         gt.DrawClone("AP");
         if (gt0.GetN()>0)
@@ -363 +364 @@
 
         // draw graph
+        gROOT->SetSelectedPad(0);
         gz.DrawClone("AP");
 
@@ -599 +601 @@
     plot.Plot("Star.fMuonRate",                0, 2.0, 0.05);
     //quality
+    plot.SetDescription("Datarate [Hz]", "Rate");
+    plot.Plot("Star.fDataRate",                0, 600, 10);
     plot.SetDescription("Camera Inhomogeneity;\\sigma [%]", "Inhom");
     plot.Plot("Star.fInhomogeneity",           0, 100, 1);
     plot.SetDescription("Camera Spark Rate;R [Hz]", "Sparks");
     plot.Plot("Star.fSparkRate",               0.075, 2.425, 0.05);
+    plot.SetDescription("Relative effective on time;T_{eff}/T_{obs} [ratio]", "RelTime");
+    plot.Plot("Star.fEffOnTime/Sequences.fRunTime",    0.006, 1.506, 0.01);
     //imgpar
     plot.SetDescription("Mean Number of Islands after cleaning;N [#]", "NumIsl");
     plot.Plot("Star.fMeanNumberIslands",       0.5, 4.5, 0.01);
-    plot.SetDescription("Measures effective on time;T_{eff} [s]", "EffOn");
-    plot.Plot("Star.fEffOnTime",               0, 10000, 150);
-    plot.SetDescription("Relative effective on time;T_{eff}/T_{obs} [ratio]", "RelTime");
-    plot.Plot("Star.fEffOnTime/Sequences.fRunTime",    0.006, 1.506, 0.01);
-    plot.SetDescription("Datarate [Hz]", "Rate");
-    plot.Plot("Star.fDataRate",                0, 600, 10);
+    //weather
+    plot.SetDescription("Average Temperature [\\circ C];T [\\circ C]", "Temp");
+    plot.Plot("Star.fAvgTemperature",        -5, 25, 1);
     plot.SetDescription("Average Cloudiness [%]", "AvgClouds");
     plot.Plot("Star.fAvgCloudiness",           0, 100, 1);
     plot.SetDescription("RMS Cloudiness [%]", "RmsClouds");
-    plot.Plot("Star.fRmsCloudiness",           0, 100, 1);
+    plot.Plot("Star.fRmsCloudiness",           0,  30, 1);
     plot.SetDescription("Sky Temperature [K]", "SkyTemp");
-    plot.Plot("Star.fAvgTempSky",         150, 300, 1);
+    plot.Plot("Star.fAvgTempSky",         180, 280, 1);
     plot.SetDescription("Maximum Humidity [%]", "MaxHum");
     plot.Plot("Star.fMaxHumidity",             0, 100, 1);
     plot.SetDescription("Average Humidity [%]", "AvgHum");
     plot.Plot("Star.fAvgHumidity",             0, 100, 1);
-    plot.SetDescription("Average Temperature [\\circ C];T [\\circ C]", "Temp");
-    plot.Plot("Star.fAvgTemperature",        -5, 25, 1);
     plot.SetDescription("Average Wind Speed [km/h];v [km/h]", "Wind");
     plot.Plot("Star.fAvgWindSpeed",        0, 50, 1);

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.60 2008-06-14 15:55:50 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.61 2008-06-16 14:58:27 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -832 +832 @@
     gLog << std::flush;
 
+    const Int_t store = gLog.GetOutputLevel();
+
     if (level >= kInfo)
        gLog << inf;
@@ -842 +844 @@
 
     gLog << std::flush;
+
+    gLog.SetOutputLevel(store);
     if (!abort)
         return;
@@ -848 +852 @@
     if (gSystem) {
         gSystem->StackTrace();
+        gLog.SetOutputLevel(store);
         gSystem->Abort();
-    } else
+    }
+    else
+    {
+        gLog.SetOutputLevel(store);
         ::abort();
+    }
 }
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1048 +1048 @@
         TCanvas *c = new TCanvas("", title?title:"", -cw, ch);
         c->SetName(name);
+        c->SetFillColor(10); // White
+        c->SetFrameBorderMode(0);
+        c->SetBorderMode(0);
         fBatch->Add(c);
 
@@ -1062 +1065 @@
 
     // create root embedded canvas and add it to the tab
-    TRootEmbeddedCanvas *ec = new TRootEmbeddedCanvas(name, f, f->GetWidth(), f->GetHeight(), 0);
+    TRootEmbeddedCanvas *ec = new TRootEmbeddedCanvas(name, f, f->GetWidth(), f->GetHeight(), kSunkenFrame);
     f->AddFrame(ec, fLayCanvas);
     fList->Add(ec);
@@ -1072 +1075 @@
         c.SetTitle(title);
 
-    c.SetFillColor(16/*165*//*17*//*203*/);
+    c.SetFillColor(10); // White
     c.SetFrameBorderMode(0);
     c.SetBorderMode(0);