Changeset 2092 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
05/07/03 16:33:22 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2091 r2092  
    2525   * mfileio/MCT1ReadPreProc.cc:
    2626     - do not output the run number twice!
     27
     28   * mimage/MHillasExt.[h,cc]:
     29     - changed ClassDef to 2
     30     - updated comments
     31
     32   * mimage/MNewImagePar.cc:
     33     - updated comments
    2734
    2835

  • trunk/MagicSoft/Mars/mimage/MHillasExt.cc

    r2026 r2092  
    3232//
    3333//    extended image parameters
     34//
     35//
     36// Version 1:
     37// ----------
    3438// fConc     ratio of sum of two highest pixels over fSize
    3539// fConc1    ratio of highest pixel over fSize
    … …  
    3842// fM3Trans  third moment along minor axis
    3943//
     44// Version 2:
     45// ----------
     46// fConc     removed
     47// fConc1    removed
     48//
     49//
    4050// WARNING: Before you can use fAsym, fM3Long and fM3Trans you must
    4151//          multiply by the sign of MHillasSrc::fCosDeltaAlpha
    … …  
    4353////////////////////////////////////////////////////////////////////////////
    4454/*
    45  // fLeakage1 ratio : (photons in most outer ring of pixels) over fSize
    46  // fLeakage2 ratio : (photons in the 2 outer rings of pixels) over fSize
    47  //
    4855 // fAsymna   d/(d na) of ( sum(x*q^na)/sum(q^na), sum(y*q^na)/sum(q^na) )
    4956 //           projected onto the major axis
    … …  
    155162            continue;                                          // [1]
    156163        }
    157 
    158         /*
    159          //
    160          //  power na for calculating fAsymna;
    161          //  the value 1.5 was suggested by Thomas Schweizer
    162          //
    163          Double_t na = 1.5;
    164 
    165          //
    166          // get sums for calculating fAsymna
    167          // the outer pixels are 4 times as big (in area)
    168          // as the inner pixels !
    169          //
    170          const Double_t dummy = pow(nphot, na)/r;
    171 
    172          sna +=     dummy;
    173          xna += dzx*dummy;
    174 
    175          sna1 += sna/nphot;
    176          xna1 += xna/nphot;
    177 
    178          //
    179          // forward-backward asymmetry
    180          //
    181          fb += dzx<0 ? -nphot: nphot;
    182          */
    183164    }
    184165
    … …  
    186167
    187168    fAsym = (hil.GetMeanX()-maxp.GetX())*hil.GetCosDelta() +
    188             (hil.GetMeanY()-maxp.GetY())*hil.GetSinDelta();    // [mm]
    189 
    190     /*
    191      fAsym0    =       fb / GetSize();
    192      fAsymna   = na * (sna*xna1 - sna1*xna) / (sna*sna);
    193      */
     169            (hil.GetMeanY()-maxp.GetY())*hil.GetSinDelta();            // [mm]
    194170
    195171    //

  • trunk/MagicSoft/Mars/mimage/MHillasExt.h

    r2026 r2092  
    3535    void Set(const TArrayF &arr);
    3636
    37     ClassDef(MHillasExt, 1) // Storage Container for extended Hillas Parameter
     37    ClassDef(MHillasExt, 2) // Storage Container for extended Hillas Parameter
    3838};
    3939#endif

  • trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

    r2062 r2092  
    2929// Storage Container for new image parameters
    3030//
     31// fLeakage1 ratio: (photons in most outer ring of pixels) over fSize
     32// fLeakage2 ratio: (photons in the 2 outer rings of pixels) over fSize
     33//
    3134/////////////////////////////////////////////////////////////////////////////
    3235#include "MNewImagePar.h"
    … …  
    4447#include "MCerPhotEvt.h"
    4548#include "MCerPhotPix.h"
    46 
    4749
    4850ClassImp(MNewImagePar);
Note: See TracChangeset for help on using the changeset viewer.