Changeset 8940 for trunk/MagicSoft/Mars/mhist

Timestamp:

06/12/08 15:35:15 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHEvent.cc (modified) (5 diffs)
• MHWeather.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -295 +295 @@
 
     pad->GetPad(2)->cd(1);
-    if (gPad->FindObject(Form("Proj_%p", this)))
-    {
-        TH1 *h=fHist->Projection(Form("Proj_%p", this));
+    if (gPad->FindObject("Proj"))
+    {
+        TH1 *h=fHist->Projection("Proj");
         if (h->GetMaximum()>0)
             gPad->SetLogy();
@@ -303 +303 @@
 
     pad->GetPad(2)->cd(2);
-    if (gPad->FindObject(Form("ProfR_%p", this)))
-        fHist->RadialProfile(Form("ProfR_%p", this));
+    if (gPad->FindObject("ProfRad"))
+        fHist->RadialProfile("ProfRad");
 
     pad->GetPad(2)->cd(3);
-    if (gPad->FindObject(Form("ProfA_%p", this)))
-        fHist->AzimuthProfile(Form("ProfA_%p", this));
+    if (gPad->FindObject("ProfAz"))
+        fHist->AzimuthProfile("ProfAz");
 }
 
@@ -341 +341 @@
     gPad->SetBorderMode(0);
 
-    TH1 *h = fHist->Projection(Form("Proj_%p", this), 50);
+    TH1 *h = fHist->Projection("Proj", 50);
     h->SetTitle("Projection");
     h->SetBit(kCanDelete);
@@ -349 +349 @@
     gPad->SetBorderMode(0);
 
-    h = (TH1*)fHist->RadialProfile(Form("ProfR_%p", this), 20);
+    h = (TH1*)fHist->RadialProfile("ProfRad", 20);
     h->SetTitle("Radial Profile");
     h->SetBit(kCanDelete|TH1::kNoStats);
@@ -356 +356 @@
     pad->cd(3);
     gPad->SetBorderMode(0);
-    h = (TH1*)fHist->AzimuthProfile(Form("ProfA_%p", this), 30);
+    h = (TH1*)fHist->AzimuthProfile("ProfAz", 30);
     h->SetTitle("Azimuth Profile");
     h->SetBit(kCanDelete|TH1::kNoStats);

trunk/MagicSoft/Mars/mhist/MHWeather.cc

@@ -249 +249 @@
     axis->SetTitleOffset(1.2);
     axis->SetTextColor(col);
+    axis->SetLabelColor(col);
     axis->SetBit(kCanDelete);
     axis->Draw();
@@ -281 +282 @@
     gPad->SetGridx();
     gPad->SetGridy();
-    fHumidity.Draw("AP");
+     fHumidity.Draw("AP");
     fCloudiness.Draw("P");
     DrawRightAxis("Cloudiness [%]");
@@ -340 +341 @@
     if (gPad)
     {
-        fTemperature.GetHistogram()->GetYaxis()->SetTitleColor(kRed);
-        //fTempSky.GetHistogram()->GetYaxis()->SetTitleColor(kBlue);
+        fTemperature.GetYaxis()->SetLabelColor(kRed);
+        fTemperature.GetYaxis()->SetTitleColor(kRed);
         UpdateRightAxis(fTemperature); // Primary axis
     }
@@ -348 +349 @@
     if (gPad)
     {
-        fHumidity.GetHistogram()->GetYaxis()->SetTitleColor(kBlue);
-        fHumidity.GetHistogram()->GetYaxis()->SetTitleOffset(1.2);
+        fHumidity.GetYaxis()->SetLabelColor(kBlue);
+        fHumidity.GetYaxis()->SetTitleColor(kBlue);
+        fHumidity.GetYaxis()->SetTitleOffset(1.2);
         UpdateRightAxis(fHumidity);    // Primary axis
     }