Changeset 2209 for trunk/MagicSoft/Mars/mhist

Timestamp:

06/23/03 12:09:05 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MH.cc (modified) (3 diffs)
• MHCamEvent.cc (added)
• MHCamEvent.h (added)
• MHCamera.cc (added)
• MHCamera.h (added)
• MHSigmaTheta.cc (modified) (2 diffs)
• MHTriggerLvl0.cc (added)
• MHTriggerLvl0.h (added)

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -652 +652 @@
     // Rename first statistics box
     //
-    TPaveStats &s1 = *(TPaveStats*)gPad->FindObject("stats");
-    const Double_t x1 = s1.GetX1NDC()-0.01;
-    s1.SetName((TString)"Stat"+hist1.GetTitle());
-    s1.SetX1NDC(x1-(s1.GetX2NDC()-s1.GetX1NDC()));
-    s1.SetX2NDC(x1);
+    TPaveStats *s1 = (TPaveStats*)gPad->FindObject("stats");
+    if (!s1)
+        s1 = (TPaveStats*)hist1.GetListOfFunctions()->FindObject("stats");
+    else
+        s1->SetName((TString)"Stat"+hist1.GetTitle());
+
+    if (s1 && s1->GetX2NDC()>0.95)
+    {
+        const Double_t x1 = s1->GetX1NDC()-0.01;
+        s1->SetX1NDC(x1-(s1->GetX2NDC()-s1->GetX1NDC()));
+        s1->SetX2NDC(x1);
+    }
 
     //
@@ -667 +674 @@
     // Draw Legend
     //
-    TPaveStats &s2 = *(TPaveStats*)gPad->FindObject("stats");
-    TLegend &l = *new TLegend(s2.GetX1NDC(),
-                              s2.GetY1NDC()-0.015-(s2.GetY2NDC()-s2.GetY1NDC())/2,
-                              s2.GetX2NDC(),
-                              s2.GetY1NDC()-0.01
-                             );
-    l.AddEntry(h1, h1->GetTitle());
-    l.AddEntry(h2, h2->GetTitle());
-    l.SetTextSize(s2.GetTextSize());
-    l.SetTextFont(s2.GetTextFont());
-    l.SetBorderSize(s2.GetBorderSize());
-    l.SetBit(kCanDelete);
-    l.Draw();
+    TPaveStats *s2 = (TPaveStats*)gPad->FindObject("stats");
+    if (!s2)
+        s2 = (TPaveStats*)hist2.GetListOfFunctions()->FindObject("stats");
+
+    if (s2)
+    {
+        TLegend &l = *new TLegend(s2->GetX1NDC(),
+                                  s2->GetY1NDC()-0.015-(s2->GetY2NDC()-s2->GetY1NDC())/2,
+                                  s2->GetX2NDC(),
+                                  s2->GetY1NDC()-0.01
+                                 );
+        l.AddEntry(h1, h1->GetTitle());
+        l.AddEntry(h2, h2->GetTitle());
+        l.SetTextSize(s2->GetTextSize());
+        l.SetTextFont(s2->GetTextFont());
+        l.SetBorderSize(s2->GetBorderSize());
+        l.SetBit(kCanDelete);
+        l.Draw();
+    }
 }
 
@@ -740 +753 @@
         s1->SetName((TString)"Stat"+hist1.GetTitle());
 
-    if (s1)
+    if (s1 && s1->GetX2NDC()>0.95)
     {
         const Double_t x1 = s1->GetX1NDC()-0.01;

trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc

@@ -115 +115 @@
     fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
     if (!fMcEvt)
-    {
-        *fLog << err << "MMcEvt not found... aborting." << endl;
-        return kFALSE;
-    }
+        *fLog << warn << "MMcEvt not found... aborting." << endl;
 
     fPed = (MPedestalCam*)plist->FindObject("MPedestalCam");
@@ -193 +190 @@
 Bool_t MHSigmaTheta::Fill(const MParContainer *par, const Stat_t w)
 {
-    Double_t theta = fMcEvt->GetTelescopeTheta()*kRad2Deg;
+    Double_t theta = fMcEvt ? fMcEvt->GetTelescopeTheta()*kRad2Deg : 0;
     Double_t mysig = fSigmabar->Calc(*fCam, *fPed, *fEvt);