Changeset 1599 for trunk/MagicSoft

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• manalysis/MHillas.cc (modified) (2 diffs)
• mfileio/MCT1ReadPreProc.cc (modified) (1 diff)
• mhist/MH3.cc (modified) (6 diffs)
• mhist/MHHadronness.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/11/11: Thomas Bretz
+
+   * manalysis/MHillas.cc:
+     - moved division by size before test of number of used pixels
+
+   * mfileio/MCT1ReadPreProc.cc:
+     - added a eof-conditional
+
+   * mhist/MH3.cc:
+     - added a 'nonew' option to DrawClone
+
+   * mhist/MHHadronness.cc:
+     - check for NaN in Fill
+
+
+
  2002/11/08: Oscar Blanch
 
    * mgeom/MGeomPMT.[h,cc]:
      - added
-     - Infromation about simulated QE
-
-   * mgeom/MGeomMirror.[h,cc];
+     - Information about simulated QE
+
+   * mgeom/MGeomMirror.[h,cc]:
      - added
      - Mirrors properties
@@ -13 +30 @@
      - modified to compile new classes
 
-   * mmc/MMcConfigRunHeader.[h,cc]
-     -added
-
-   *mmc/Makefile
-     -modified to compile new classes
+   * mmc/MMcConfigRunHeader.[h,cc]:
+     - added
+
+   * mmc/Makefile:
+     - modified to compile new classes
+
+
 
  2002/11/08: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -289 +289 @@
     }
 
+    fMeanX /= fSize;                                 // [mm]
+    fMeanY /= fSize;                                 // [mm]
+
     if (fNumUsedPixels<3)
     {
@@ -294 +297 @@
         return 3;
     }
-
-    fMeanX /= fSize;                                 // [mm]
-    fMeanY /= fSize;                                 // [mm]
 
     //

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -732 +732 @@
     fIn->read((Byte_t*)&event, size1+size2);
 
+    if (fIn->eof())
+        return kFALSE;
+
     ProcessEvent(event);
 

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;