Changeset 1599 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/11/02 10:21:55 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MH3.cc (modified) (6 diffs)
• MHHadronness.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MH3.cc

@@ -420 +420 @@
 TObject *MH3::DrawClone(Option_t *opt) const
 {
-    TCanvas &c = *MH::MakeDefCanvas(fHist);
-
-    //
-    // This is necessary to get the expected bahviour of DrawClone
-    //
-    gROOT->SetSelectedPad(NULL);
-
     TString str(opt);
+
+    TVirtualPad *c = gPad;
+    if (!str.Contains("nonew", TString::kIgnoreCase))
+    {
+        c = MH::MakeDefCanvas(fHist);
+
+        //
+        // This is necessary to get the expected bahviour of DrawClone
+        //
+        gROOT->SetSelectedPad(NULL);
+    }
 
     if (str.Contains("COL", TString::kIgnoreCase))
@@ -439 +443 @@
     {
         TProfile *p = ((TH2*)fHist)->ProfileX("_pfx", -1, 9999, "s");
+        p->SetLineColor(kBlue);
         p->Draw(only?"":"same");
         p->SetBit(kCanDelete);
@@ -446 +451 @@
     {
         TProfile *p = ((TH2*)fHist)->ProfileY("_pfy", -1, 9999, "s");
+        p->SetLineColor(kBlue);
         p->Draw(only?"":"same");
         p->SetBit(kCanDelete);
@@ -451 +457 @@
     }
 
-    if (fHist->TestBit(kIsLogx)) c.SetLogx();
-    if (fHist->TestBit(kIsLogy)) c.SetLogy();
-    if (fHist->TestBit(kIsLogz)) c.SetLogz();
-
-    c.Modified();
-    c.Update();
-
-    return &c;
+    if (fHist->TestBit(kIsLogx)) c->SetLogx();
+    if (fHist->TestBit(kIsLogy)) c->SetLogy();
+    if (fHist->TestBit(kIsLogz)) c->SetLogz();
+
+    c->Modified();
+    c->Update();
+
+    return c;
 }
 
@@ -493 +499 @@
     {
         TProfile *p = ((TH2*)fHist)->ProfileX("_pfx", -1, 9999, "s");
+        p->SetLineColor(kBlue);
         p->Draw(only?"":"same");
         p->SetBit(kCanDelete);
@@ -500 +507 @@
     {
         TProfile *p = ((TH2*)fHist)->ProfileY("_pfy", -1, 9999, "s");
+        p->SetLineColor(kBlue);
         p->Draw(only?"":"same");
         p->SetBit(kCanDelete);

trunk/MagicSoft/Mars/mhist/MHHadronness.cc

@@ -182 +182 @@
 // histogram dependant on the particle id.
 //
+// Sometimes a distance is calculated as NaN (not a number). Such events
+// are skipped at the moment.
+//
 Bool_t MHHadronness::Fill(const MParContainer *par)
 {
+    // Preliminary Workaround: FIXME!
+
+    const Double_t h = fHadronness->GetHadronness();
+
+    if (TMath::IsNaN(h))
+        return kCONTINUE;
+
     if (fMcEvt->GetPartId()==kGAMMA)
-        fGhness->Fill(fHadronness->GetHadronness());
+        fGhness->Fill(h);
     else
-        fPhness->Fill(fHadronness->GetHadronness());
+        fPhness->Fill(h);
 
     return kTRUE;