Changeset 618 for trunk


Ignore:
Timestamp:
02/22/01 20:07:17 (24 years ago)
Author:
magicsol
Message:
Some changes in the naming convention have been introduced and it has
been introduced a new member for this class that is the number of phe
coming only from the simulated shower (not from the NSB).
CVS:----------------------------------------------------------------------
----------------------------------------------------------------------
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r574 r618  
    99
    1010#include <iostream.h>
    11 #include "TObject.h"
     11#include "MParContainer.h"
    1212
    1313
    14 class MMcEvt : public TObject {
     14class MMcEvt : public MParContainer{
    1515 private:
    16   UShort_t usPartId;     // Type of particle
     16  UShort_t fPartId;     // Type of particle
    1717  Float_t fEnergy;       // Energy in GeV
    1818
    … …  
    2525  Float_t fImpact;       // impact parameter
    2626
    27   UShort_t usPhotIni;      // Initial number of photons
    28   UShort_t usPassPhotAtm;  // Passed atmosphere
    29   UShort_t usPassPhotRef;  // Passed reflector
    30   UShort_t usPassPhotCone; // Passed glas
    31   UShort_t usPhotEl    ;   // Passed qe
    32  
     27  UInt_t fPhotIni;      // Initial number of photons
     28  UInt_t fPassPhotAtm;  // Passed atmosphere
     29  UInt_t fPassPhotRef;  // Passed reflector(reflectivity + effective area)
     30  UInt_t fPassPhotCone; // Passed glas
     31  UInt_t fPhotElfromShower;   // Passed qe coming from the shower
     32  UInt_t fPhotElinCamera;     // usPhotElfromShower + mean of phe
     33                               // from NSB
    3334
    3435 public:
    … …  
    3738  MMcEvt( UShort_t,
    3839          Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
    39           UShort_t, UShort_t, UShort_t, UShort_t, UShort_t ) ;
     40          UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t ) ;
    4041 
    4142  ~MMcEvt();
    … …  
    4546  void Fill( UShort_t,
    4647             Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
    47              UShort_t, UShort_t, UShort_t, UShort_t, UShort_t ) ;
     48             UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t ) ;
    4849
    4950
    5051  void Print(Option_t *);
    5152
    52 
    53 
    54   Short_t GetPartId() const { return usPartId; }       //Get Type of particle
     53  Short_t GetPartId() const { return fPartId; }       //Get Type of particle
    5554  Float_t GetEnergy() const { return fEnergy; }        //Get Energy
    5655
    … …  
    6362  Float_t GetImpact() const { return fImpact;}         //Get impact parameter
    6463
    65 /*    Short_t GetPhotIni() { return usPhotIni; }           //Get Initial photons */
    66 /*    Short_t GetPassPhotAtm() { return usPassPhotAtm;}    //Get Passed atmosphere */
    67 /*    Short_t GetPassPhotRef() { return usPassPhotRef; }   //Get Passed reflector */
    68 /*    Short_t GetPassPhotCone() { return usPassPhotCone; } //Get Passed glas */
    69 /*    Short_t GetPhotEl() { return usPhotEl; }             //Get Passed qe */
     64/*    UInt_t GetPhotIni() { return fPhotIni; }           //Get Initial photons */
     65/*    UInt_t GetPassPhotAtm() { return fPassPhotAtm;}    //Get Passed atmosphere */
     66/*    UInt_t GetPassPhotRef() { return fPassPhotRef; }   //Get Passed reflector */
     67/*    UInt_t GetPassPhotCone() { return fPassPhotCone; } //Get Passed glas */
     68/*    UInt_t GetPhotElfromShower() { return fPhotElfromShower; }             //Get Passed qe from shower*/
     69/*    UInt_t GetPhotElinCamera() { return fPhotElinCamera; }             //Get Passed qe total*/
    7070
    7171
     72  void SetPartId(Short_t PartId)
     73  {fPartId=PartId;}             //Set Type of particle
    7274
    73  /*  void SetPartId(Short_t PartId)  */
    74 /*     { usPartId=PartId; }             //Set Type of particle */
    75 /*   void SetEnergy(Float_t Energy)  */
    76 /*     { fEnergy=Energy; }              //Set Energy */
     75  void SetEnergy(Float_t Energy)
     76  { fEnergy=Energy; }              //Set Energy
    7777 
    78 /*   void SetTheta(Float_t Theta)  */
    79 /*     { fTheta=Theta; }                //Set Theta angle */
    80 /*   void SetPhi(Float_t Phi)  */
    81 /*     { fPhi=Phi;  }                   //Set Phi angle */
     78  void SetTheta(Float_t Theta)
     79  { fTheta=Theta; }                //Set Theta angle
     80
     81  void SetPhi(Float_t Phi)
     82  { fPhi=Phi;  }                   //Set Phi angle
    8283 
    83 /*    void SetCoreD(Float_t CoreD)  */
    84 /*      { fCoreD=CoreD; }                //Set Core d pos */
    85 /*    void SetCoreX(Float_t CoreX)  */
    86 /*      { fCoreX=CoreX; }                //Set Core x pos */
    87 /*    void SetCoreY(Float_t CoreY )  */
    88 /*      { fCoreY=CoreY; }                //Set Core y pos */
    89 /*    void SetImpact(Float_t Impact)  */
    90 /*      { fImpact=Impact;}               //Set impact parameter */
     84  void SetCoreD(Float_t CoreD)
     85  { fCoreD=CoreD; }                //Set Core d pos
     86
     87  void SetCoreX(Float_t CoreX)
     88  { fCoreX=CoreX; }                //Set Core x pos
     89
     90  void SetCoreY(Float_t CoreY )
     91  { fCoreY=CoreY; }                //Set Core y pos
     92
     93  void SetImpact(Float_t Impact)
     94  { fImpact=Impact;}               //Set impact parameter
    9195 
    9296/*    void SetPhotIni(Short_t PhotIni)  */
    93 /*      { usPhotIni=PhotIni; }                 //Set Initial photons */
     97/*      { fPhotIni=PhotIni; }                 //Set Initial photons */
    9498/*    void SetPassPhotAtm(Short_t PassPhotAtm)  */
    95 /*      { usPassPhotAtm=PassPhotAtm;}         //Set Passed atmosphere */
     99/*      { fPassPhotAtm=PassPhotAtm;}         //Set Passed atmosphere */
    96100/*    void SetPassPhotRef(Short_t PassPhotRef)  */
    97 /*      { usPassPhotRef=PassPhotRef ; }       //Set Passed reflector */
     101/*      { fPassPhotRef=PassPhotRef ; }       //Set Passed reflector */
    98102/*    void SetPassPhotCone(Short_t PhotCon)  */
    99 /*      { usPassPhotCone=PhotCon; }           //Set Passed glas */
    100 /*    void SetPhotEl(Short_t PhotEl)  */
    101 /*      { usPhotEl=PhotEl; }                  //Set Passed qe */
     103/*      { fPassPhotCone=PhotCon; }           //Set Passed glas */
    102104
    103105
Note: See TracChangeset for help on using the changeset viewer.