Changeset 3542 for trunk/MagicSoft/Mars

Timestamp:

03/18/04 10:06:21 (21 years ago)

Author:

blanch

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MConcentration.cc (modified) (7 diffs)
• MConcentration.h (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/MConcentration.cc

@@ -20 +20 @@
 !   Author(s): Rudolf Bock     10/2001 <mailto:Rudolf.Bock@cern.ch>
 !   Author(s): Wolfgang Wittek  6/2002 <mailto:wittek@mppmu.mpg.de>
+!   Author(s): Oscar Blanch     3/2004 <mailto:blanch@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -30 +31 @@
 // MConcentration
 //
-// Storage Container for image parameters
+// Storage Container for Concentration parameters
 //
-//    basic image parameters
 //
 // Version 1:
 // ----------
-// fLength   [mm]       major axis of ellipse
-// fWidth    [mm]       minor axis
-// fDelta    [rad]      angle of major axis with x-axis
-//                      by definition the major axis is pointing into
-//                      the hemisphere x>0, thus -pi/2 < delta < pi/2
-// fSize     [#CerPhot] total sum of pixels
-// fMeanX    [mm]       x of center of ellipse
-// fMeanY    [mm]       y of center of ellipse
-//
-// Version 2:
-// ----------
-// fNumCorePixels  number of pixels called core
-// fNumUsedPixels  number of pixels which survived the cleaning
-//
-// Version 3:
-// ----------
-// fNumCorePixels  moved to MNewImagePar
-// fNumUsedPixels  moved to MNewImagePar
-// fCosDelta       added
-// fSinDelte       added
+// fConc[i]    [ratio] Number of photons in the i+1 more populated pixels
+//                     over the event size (till i=7).
 //
 /////////////////////////////////////////////////////////////////////////////
 #include "MConcentration.h"
 
-//#include <fstream>
 
 #include <TArrayF.h>
 #include <TArrayI.h>
-//#include <TEllipse.h>
 
 #include "MHillas.h"
@@ -95 +75 @@
 // --------------------------------------------------------------------------
 //
-// Destructor. Deletes the TEllipse if one exists.
+// Destructor. 
 //
 MConcentration::~MConcentration()
@@ -114 +94 @@
 // --------------------------------------------------------------------------
 //
-// Print the hillas Parameters to *fLog
+// Print the Concetration Parameters to *fLog
 //
 void MConcentration::Print(Option_t *) const
@@ -120 +100 @@
     *fLog << all;
     *fLog << "Concentrations (" << GetName() << ")" << endl;
-    //*fLog << " - Length      [mm]  = " << fLength << endl;
+    for(int i=0;i<9;i++)
+      *flog << "Conc" << i+1 <<" = "<< fConc[i] << endl;
 }
 
 // --------------------------------------------------------------------------
 //
-// Calculate the image parameters from a Cherenkov photon event
-// assuming Cher.photons/pixel and pixel coordinates are given
+// Calculate the Concentrations from a Cherenkov photon event
+// assuming Cher.photons/pixel, their standard hillas parameters 
+// and  pixel coordinates are given.
 // In case you don't call Calc from within an eventloop make sure, that
 // you call the Reset member function before.
 // Returns:
-//   0  no error
-//   1  number of pixels < 3
-//   2  size==0
-//   3  number of used pixel < 3
-//   4  CorrXY == 0
-//
+//    Nothing.
+
 Int_t MConcentration::Calc(const MGeomCam &geom, const MCerPhotEvt &evt, const MHillas &hillas)
 {
@@ -162 +140 @@
         nphot *= geom.GetPixRatio(pixid);
 
-        // Compute Concentrations 1-8   
+        // Get number of photons in the 8 most populated pixels 
 
         if(maxpix[0]<=nphot) {
@@ -173 +151 @@
             if (nphot<maxpix[7-i]){
               for(int j=0;j<i-1;j++){  
-                maxpix[7-j]=maxpix[6-j];                    // [1]
+                maxpix[7-j]=maxpix[6-j];                 // [#phot]
               }
               maxpix[8-i]=nphot;

trunk/MagicSoft/Mars/mimage/MConcentration.h

@@ -13 +13 @@
 {
 private:
-    Float_t fConc[9];       // [%] major axis of ellipse
+    Float_t fConc[9];       // [ratio] Num photons in i+1 pixels over size of event 
 
 public: