Changeset 1203 for trunk/MagicSoft

Timestamp:

01/21/02 20:52:12 (23 years ago)

Author:

rkb

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• Mars/NEWS (modified) (1 diff)
• Mars/manalysis/AnalysisLinkDef.h (modified) (1 diff)
• Mars/manalysis/MCerPhotEvt.cc (modified) (3 diffs)
• Mars/manalysis/MCerPhotEvt.h (modified) (2 diffs)
• Mars/manalysis/MHillas.cc (modified) (12 diffs)
• Mars/manalysis/MHillas.h (modified) (3 diffs)
• Mars/manalysis/MHillasCalc.cc (modified) (2 diffs)
• Mars/manalysis/MHillasCalc.h (modified) (1 diff)
• Mars/manalysis/MHillasExt.cc (added)
• Mars/manalysis/MHillasExt.h (added)
• Mars/manalysis/MHillasSrc.cc (added)
• Mars/manalysis/MHillasSrc.h (added)
• Mars/manalysis/MHillasSrcCalc.cc (added)
• Mars/manalysis/MHillasSrcCalc.h (added)
• Mars/manalysis/MImgCleanStd.cc (modified) (1 diff)
• Mars/manalysis/MSrcPosCam.cc (added)
• Mars/manalysis/MSrcPosCam.h (added)
• Mars/manalysis/Makefile (modified) (1 diff)
• Mars/mbase/MParContainer.cc (modified) (2 diffs)
• Mars/mbase/MReadMarsFile.cc (modified) (1 diff)
• Mars/mbase/MReadTree.cc (modified) (2 diffs)
• Mars/mbase/MReadTree.h (modified) (1 diff)
• Mars/mgui/MCamDisplay.cc (modified) (5 diffs)
• Mars/mgui/MCamDisplay.h (modified) (2 diffs)
• Mars/mhist/HistLinkDef.h (modified) (1 diff)
• Mars/mhist/MHHillas.cc (modified) (7 diffs)
• Mars/mhist/MHHillas.h (modified) (2 diffs)
• Mars/mhist/MHHillasSrc.cc (added)
• Mars/mhist/MHHillasSrc.h (added)
• Mars/mhist/MHStarMap.cc (modified) (4 diffs)
• Mars/mhist/MHStarMap.h (modified) (2 diffs)
• Mars/mhist/Makefile (modified) (2 diffs)
• include-Classes/MMcFormat/MMcEvt.cxx (modified) (2 diffs)
• include-Classes/MMcFormat/MMcEvt.hxx (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/01/19: Thomas Bretz
+ 
+   * mbase/MParContainer.cc:
+     - generalized virtual function AsciiWrite
+   
+   * changed to fit new MHillas inhertance model:
+     - manalysis/MHillas.[h,cc]
+     - manalysis/MHillasCalc.[h,cc]
+     - mhist/MHHillas.[h,cc]
+     - mhist/MHStarMap.[h,cc]
+
+   * added to fit new MHillas inhertance model:
+     - manalysis/MSrcPosCam.[h,cc]
+     - manalysis/MHillasSrc.[h,cc]
+     - manalysis/MHillasSrcCalc.[h,cc]
+     - manalysis/MHillasExt.[h,cc]
+     - mhist/MHHillasSrc.[h,cc]
+
+   * manalysis/MCerPhotEvt.[cc,h]:
+     - introduced weighting with pixel size in GetNumPhotonsMin
+     - introduced weighting with pixel size in GetNumPhotonsMax
+
+   * mgui/MCamDisplay.cc:
+     - weight the displayed color with the pixel size
+
+
+
  2002/01/18: Thomas Bretz
  

trunk/MagicSoft/Mars/NEWS

@@ -3 +3 @@
  *** Version 0.7
  
+   - Ascii Output can now also be used for parameter containers which
+     doesn't overload MParCointainer::AsciiWrite
+
+   - replaced old MHillas by a new structure which allows you to extend
+     the parameters stored in MHillas very easily.
+
+   - Added classes to handle source dependancy of image parameters.
+
    - Added container (MBinning) to have a standard input for the binning
      in different histograms (eg. the Energy bins should be the same in

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -21 +21 @@
 #pragma link C++ class MMcPedestalNSBAdd+;
 
+#pragma link C++ class MSrcPosCam+;
 #pragma link C++ class MHillas+;
+#pragma link C++ class MHillasSrc+;
+#pragma link C++ class MHillasSrcCalc+;
+#pragma link C++ class MHillasExt+;
 #pragma link C++ class MHillasCalc+;
 

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -32 +32 @@
 
 #include "MLog.h"
+
+#include "MGeomCam.h"
+#include "MGeomPix.h"
+
 #include "MHexagon.h"
 
@@ -148 +152 @@
 // --------------------------------------------------------------------------
 //
-// get the minimum number of photons of all valid pixels in the list
-//
-Float_t MCerPhotEvt::GetNumPhotonsMin() const
+// get the minimum number of photons  of all valid pixels in the list
+// If you specify a geometry the number of photons is weighted with the
+// area of the pixel
+//
+Float_t MCerPhotEvt::GetNumPhotonsMin(const MGeomCam *geom) const
 {
     if (fNumPixels <= 0)
         return -5.;
 
+    const Float_t A0 = geom ? (*geom)[0].GetA() : 0;
+
     Float_t minval = (*this)[0].GetNumPhotons();
 
     for (UInt_t i=1; i<fNumPixels; i++)
     {
-        const Float_t testval = (*this)[i].GetNumPhotons();
+        const MCerPhotPix &pix = (*this)[i];
+
+        Float_t testval = pix.GetNumPhotons();
+
+        if (geom)
+            testval *= A0/(*geom)[pix.GetPixId()].GetA();
 
         if (testval < minval)
@@ -171 +184 @@
 //
 // get the maximum number of photons of all valid pixels in the list
-//
-Float_t MCerPhotEvt::GetNumPhotonsMax() const
+// If you specify a geometry the number of photons is weighted with the
+// area of the pixel
+//
+Float_t MCerPhotEvt::GetNumPhotonsMax(const MGeomCam *geom) const
 {
     if (fNumPixels <= 0)
         return 50.;
 
+    const Float_t A0 = geom ? (*geom)[0].GetA() : 0;
     Float_t maxval = (*this)[0].GetNumPhotons();
 
     for (UInt_t i=1; i<fNumPixels; i++)
     {
-        const Float_t testval = (*this)[i].GetNumPhotons();
+        const MCerPhotPix &pix = (*this)[i];
+
+        Float_t testval = pix.GetNumPhotons();
+
+        if (geom)
+            testval *= A0/(*geom)[pix.GetPixId()].GetA();
 
         if (testval > maxval)

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -9 +9 @@
 #endif
 
+class MGeomCam;
 class MCerPhotPix;
 
@@ -34 +35 @@
     Bool_t  IsPixelCore    (Int_t id) const;
 
-    Float_t GetNumPhotonsMin() const;
-    Float_t GetNumPhotonsMax() const;
+    Float_t GetNumPhotonsMin(const MGeomCam *geom=NULL) const;
+    Float_t GetNumPhotonsMax(const MGeomCam *geom=NULL) const;
 
     MCerPhotPix &operator[](int i)       { return *(MCerPhotPix*)(fPixels->UncheckedAt(i)); }

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
+!   Author(s): Thomas Bretz    12/2000 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Harald Kornmayer 1/2001
+!   Author(s): Rudolf Bock     10/2001 <mailto:Rudolf.Bock@cern.ch>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -25 +26 @@
 
 /////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-// MHillas                                                                 //
-//                                                                         //
-// Storage Container for the Hillas parameter                              //
-//                                                                         //
-// FIXME: - Here everybody should find an explanation of the parameters    //
-//        - using boooleans for fIsPixelUsed, fIsPixelCore, ... is rather  //
-//          slow because you have to loop over all pixels in any loop.     //
-//          There could be a huge speed improvement using Hash Tables      //
-//          (linked lists, see THashTable and THashList, too)              //
-//                                                                         //
+//
+// MHillas
+//
+// Storage Container for image parameters
+//
+//    basic image parameters
+// fLength   major axis of ellipse
+// fWidth    minor axis
+// fDelta    angle of major axis wrt x-axis
+// fSize     total sum of pixels
+// fMeanx    x of center of ellipse
+// fMeany    y of center of ellipse
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MHillas.h"
 
-#include <math.h>
 #include <fstream.h>
 
@@ -51 +53 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
 
 ClassImp(MHillas);
@@ -61 +64 @@
 {
     fName  = name  ? name  : "MHillas";
-    fTitle = title ? title : "Storage container for Hillas parameter of one event";
+    fTitle = title ? title : "Storage container for image parameters of one event";
 
     Reset();
     // FIXME: (intelligent) initialization of values missing
+
+    fEllipse = new TEllipse;
 }
 
@@ -76 +81 @@
 }
 
+// --------------------------------------------------------------------------
+//
 void MHillas::Reset()
 {
-    fAlpha  = 0;
-    fTheta  = 0;
+    fLength = 0;
     fWidth  = 0;
-    fLength = 0;
+    fDelta  = 0;
     fSize   = 0;
-    fDist   = 0;
+    fMeanx  = 0;
+    fMeany  = 0;
 
     Clear();
@@ -94 +101 @@
 void MHillas::Print(Option_t *) const
 {
-    *fLog << "Hillas Parameter: " << GetDescriptor() << endl;
-    *fLog << " - Alpha  = " << fabs(fAlpha) << " deg" << endl;
-    *fLog << " - Width  = " << fWidth  << " mm"       << endl;
-    *fLog << " - Length = " << fLength << " mm"       << endl;
-    *fLog << " - Size   = " << fSize   << " #CerPhot" << endl;
-    *fLog << " - Dist   = " << fDist   << " mm"       << endl;
+    Double_t atg = atan2(fMeany, fMeanx)*kRad2Deg;
+
+    if (atg<0)
+        atg += 180;
+
+    *fLog << all;
+    *fLog << "Basic Image Parameters (" << GetName() << ")" << endl;
+    *fLog << " - Length   [mm]  = " << fLength << endl;
+    *fLog << " - Width    [mm]  = " << fWidth  << endl;
+    *fLog << " - Meanx    [mm]  = " << fMeanx  << endl;
+    *fLog << " - Meany    [mm]  = " << fMeany  << endl;
+    *fLog << " - Delta    [deg] = " << fDelta*kRad2Deg << endl;
+    *fLog << " - atg(y/x) [deg] = " << atg     << endl;
+    *fLog << " - Size     [1]   = " << fSize   << " #CherPhot"   << endl;
 }
 
 /*
-// --------------------------------------------------------------------------
+// -----------------------------------------------------------
 //
 // call the Paint function of the Ellipse if a TEllipse exists
 //
 void MHillas::Paint(Option_t *)
+{
+     fEllipse->SetLineWidth(2);
+     fEllipse->PaintEllipse(fMeanx, fMeany, fLength, fWidth,
+                            0, 360, fDelta*kRad2Deg+180);
+}
+*/
+
+// --------------------------------------------------------------------------
+//
+// Instead of adding MHillas itself to the Pad
+// (s. AppendPad in TObject) we create an ellipse,
+// which is added to the Pad by its Draw function
+// You can remove it by deleting the Ellipse Object
+// (s. Clear() )
+//
+void MHillas::Draw(Option_t *opt)
+{
+
+    Clear();
+
+    fEllipse = new TEllipse(fMeanx, fMeany, fLength, fWidth,
+                            0, 360, fDelta*kRad2Deg+180);
+
+    fEllipse->SetLineWidth(2);
+    fEllipse->Draw();
+
+    /*
+     fEllipse->SetPhimin();
+     fEllipse->SetPhimax();
+     fEllipse->SetR1(fLength);
+     fEllipse->SetR2(fWidth);
+     fEllipse->SetTheta(fDelta*kRad2Deg+180);
+     fEllipse->SetX1(fMeanx);
+     fEllipse->SetY1(fMeany);
+
+     fEllipse->SetLineWidth(2);
+     fEllipse->PaintEllipse(fMeanx, fMeany, fLength, fWidth,
+                            0, 360, fDelta*kRad2Deg+180);
+
+      AppendPad(opt);
+
+     // This is from TH1
+     TString opt = option;
+     opt.ToLower();
+     if (gPad && !opt.Contains("same")) {
+        //the following statement is necessary in case one attempts to draw
+        //a temporary histogram already in the current pad
+      if (TestBit(kCanDelete)) gPad->GetListOfPrimitives()->Remove(this);
+      gPad->Clear();
+      }
+      */
+}
+
+// --------------------------------------------------------------------------
+//
+// If a TEllipse object exists it is deleted
+//
+void MHillas::Clear(Option_t *)
 {
     if (!fEllipse)
         return;
 
-    fEllipse->Paint();
-}
-*/
-
-// --------------------------------------------------------------------------
-//
-// Instead of adding MHillas itself to the Pad
-// (s. AppendPad in TObject) we create an ellipse,
-// which is added to the Pad by it's Draw function
-// You can remove it by deleting the Ellipse Object
-// (s. Clear() )
-//
-void MHillas::Draw(Option_t *opt)
-{
-    Clear();
-
-    fEllipse = new TEllipse(cos(fTheta)*fDist, sin(fTheta)*fDist,
-                            fLength, fWidth,
-                            0, 360, fTheta*kRad2Deg+fAlpha-180);
-
-    fEllipse->SetLineWidth(2);
-    fEllipse->Draw();
-    //AppendPad(opt);
-
-    /*
-     This is from TH1
-     TString opt = option;
-   opt.ToLower();
-   if (gPad && !opt.Contains("same")) {
-      //the following statement is necessary in case one attempts to draw
-      //a temporary histogram already in the current pad
-      if (TestBit(kCanDelete)) gPad->GetListOfPrimitives()->Remove(this);
-      gPad->Clear();
-   }
-   AppendPad(opt.Data());
-   */
-}
-
-// --------------------------------------------------------------------------
-//
-// If a TEllipse object exists it is deleted
-//
-void MHillas::Clear(Option_t *)
-{
-    if (!fEllipse)
-        return;
-
     delete fEllipse;
 
@@ -164 +190 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Calculate the Hillas parameters from a cerenkov photon event
-// (The calcualtion is some kind of two dimentional statistics)
-//
-//   FIXME: MHillas::Calc is rather slow at the moment because it loops
-//          unnecessarily over all pixels in all its loops (s.MImgCleanStd)
-//          The speed could be improved very much by using Hash-Tables
-//          (linked lists, see THashTable and THashList, too)
+
+// --------------------------------------------------------------------------
+//
+// Calculate the image parameters from a Cherenkov photon event
+// assuming Cher.photons/pixel and pixel coordinates are given
 //
 Bool_t MHillas::Calc(const MGeomCam &geom, const MCerPhotEvt &evt)
 {
-    const UInt_t nevt = evt.GetNumPixels();
+    // FIXME: MHillas::Calc is rather slow at the moment because it loops
+    //    unnecessarily over all pixels in all its loops (s.MImgCleanStd)
+    //    The speed could be improved very much by using Hash-Tables
+    //    (linked lists, see THashTable and THashList, too)
+    //
+
+    const UInt_t npixevt = evt.GetNumPixels();
 
     //
     // sanity check
     //
-    if (nevt <= 2)
+    if (npixevt <= 2)
         return kFALSE;
 
     //
-    // calculate mean valu of pixels
-    //
-    float xmean =0;
-    float ymean =0;
-
-    fSize = 0;
+    // calculate mean value of pixel coordinates and fSize
+    // -----------------------------------------------------
+    //
+    fMeanx = 0;
+    fMeany = 0;
+    fSize  = 0;
 
     //
@@ -196 +224 @@
     //
     UShort_t npix=0;
-    for (UInt_t i=0; i<nevt; i++)
+    for (UInt_t i=0; i<npixevt; i++)
     {
         const MCerPhotPix &pix = evt[i];
@@ -207 +235 @@
         const float nphot = pix.GetNumPhotons();
 
-        fSize += nphot;
-        xmean += nphot * gpix.GetX(); // [mm]
-        ymean += nphot * gpix.GetY(); // [mm]
+        fSize  += nphot;                             // [counter]
+        fMeanx += nphot * gpix.GetX();               // [mm]
+        fMeany += nphot * gpix.GetY();               // [mm]
 
         npix++;
@@ -220 +248 @@
         return kFALSE;
 
-    xmean /= fSize; // [mm]
-    ymean /= fSize; // [mm]
-
-    //
-    // calculate sdev
-    //
-    float sigmaxx=0;
-    float sigmaxy=0;
-    float sigmayy=0;
-
-    for (UInt_t i=0; i<nevt; i++)
+    fMeanx /= fSize;                                 // [mm]
+    fMeany /= fSize;                                 // [mm]
+
+    //
+    // calculate 2nd moments
+    // -------------------
+    //
+    float corrxx=0;                                  // [m^2]
+    float corrxy=0;                                  // [m^2]
+    float corryy=0;                                  // [m^2]
+
+    for (UInt_t i=0; i<npixevt; i++)
     {
         const MCerPhotPix &pix = evt[i];
@@ -238 +267 @@
 
         const MGeomPix &gpix = geom[pix.GetPixId()];
-
-        const float dx = gpix.GetX() - xmean;
-        const float dy = gpix.GetY() - ymean;
-
-        const float nphot = pix.GetNumPhotons();
-
-        sigmaxx += nphot * dx*dx; // [mm^2]
-        sigmaxy += nphot * dx*dy; // [mm^2]
-        sigmayy += nphot * dy*dy; // [mm^2]
+        const float dx = gpix.GetX() - fMeanx;       // [mm]
+        const float dy = gpix.GetY() - fMeany;       // [mm]
+
+        const float nphot = pix.GetNumPhotons();     // [#phot]
+
+        corrxx += nphot * dx*dx;                     // [mm^2]
+        corrxy += nphot * dx*dy;                     // [mm^2]
+        corryy += nphot * dy*dy;                     // [mm^2]
     }
 
     //
-    // check for orientation
-    //
-    const float theta = atan(sigmaxy/(sigmaxx-sigmayy)*2)/2;
-
-    float c = cos(theta); // [1]
-    float s = sin(theta); // [1]
-
-    //
-    // calculate the length of the two axis
-    //
-    float axis1 =  2.0*c*s*sigmaxy + c*c*sigmaxx + s*s*sigmayy; // [mm^2]
-    float axis2 = -2.0*c*s*sigmaxy + s*s*sigmaxx + c*c*sigmayy; // [mm^2]
-
-    axis1 /= fSize; // [mm^2]
-    axis2 /= fSize; // [mm^2]
-
-    //
-    // check for numerical negatives
-    // (very small number can get negative by chance)
-    //
+    // calculate the basic Hillas parameters: orientation and size of axes
+    // -------------------------------------------------------------------
+    //
+    const float d = corryy - corrxx;
+
+    fDelta = atan2(d + sqrt(d*d + corrxy*corrxy*4), corrxy*2);
+
+    fCosDelta = cos(fDelta);   // need these in derived classes
+    fSinDelta = sin(fDelta);   // like MHillasExt
+
+    float axis1 = ( fCosDelta*fSinDelta*corrxy*2 + fCosDelta*fCosDelta*corrxx + fSinDelta*fSinDelta*corryy) / fSize; // [mm^2]
+    float axis2 = (-fCosDelta*fSinDelta*corrxy*2 + fSinDelta*fSinDelta*corrxx + fCosDelta*fCosDelta*corryy) / fSize; // [mm^2]
+ 
+    // very small numbers can get negative by rounding
     if (axis1 < 0) axis1=0;
-    if (axis2 < 0) axis2=0;
-
-    //
-    // calculate the main Hillas parameters
-    //
-    // fLength, fWidth describes the two axis of the ellipse
-    // fAlpha is the angle between the length-axis and the center
-    //    of the camera
-    // fDist is the distance between the center of the camera and the
-    //    denter of the ellipse
-    //
-    const int rotation = axis1<axis2;
-
-    fLength = rotation ? sqrt(axis2) : sqrt(axis1);  // [mm]
-    fWidth  = rotation ? sqrt(axis1) : sqrt(axis2);  // [mm]
-
-    const float a = c*xmean + s*ymean;
-    const float b = c*ymean - s*xmean;
-
-    fAlpha  = rotation ? atan(a/b) : atan(-b/a);     // [rad]
-    fAlpha *= kRad2Deg;                              // [deg]
-
-    fDist   = sqrt(xmean*xmean + ymean*ymean);       // [mm]
-
-    fTheta  = atan(ymean/xmean);                     // [rad]
-    if (xmean<0) fTheta += kPI;                      // [rad]
+    if (axis2 < 0) axis2=0; 
+
+    fLength = sqrt(axis1);  // [mm]
+    fWidth  = sqrt(axis2);  // [mm]
 
     SetReadyToSave();
@@ -303 +303 @@
 }
 
+// --------------------------------------------------------------------------
+//
 void MHillas::AsciiRead(ifstream &fin)
 {
-    fin >> fAlpha;
-    fin >> fTheta;
+    fin >> fLength;
     fin >> fWidth;
-    fin >> fLength;
+    fin >> fDelta;
     fin >> fSize;
-    fin >> fDist;
-}
-
+    fin >> fMeanx;
+    fin >> fMeany;
+}
+
+// --------------------------------------------------------------------------
+//
 void MHillas::AsciiWrite(ofstream &fout) const
 {
-    fout << fAlpha << " ";
-    fout << fTheta << " ";
-    fout << fWidth << " ";
     fout << fLength << " ";
-    fout << fSize << " ";
-    fout << fDist << endl;
-}
+    fout << fWidth  << " ";
+    fout << fDelta  << " ";
+    fout << fSize   << " ";
+    fout << fMeanx  << " ";
+    fout << fMeany;
+}

trunk/MagicSoft/Mars/manalysis/MHillas.h

@@ -14 +14 @@
 {
 private:
-    Float_t fAlpha;     // [deg] Angle between the length axis of the ellipse and the camera center
-    Float_t fTheta;     // [rad] Angle between the x axis and the center of the ellipse
-    Float_t fWidth;     // [mm]  Width of the ellipse
-    Float_t fLength;    // [mm]  Length of the ellipse
-    Float_t fSize;      // [#CerPhot] Size of the ellipse
-    Float_t fDist;      // [mm] Distance of the ellipse COM from the camera center
+    // for description see MHillas.cc
+    Float_t   fLength;   // [mm]        major axis of ellipse
+    Float_t   fWidth;    // [mm]        minor axis of ellipse
+    Float_t   fDelta;    // [rad]       angle of major axis with x-axis
+    Float_t   fSize;     // [#CerPhot]  sum of content of all pixels (number of Cherenkov photons)
+    Float_t   fMeanx;    // [mm]        x-coordinate of center of ellipse
+    Float_t   fMeany;    // [mm]        y-coordinate of center of ellipse
 
-    TEllipse *fEllipse; //! Graphical Object to Display Ellipse
+    Float_t   fSinDelta; //! [1] sin of Delta (to be used in derived classes)
+    Float_t   fCosDelta; //! [1] cos of Delta (to be used in derived classes)
+
+    TEllipse *fEllipse;  //! Graphical Object to Display Ellipse
+
+protected:
+    //
+    // This is only for calculations in derived classes because
+    // we don't want to read/write this data members
+    //
+    Float_t GetCosDelta() const { return fCosDelta; }
+    Float_t GetSinDelta() const { return fSinDelta; }
 
 public:
@@ -29 +41 @@
     void Reset();
 
-    Bool_t Calc(const MGeomCam &geom, const MCerPhotEvt &pix);
+    virtual Bool_t Calc(const MGeomCam &geom, const MCerPhotEvt &pix);
 
-    void Print(Option_t *opt=NULL) const;
-    void Draw(Option_t *opt=NULL);
-    //void Paint(Option_t *opt=NULL);
+    virtual void Print(Option_t *opt=NULL) const;
+    virtual void Draw(Option_t *opt=NULL);
+    //virtual void Paint(Option_t *);
 
-    void Clear(Option_t *opt=NULL);
+    virtual void Clear(Option_t *opt=NULL);
 
-    Float_t GetAlpha() const  { return fAlpha; }
+    Float_t GetLength() const { return fLength; }
     Float_t GetWidth() const  { return fWidth; }
-    Float_t GetLength() const { return fLength; }
-    Float_t GetDist() const   { return fDist; }
+    Float_t GetDelta() const  { return fDelta; }
     Float_t GetSize() const   { return fSize; }
-    Float_t GetTheta() const  { return fTheta; }
+    Float_t GetMeanX() const  { return fMeanx; }
+    Float_t GetMeanY() const  { return fMeany; }
 
-    void AsciiRead(ifstream &fin);
-    void AsciiWrite(ofstream &fout) const;
+    virtual void AsciiRead(ifstream &fin);
+    virtual void AsciiWrite(ofstream &fout) const;
 
     ClassDef(MHillas, 1) // Storage Container for Hillas Parameter
@@ -51 +63 @@
 
 #endif
-

trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc

@@ -54 +54 @@
 // Default constructor.
 //
-MHillasCalc::MHillasCalc(const char *name, const char *title)
+MHillasCalc::MHillasCalc(const char *hil, const char *name, const char *title)
 {
     fName  = name  ? name  : "MHillasCalc";
     fTitle = title ? title : "Task to calculate Hillas parameters";
+
+    fHilName = hil;
 }
 
@@ -82 +84 @@
     }
 
-    fHillas = (MHillas*)pList->FindCreateObj("MHillas");
+    fHillas = (MHillas*)pList->FindCreateObj(fHilName);
     if (!fHillas)
         return kFALSE;

trunk/MagicSoft/Mars/manalysis/MHillasCalc.h

@@ -24 +24 @@
           MHillas     *fHillas;     // ouput container to store result
 
+    TString fHilName;
 public:
-    MHillasCalc(const char *name=NULL, const char *title=NULL);
+    MHillasCalc(const char *hil="MHillas", const char *name=NULL, const char *title=NULL);
 
     Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -194 +194 @@
 //
 //   Look for the boundary pixels around the core pixels
-//   if a pixel has more than 2.5 (clean level 2) sigma, and
+//   if a pixel has more than 2.5 (clean level 2.5) sigma, and
 //   a core neigbor it is declared as used.
 //

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -34 +34 @@
            MMcPedestalNSBAdd.cc \
            MImgCleanStd.cc \
+           MSrcPosCam.cc \
            MHillas.cc \
+           MHillasExt.cc \
            MHillasCalc.cc \
+           MHillasSrc.cc \
+           MHillasSrcCalc.cc \
            MCerPhotCalc.cc \
            MCerPhotEvt.cc \

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -37 +37 @@
 #include "MParContainer.h"
 
+#include <fstream.h>     // ofstream, AsciiWrite
+
 #include <TClass.h>      // IsA
 #include <TROOT.h>       // TROOT::Identlevel
+#include <TMethodCall.h> // TMethodCall, AsciiWrite
+#include <TDataMember.h> // TDataMember, AsciiWrite
 #include <TVirtualPad.h> // gPad
 
@@ -211 +215 @@
 //
 //  If you want to use Ascii-Input/-Output (eg. MWriteAsciiFile) of a
-//  container, overload this function.
+//  container, you may overload this function. If you don't overload it
+//  the data member of a class are written to the file in the order of
+//  appearance in the class header (be more specfic: root dictionary)
+//  Only data members which are of integer (Bool_t, Int_t, ...) or
+//  floating point (Float_t, Double_t, ...) type are written.
 //
 void MParContainer::AsciiWrite(ofstream &fout) const
 {
-    *fLog << warn << "To use the the ascii output of " << GetName();
-    *fLog << " you have to overload " << ClassName() << "::AsciiWrite." << endl;
-}
+    // *fLog << warn << "To use the the ascii output of " << GetName();
+    // *fLog << " you have to overload " << ClassName() << "::AsciiWrite." << endl;
+
+    TDataMember *data = NULL;
+
+    TIter Next(IsA()->GetListOfDataMembers());
+    while ((data=(TDataMember*)Next()))
+    {
+        if (!data->IsPersistent())
+            continue;
+
+        /*const*/ TMethodCall *call = data->GetterMethod(); //FIXME: Root
+        if (!call)
+            continue;
+
+        switch (call->ReturnType())
+        {
+        case TMethodCall::kLong:
+            Long_t l;
+            call->Execute((void*)this, l); // FIXME: const, root
+            fout << l << " ";
+            continue;
+
+        case TMethodCall::kDouble:
+            Double_t d;
+            call->Execute((void*)this, d); // FIXME: const, root
+            fout << d << " ";
+            continue;
+
+        case TMethodCall::kOther:
+            /* someone may want to enhance this? */
+            continue;
+        }
+    }
+}

trunk/MagicSoft/Mars/mbase/MReadMarsFile.cc

@@ -114 +114 @@
     if (fRun->Process())
     {
-        TString name(GetFileName());
-        name.Remove(0, name.Last('/')+1);
-
-        *fLog << inf << "MReadMarsFile: Switching to '" << name << "' ";
+        *fLog << inf << "MReadMarsFile: Switching to '" << GetFileName() << "' ";
         *fLog << "(before event #" << GetEventNum()-1 << ")" << endl;
 

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -407 +407 @@
     if (!fNumEntries)
     {
-        *fLog << warn << dbginf << "No entries found in file(s)." << endl;
+        *fLog << warn << dbginf << "No entries found in file(s)" << endl;
         return kFALSE;
     }
@@ -692 +692 @@
 //  Return the name of the file we are actually reading from.
 //
-const char *MReadTree::GetFileName() const
-{
-    return fChain->GetFile()->GetName();
+TString MReadTree::GetFileName() const
+{
+    const TFile *file = fChain->GetFile();
+
+    if (!file)
+        return TString("<unknown>");
+
+    TString name(file->GetName());
+    name.Remove(0, name.Last('/')+1);
+    return name;
 }
 

trunk/MagicSoft/Mars/mbase/MReadTree.h

@@ -58 +58 @@
     UInt_t GetEntries() const  { return fNumEntries; }
 
-    const char *GetFileName() const;
+    TString GetFileName() const;
 
     virtual void   AddNotify(TObject *obj);

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -11 +11 @@
 
 #include "MHexagon.h"
+
+#include "MGeomPix.h"
 #include "MGeomCam.h"
 
@@ -27 +29 @@
     : fAutoScale(kTRUE), fMinPhe(-2), fMaxPhe(50), fW(0), fH(0), fDrawingPad(NULL)
 {
+    fGeomCam = geom; // FIXME: Clone doesn't work! (MGeomCam*)geom->Clone();
+
     //
     //  create the hexagons of the display
@@ -80 +84 @@
     delete fLegend;
     delete fLegText;
-}
-
-inline void MCamDisplay::SetPixColor(const MCerPhotPix &pix)
-{
-    (*this)[pix.GetPixId()].SetFillColor(GetColor(pix.GetNumPhotons()));
+
+    delete fGeomCam;
+}
+
+inline void MCamDisplay::SetPixColor(const MCerPhotPix &pix, const Int_t i)
+{
+    //
+    // Fixme: Divide pnum by the (real) area of the pixel
+    //
+
+    const Float_t ratio = (*fGeomCam)[0].GetA()/(*fGeomCam)[i].GetA();
+    const Float_t pnum  = ratio*pix.GetNumPhotons();
+
+    (*this)[pix.GetPixId()].SetFillColor(GetColor(pnum));
 }
 
@@ -221 +234 @@
     if (fAutoScale)
     {
-        fMinPhe = event->GetNumPhotonsMin();
-        fMaxPhe = event->GetNumPhotonsMax();
+        fMinPhe = event->GetNumPhotonsMin(fGeomCam);
+        fMaxPhe = event->GetNumPhotonsMax(fGeomCam);
 
         if (fMaxPhe < 20.)
@@ -242 +255 @@
             continue;
 
-        SetPixColor(pix);
+        SetPixColor(pix, i);
     }
 

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -21 +21 @@
 {
 private:
+    MGeomCam      *fGeomCam;     // pointer to camera geometry
+
     Bool_t         fAutoScale;   // indicating the autoscale function
 
@@ -42 +44 @@
     MHexagon &operator[](int i) { return *((MHexagon*)fPixels->At(i)); }
 
-    void  SetPixColor(const MCerPhotPix &pix);
+    void  SetPixColor(const MCerPhotPix &pix, const Int_t i);
     Int_t GetColor(Float_t wert);
 

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -11 +11 @@
 #pragma link C++ class MHFadcPix+;
 #pragma link C++ class MHHillas+;
+#pragma link C++ class MHHillasSrc+;
 #pragma link C++ class MHStarMap+;
 #pragma link C++ class MHMcEnergy+;

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -45 +45 @@
 // --------------------------------------------------------------------------
 //
-// Setup four histograms for Alpha, Width, Length and Dist
+// Setup four histograms for Width, Length
 //
 MHHillas::MHHillas (const char *name, const char *title)
@@ -60 +60 @@
     // connect all the histogram with the container fHist
     //
-    fAlpha  = new TH1F("Alpha [deg]", "Alpha of Hillas",   90, 0,  90);
     fWidth  = new TH1F("Width [mm]",  "Width of Hillas",  100, 0, 300);
     fLength = new TH1F("Length [mm]", "Length of Hillas", 100, 0, 300);
-    fDist   = new TH1F("Dist [mm]",   "Dist of Hillas",   100, 0, 300);
 
-    fAlpha->SetDirectory(NULL);
     fLength->SetDirectory(NULL);
-    fDist->SetDirectory(NULL);
     fWidth->SetDirectory(NULL);
 
-    fAlpha->GetXaxis()->SetTitle("\\alpha [\\circ]");
     fLength->GetXaxis()->SetTitle("Length [mm]");
-    fDist->GetXaxis()->SetTitle("Dist [mm]");
     fWidth->GetXaxis()->SetTitle("Width [mm]");
 
-    fAlpha->GetYaxis()->SetTitle("Counts");
     fLength->GetYaxis()->SetTitle("Counts");
-    fDist->GetYaxis()->SetTitle("Counts");
     fWidth->GetYaxis()->SetTitle("Counts");
 }
@@ -87 +79 @@
 MHHillas::~MHHillas()
 {
-    delete fAlpha;
     delete fWidth;
     delete fLength;
-    delete fDist;
 }
 
@@ -102 +92 @@
     const MHillas &h = *(MHillas*)par;
 
-    fAlpha ->Fill(fabs(h.GetAlpha()));
     fWidth ->Fill(h.GetWidth());
     fLength->Fill(h.GetLength());
-    fDist  ->Fill(h.GetDist());
 }
 
@@ -118 +106 @@
 TObject *MHHillas::DrawClone(Option_t *opt) const
 {
-    TCanvas *c = MakeDefCanvas("Hillas", "Histograms of Hillas Parameters");
-    c->Divide(2, 2);
+    TCanvas *c = MakeDefCanvas("Hillas", "Histograms of Hillas Parameters",
+                               350, 500);
+    c->Divide(1, 2);
 
     gROOT->SetSelectedPad(NULL);
@@ -127 +116 @@
     //
     c->cd(1);
-    fAlpha->DrawCopy();
+    fLength->DrawCopy();
 
     c->cd(2);
-    fLength->DrawCopy();
-
-    c->cd(3);
-    fDist->DrawCopy();
-
-    c->cd(4);
     fWidth->DrawCopy();
 
@@ -153 +136 @@
 {
     if (!gPad)
-        MakeDefCanvas("Hillas", "Histograms of Hillas Parameters");
+        MakeDefCanvas("Hillas", "Histograms of Hillas Parameters", 350, 500);
 
-    gPad->Divide(2,2);
+    gPad->Divide(1, 2);
 
     gPad->cd(1);
-    fAlpha->Draw();
+    fLength->Draw();
 
     gPad->cd(2);
-    fLength->Draw();
-
-    gPad->cd(3);
-    fDist->Draw();
-
-    gPad->cd(4);
     fWidth->Draw();
 

trunk/MagicSoft/Mars/mhist/MHHillas.h

@@ -12 +12 @@
 {
 private:
-    TH1F *fAlpha;
     TH1F *fWidth;
     TH1F *fLength;
-    TH1F *fDist;
 
 public:
-     MHHillas(const char *name=NULL, const char *title=NULL);
+    MHHillas(const char *name=NULL, const char *title=NULL);
     ~MHHillas();
 
     void Fill(const MParContainer *par);
 
-    TH1F *GetHistAlpha()  { return fAlpha; }
     TH1F *GetHistWidth()  { return fWidth; }
     TH1F *GetHistLength() { return fLength; }
-    TH1F *GetHistDist()   { return fDist; }
 
     void Draw(Option_t *opt=NULL);
@@ -35 +31 @@
 
 #endif
-

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -47 +47 @@
 // Create the star map histogram
 //
-MHStarMap::MHStarMap (const char *name, const char *title)
+MHStarMap::MHStarMap(const char *name, const char *title)
 {
     //
@@ -72 +72 @@
     fStarMap->SetDirectory(NULL);
 
-    fStarMap->SetXTitle("x/mm");
-    fStarMap->SetYTitle("y/mm");
+    fStarMap->SetXTitle("x [mm]");
+    fStarMap->SetYTitle("y [mm]");
     fStarMap->SetZTitle("Counts");
 }
@@ -95 +95 @@
     const MHillas &h = *(MHillas*)par;
 
-    const float dist  = h.GetDist();
-    const float theta = h.GetTheta();
-    const float alpha = h.GetAlpha()/kRad2Deg;
-
-    const float m = tan(theta+alpha-kPI);
-    const float t = dist*(sin(theta)-cos(theta)*m);
+    const float delta = h.GetDelta();
+
+    const float m = tan(delta);
+    const float t = m*h.GetMeanX()-h.GetMeanY();
 
     if (m>-1 && m<1)
@@ -211 +209 @@
     gPad->Update();
 }
-

trunk/MagicSoft/Mars/mhist/MHStarMap.h

@@ -20 +20 @@
 
 public:
-     MHStarMap(const char *name=NULL, const char *title=NULL);
+    MHStarMap(const char *name=NULL, const char *title=NULL);
     ~MHStarMap();
 
@@ -34 +34 @@
 
 #endif
-

trunk/MagicSoft/Mars/mhist/Makefile

@@ -30 +30 @@
 SRCFILES = MFillH.cc \
            MH.cc \
-           MHFadcPix.cc \
+        MHFadcPix.cc \
            MHFadcCam.cc \
            MHHillas.cc \
+           MHHillasSrc.cc \
            MHStarMap.cc \
            MHMcCollectionArea.cc \
@@ -53 +54 @@
 
 # @endcode
-

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx

@@ -2 +2 @@
 
 #include <iostream.h>
+#include <fstream.h>
 
 
@@ -162 +163 @@
 
 
+void MMcEvt::AsciiWrite(ofstream &fout) const
+{
+    fout << fEnergy << " ";
+    fout << fTheta ;
+}
 
 void MMcEvt::Print(Option_t *Option) const {

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx

@@ -43 +43 @@
              UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t ) ; 
 
+  virtual void AsciiWrite(ofstream &fout) const;
 
   void Print(Option_t *opt=NULL) const;