Changeset 2208

Timestamp:

06/23/03 11:48:53 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mreflector/MRflEvtData.cc (modified) (3 diffs)
• mreflector/MRflEvtData.h (modified) (3 diffs)
• mreflector/Makefile (modified) (1 diff)
• mtools/MChisqEval.cc (modified) (3 diffs)
• mtools/MChisqEval.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mreflector/MRflEvtData.cc

@@ -42 +42 @@
 #include "MLogManip.h"
 
+#include "MHexagon.h"
+#include "MGeomCam.h"
+
+#include "MRflSinglePhoton.h"
+
 ClassImp(MRflEvtData);
 
@@ -55 +60 @@
     fName  = name  ? name  : "MRflEvtData";
     fTitle = title ? title : "All Photons from a reflector event";
+}
+
+const MRflSinglePhoton &MRflEvtData::GetPhoton(Int_t i) const
+{
+    return *static_cast<MRflSinglePhoton*>(fList.UncheckedAt(i));
 }
 
@@ -91 +101 @@
 }
 
+void MRflEvtData::DrawPixelContent(Int_t num) const
+{
+}
+
+// ------------------------------------------------------------------------
+//
+// Fill a reflector event. Sums all pixels in each pixel as the
+// pixel contents.
+//
+// WARNING: Due to the estimation in DistanceToPrimitive and the
+//          calculation in pixels instead of x, y this is only a
+//          rough estimate.
+//
+Bool_t MRflEvtData::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
+{
+    //
+    // sum the photons content in each pixel
+    //
+    const Int_t entries = GetNumPhotons();
+
+    val = 0;
+
+    for (Int_t i=0; i<entries; i++)
+    {
+        const MRflSinglePhoton &ph = GetPhoton(i);
+
+        UInt_t idx;
+        for (idx=0; idx<cam.GetNumPixels(); idx++)
+        {
+            MHexagon hex(cam[idx]);
+            if (hex.DistanceToPrimitive(ph.GetX(), ph.GetY())<0)
+                break;
+        }
+        if (idx==cam.GetNumPixels())
+            continue;
+
+        val += cam.GetPixRatio(idx);
+    }
+
+    return val>0;
+}

trunk/MagicSoft/Mars/mreflector/MRflEvtData.h

@@ -2 +2 @@
 #define MARS_MRflEvtData
 
-#ifndef MARS_MRflSinglePhoton
-#include "MRflSinglePhoton.h"
+#ifndef MARS_MCamEvent
+#include "MCamEvent.h"
 #endif
 
@@ -10 +10 @@
 #endif
 
-class MRflEvtData : public MParContainer
+class MRflSinglePhoton;
+
+class MRflEvtData : public MCamEvent
 {
     TClonesArray fList;
@@ -25 +27 @@
     void FixSize();
 
-    const MRflSinglePhoton &GetPhoton(Int_t i) const { return (MRflSinglePhoton&)*fList.UncheckedAt(i); }
+    const MRflSinglePhoton &GetPhoton(Int_t i) const;
 
     void Print(Option_t *o="") const;
+
+    Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
+    void   DrawPixelContent(Int_t num) const;
 
     ClassDef(MRflEvtData, 0) // All Photons of a event from the reflector program

trunk/MagicSoft/Mars/mreflector/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase
+INCLUDES = -I. -I../mbase -I../mgui -I../mgeom
 
 #------------------------------------------------------------------------------

trunk/MagicSoft/Mars/mtools/MChisqEval.cc

@@ -106 +106 @@
 }
 
-Bool_t MChisqEval::PreProcess(MParList *plist)
+Int_t MChisqEval::PreProcess(MParList *plist)
 {
     fChisq = 0;
@@ -123 +123 @@
 }
 
-Bool_t MChisqEval::Process()
+Int_t MChisqEval::Process()
 {
     const Double_t y1 = fData0->GetValue();
@@ -135 +135 @@
 }
 
-Bool_t MChisqEval::PostProcess()
+Int_t MChisqEval::PostProcess()
 {
     fChisq /= GetNumExecutions();

trunk/MagicSoft/Mars/mtools/MChisqEval.h

@@ -29 +29 @@
     enum { kIsOwner = BIT(14) };
 
+    Int_t PreProcess(MParList *plist);
+    Int_t Process();
+    Int_t PostProcess();
+
 public:
     MChisqEval(const char *name=NULL, const char *title=NULL);
@@ -42 +46 @@
     void SetOwner(Bool_t o=kTRUE) { o ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
 
-    Bool_t PreProcess(MParList *plist);
-    Bool_t Process();
-    Bool_t PostProcess();
-
     Double_t GetChisq() const { return fChisq; }