Changeset 695 for trunk/MagicSoft/Mars/manalysis

Timestamp:

03/20/01 17:25:33 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• AnalysisIncl.h (modified) (1 diff)
• AnalysisLinkDef.h (modified) (1 diff)
• MCerPhotEvt.cc (modified) (10 diffs)
• MCerPhotEvt.h (modified) (3 diffs)
• MHillas.cc (added)
• MHillas.h (added)
• MHillasCalc.cc (added)
• MHillasCalc.h (added)
• MPedestalCam.cc (added)
• MPedestalCam.h (added)
• MPedestalPix.cc (added)
• MPedestalPix.h (added)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/AnalysisIncl.h

@@ -1 +1 @@
 #ifndef __CINT__
-
 
 #include <TClonesArray.h>

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -11 +11 @@
 #pragma link C++ class MCT1Pedestals;
 
+#pragma link C++ class MPedestalPix;
+#pragma link C++ class MPedestalCam;
+
+#pragma link C++ class MHillas;
+#pragma link C++ class MHillasCalc;
+
 #endif

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -8 +8 @@
 
 #include "MLog.h"
-#include "MGeomCam.h"
 #include "MCamNeighbor.h"
 #include "MCamDisplay.h"
@@ -15 +14 @@
 ClassImp(MCerPhotEvt)
 
-MCerPhotEvt::MCerPhotEvt(const char *name, const char *title ) : fType(0), fNbPixels(0)
+MCerPhotEvt::MCerPhotEvt(const char *name, const char *title) : fNumPixels(0)
 {
   //   the default constructor 
@@ -31 +30 @@
 }
 
+#include "MGeomCamMagic.h"
+#include "MGeomCamCT1.h"
+
 void MCerPhotEvt::Draw(Option_t* option) 
 {
-  //   FIXME!!!
-  // 
-  
-  MCamDisplay *disp = new MCamDisplay(fType)  ; 
-  
-  disp->DrawPhotNum(this) ;
-}
-
-Int_t MCerPhotEvt::GetNbPixels() 
-{
-  return fNbPixels;
+    //
+    //   FIXME!!! Here the Draw function of the CamDisplay
+    //   should be called to add the CamDisplay to the Pad.
+    //   The drawing should be done in MCamDisplay::Paint
+    //
+
+    //    MGeomCam *geom = fType ? new MGeomCamMagic : new MGeomCamCT1;
+    //    MCamDisplay *disp = new MCamDisplay(geom);
+    //    delete geom;
+    //    disp->DrawPhotNum(this);
+}
+
+Int_t MCerPhotEvt::GetNumPixels()
+{
+    return fNumPixels;
 } 
 
@@ -52 +58 @@
     // of valid pixels in the list by one
     //
-    (*fPixels)[fNbPixels++] = new MCerPhotPix( id, nph, err);
+    (*fPixels)[fNumPixels++] = new MCerPhotPix( id, nph, err);
 }
 
@@ -60 +66 @@
     // reset counter and delete netries in list.
     //
-    fNbPixels = 0 ;
+    fNumPixels = 0 ;
     fPixels->Clear() ;
 }
@@ -69 +75 @@
 
     *fLog << "MCerPhotEvt::Print()" << endl
-        << "Number of Pixels: " << fNbPixels
+        << "Number of Pixels: " << fNumPixels
         << "(" << entries << ")"
         << endl ;
@@ -276 +282 @@
 } 
 
-Float_t MCerPhotEvt::GetMinNumPhotons()
+Float_t MCerPhotEvt::GetNumPhotonsMin()
 {
     //
     // get the minimum number of photons of all valid pixels in the list
     //
-    if (fNbPixels <= 0)
+    if (fNumPixels <= 0)
         return -5. ;
 
@@ -287 +293 @@
 
     Float_t testval;
-    for (Int_t i=1 ; i<fNbPixels; i++ )
+    for (Int_t i=1 ; i<fNumPixels; i++ )
     {
         testval = (*this)[i].GetNumPhotons();
@@ -298 +304 @@
 }
 
-Float_t MCerPhotEvt::GetMaxNumPhotons()
+Float_t MCerPhotEvt::GetNumPhotonsMax()
 {
     //
     // get the maximum number of photons of all valid pixels in the list
     //
-    if (fNbPixels <= 0)
+    if (fNumPixels <= 0)
         return 50.;
 
@@ -309 +315 @@
 
     Float_t testval;
-    for (Int_t i=1; i<fNbPixels; i++)
+    for (Int_t i=1; i<fNumPixels; i++)
     {
         testval = (*this)[i].GetNumPhotons();

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -21 +21 @@
 private:
 
-    Int_t         fType;
-    Int_t         fNbPixels;
+    Int_t         fNumPixels;
     TClonesArray *fPixels;
 
@@ -32 +31 @@
   void Draw(Option_t* option = "" ) ; 
 
-  Int_t    GetNbPixels() ; 
+  Int_t    GetNumPixels() ;
 
   void AddPixel(Int_t id, Float_t nph, Float_t err );
@@ -48 +47 @@
   Bool_t  IsPixelCore    ( Int_t id ) ;
  
-  Float_t GetMinNumPhotons();
-  Float_t GetMaxNumPhotons();
+  Float_t GetNumPhotonsMin();
+  Float_t GetNumPhotonsMax();
 
   MCerPhotPix &operator[](int i) { return *(MCerPhotPix*)(fPixels->At(i)); }

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -30 +30 @@
 SRCFILES = MCT1Pedestals.cc \
            MCT1ReadAscii.cc \
+           MPedestalCam.cc \
+           MPedestalPix.cc \
+           MHillas.cc \
+           MHillasCalc.cc \
            MCerPhotEvt.cc \
            MCerPhotPix.cc