Changeset 2563 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/23/03 21:18:30 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEvent.cc (modified) (2 diffs)
• MHCamera.cc (modified) (6 diffs)
• MHCamera.h (modified) (2 diffs)
• MHEvent.cc (modified) (1 diff)
• MHTriggerLvl0.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -124 +124 @@
     if (!evt)
     {
-        *fLog << err << dbginf << "No MCamEvent found..." << endl;
+        *fLog << err << dbginf << "Got no MCamEvent as argument of Fill()..." << endl;
         return kFALSE;
     }
     fSum->AddCamContent(*evt, fType);
-
+    fRms->SetCamContent(*fSum, 1);
     return kTRUE;
 }
@@ -138 +138 @@
 Bool_t MHCamEvent::Finalize()
 {
-    fRms->AddCamContent(*fSum, 1);
+    //fRms->AddCamContent(*fSum, 1);
     return kTRUE;
 }

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -299 +299 @@
 {
     if (fMinimum != -1111)
-        return Profile(fMinimum);
+        return fMinimum;
 
     if (fNcells<=1)
@@ -329 +329 @@
 {
     if (fMaximum!=-1111)
-        return Profile(fMaximum);
+        return fMaximum;
 
     if (fNcells<=1)
@@ -359 +359 @@
 // To draw a camera into its own pad do something like:
 //
-// MGeomCamMagic m;
-// MHCamera *d=new MHCamera(m);
-//
-// TCanvas *c = new TCanvas;
-// c->Divide(2,1);
-// c->cd(1);
-//
-// d->FillRandom();
-// d->Draw();
-// d->SetBit(kCanDelete);
+//   MGeomCamMagic m;
+//   MHCamera *d=new MHCamera(m);
+//
+//   TCanvas *c = new TCanvas;
+//   c->Divide(2,1);
+//   c->cd(1);
+//
+//   d->FillRandom();
+//   d->Draw();
+//   d->SetBit(kCanDelete);
+//
+// There are several drawing options:
+//   'hist'        Draw as a standard TH1 histogram (value vs. pixel index)
+//   'box'         Draw hexagons which size is in respect to its contents
+//   'nocol'       Leave the 'boxed' hexagons empty
+//   'pixelindex'  Display the pixel index in each pixel
+//   'sectorindex' Display the sector index in each pixel
+//   'content'     Display the relative content aligned to GetMaximum() and
+//                 GeMinimum() ((val-min)/(max-min))
 //
 void MHCamera::Draw(Option_t *option)
@@ -570 +579 @@
 
     if (opt.Contains("pixelindex"))
-        PaintIndices(kFALSE);
+        PaintIndices(0);
     if (opt.Contains("sectorindex"))
-        PaintIndices(kTRUE);
+        PaintIndices(1);
+    if (opt.Contains("content"))
+        PaintIndices(2);
 }
 
@@ -632 +643 @@
 }
 
-void MHCamera::PaintIndices(Bool_t sector)
+void MHCamera::PaintIndices(Int_t type)
 {
     if (fNcells<=1)
+        return;
+
+    const Double_t min = GetMinimum();
+    const Double_t max = GetMaximum();
+
+    if (type==2 && max==min)
         return;
 
@@ -646 +663 @@
 
         TString num;
-        num += sector ? h.GetSector() : i;
+        switch (type)
+        {
+        case 0: num += i; break;
+        case 1: num += h.GetSector(); break;
+        case 2: num += (Int_t)((fArray[i+1]-min)/(max-min)); break;
+        }
 
         txt.SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius()/1.05);

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -30 +30 @@
 public:
     enum {
-        kProfile  = BIT(18),
+        kProfile  = BIT(18), // FIXME: When changing change max/min!
         kFreezed  = BIT(19),
         kNoLegend = BIT(20)
@@ -59 +59 @@
     Int_t GetColor(Float_t val, Float_t min, Float_t max, Bool_t islog);
 
-    void  PaintIndices(Bool_t sector);
+    void  PaintIndices(Int_t type);
     void  Update(Bool_t islog, Bool_t isbox, Bool_t iscol);
     void  UpdateLegend(Float_t min, Float_t max, Bool_t islog);

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -200 +200 @@
     {
         s += "Run #";
-        s += fRawRunHeader->GetNumEvents();
+        s += fRawRunHeader->GetRunNumber();
     }
 

trunk/MagicSoft/Mars/mhist/MHTriggerLvl0.cc

@@ -126 +126 @@
     if (!evt)
     {
-        *fLog << err << dbginf << "No MCamEvent found..." << endl;
+        *fLog << err << dbginf << "Got no MCamEvent as argument of Fill()..." << endl;
         return kFALSE;
     }