Changeset 7880


Ignore:
Timestamp:
08/16/06 21:19:42 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7876 r7880  
    1919                                                 -*-*- END OF LINE -*-*-
    2020 2006/08/16 Thomas Bretz
     21
     22   * Makefile.conf.general:
     23     - fixed usage of substitutions
     24
     25   * MMcConfigRunHeader.[h,cc]:
     26     - added fParaboloidFocal
     27     - increased class version by 1
     28     - updated comments
     29
     30   * MMcEvt.[hxx,cxx]:
     31     - added fEventReuse
     32     - increased class version by 1
     33     - updates to comments
     34
     35   * MMcEvtBasic.h:
     36     - replaced private by protected
     37
     38   * MMcFadcHeader.hxx:
     39     - updates to comments
     40     - update to global ifdef
     41
     42   * MMcRunHeader.[hxx,cxx]:
     43     - added fRandomPointingConeSemiAngle
     44     - increased class version by 1
     45     - upadted comments
     46     - removed empty destructor
     47
     48   * MMcTrig.hxx:
     49     - updated preprocessor directives
     50
     51   * MMcTrigHeader.[hxx,cxx]:
     52     - updated comments
     53     - removed empty destructor
     54     - updated preprocessor directives
     55
     56   * MTriggerDefine.h, Mdefine.h:
     57     - updated preprocessor directives
    2158
    2259   * manalysis/MMcCalibrationUpdate.cc,

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.cc

    r3619 r7880  
    2929// Root storage container for the MONTE CARLO CONFIGURATION information
    3030//
    31 // It saves in a root file all the infromation about values in the configuration
    32 // files used in the Monte Carlo production: MagicDef (definition of the teslescope),
    33 // Reflectivity.dat (mirror reflectivities), qe.dat (PMT QEs), axisdev.dat (mirrors
    34 // deviations) and lightguides.dat (Effect of the Light Guides).
     31// It saves in a root file all the infromation about values in the
     32// configuration files used in the Monte Carlo production: MagicDef
     33// (definition of the teslescope), Reflectivity.dat (mirror reflectivities),
     34// qe.dat (PMT QEs), axisdev.dat (mirrors deviations) and lightguides.dat
     35// (Effect of the Light Guides).
    3536//
    3637//
    37 // Version 2:
    38 // -----------
     38// Class Version 2:
     39// ----------------
    3940// removed obsolete variables which are no longer used by reflector,
    4041// nor present in the magic.def file:  fFocalStdev, fPointStdev, fDevAdjust
    4142//
     43// Class Version 3:
     44// ----------------
     45// Added member fLightCollectionFactorOuter so that we can store
     46// the data on the simulatedlight collection efficiency (light
     47// guides + plexiglas +...) as a function of incidence angle for
     48// outer and inner pixels independently.
     49//
     50// Class Version 4:
     51// ----------------
     52// Added member fMirrorFraction, the "active" fraction of the
     53// mirror dish, to account for reflectivity losses, missing
     54// mirrors, etc.
     55//
     56// Class Version 5:
     57// ----------------
     58// Added member fPmtTimeJitter, the time jitter of the PMTs (sigma
     59// of gaussian) for each photoelectron.
     60//
     61// Class Version 6:
     62// ----------------
     63// Added fParaboloidFocal
     64//
     65/////////////////////////////////////////////////////////////////////////////////
     66
    4267//
    4368////////////////////////////////////////////////////////////////////////////
    … …  
    6792    fTitle = title ? title : "Mc Configuration Information";
    6893
    69     fRadiusMirror=-1;
    70     fFocalDist   =-1;
    71     fPointSpread =-1;
    72     fBlackSpot   =-1;
    73     fCameraWidth =-1;
     94    fRadiusMirror    = -1;
     95    fFocalDist       = -1;
     96    fPointSpread     = -1;
     97    fBlackSpot       = -1;
     98    fCameraWidth     = -1;
     99    fParaboloidFocal = -1;
    74100
    75101    fMirrors = new TClonesArray("MGeomMirror", 0);
    … …  
    93119    fBlackSpot=spot;
    94120    fCameraWidth=camwidth;
    95    
    96121}
    97122

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.h

    r5599 r7880  
    1616class MGeomPMT;
    1717
    18 //////////////////////////////////////////////////////////////////////////////////
    19 //
    20 // class MMcConfigRunHeader
    21 //
    22 // Authors: O. Blanch, A. Moralejo
    23 //
    24 // Container to keep some data on the used MC simulation parameters
    25 //
    26 // Version 3: Added member fLightCollectionFactorOuter so that we can store
    27 //            the data on the simulatedlight collection efficiency (light
    28 //            guides + plexiglas +...) as a function of incidence angle for
    29 //            outer and inner pixels independently.
    30 //
    31 // Version 4: Added member fMirrorFraction, the "active" fraction of the
    32 //            mirror dish, to account for reflectivity losses, missing
    33 //            mirrors, etc.
    34 //
    35 // Version 5: Added member fPmtTimeJitter, the time jitter of the PMTs
    36 //            (sigma of gaussian) for each photoelectron.
    37 //
    38 /////////////////////////////////////////////////////////////////////////////////
    39 
    4018class MMcConfigRunHeader : public MParContainer
    4119{
    … …  
    5129    // Magic Def Parameters
    5230    Float_t fFocalDist;         // [cm] Focal distance
     31    Float_t fParaboloidFocal;   // [cm] True focal of the paraboloid on which the mirror centers are placed
    5332    Float_t fPointSpread;       // [cm] Point spread function, sigma in x and y on the camera as simualted in the Reflector
    54     Float_t fPointSpreadX;       // [cm] Point spread function, sigma in x on the camera adding gaussian in the Camera
    55     Float_t fPointSpreadY;       // [cm] Point spread function, sigma in y on the camera adding gaussian in the Camera
     33    Float_t fPointSpreadX;      // [cm] Point spread function, sigma in x on the camera adding gaussian in the Camera
     34    Float_t fPointSpreadY;      // [cm] Point spread function, sigma in y on the camera adding gaussian in the Camera
    5635    Float_t fBlackSpot;         // [cm] Radius of black spot in the mirror center
    5736    Float_t fCameraWidth;       // [cm] Radius on the camera plain
    … …  
    7958
    8059    void SetMagicDef(Float_t radius, Float_t focal, Float_t point,
    81                      Float_t spot, Float_t camwidth);
     60                     Float_t spot, Float_t camwidth);
    8261    void SetLightCollection(const TArrayF &theta, const TArrayF &factor,
    8362                            const TArrayF &factor_outer);
    … …  
    133112    Float_t GetPmtTimeJitter() const { return fPmtTimeJitter; }
    134113
    135     ClassDef(MMcConfigRunHeader, 5)  // class for monte carlo configuration information
     114    ClassDef(MMcConfigRunHeader, 6)  // class for monte carlo configuration information
    136115};
    137116

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

    r7094 r7880  
    4949//   - moved ParticleId_t to base class MMcEvtBasic
    5050//
     51// Version 6:
     52//   - added fEventReuse
     53//
    5154/////////////////////////////////////////////////////////////////////////////
    5255#include "MMcEvt.hxx"
    … …  
    5861
    5962using namespace std;
    60 
    6163
    6264// --------------------------------------------------------------------------
    … …  
    8991               UInt_t   uiPat,     UInt_t   uiPre,     UInt_t   uiPco,
    9092               UInt_t   uiPelS,    UInt_t   uiPelC,    Float_t  elec,
    91                Float_t  muon,      Float_t  other,     Float_t  fadc_jitter)
     93               Float_t  muon,      Float_t  other,     Float_t  fadc_jitter,
     94               Int_t    reuse)
    9295{
    9396    fName  = "MMcEvt";
    … …  
    98101         fTLast, fL_Nmax, fL_t0, fL_tmax, fL_a, fL_b, fL_c, fL_chi2,
    99102         uiPin, uiPat, uiPre, uiPco, uiPelS, uiPelC, elec, muon, other,
    100          fadc_jitter);
     103         fadc_jitter, reuse);
    101104}
    102105
    … …  
    128131    fMuonCphFraction=0;
    129132    fOtherCphFraction=0;
     133
     134    fEventReuse = 0;   
    130135}
    131136
    … …  
    147152                   UInt_t   uiPat,     UInt_t   uiPre,     UInt_t   uiPco, 
    148153                   UInt_t   uiPelS,    UInt_t   uiPelC,    Float_t  elec,
    149                    Float_t  muon,      Float_t  other,     Float_t  fadc_jitter)
     154                   Float_t  muon,      Float_t  other,     Float_t  fadc_jitter,
     155                   Int_t    reuse)
    150156{
    151157    //
    … …  
    193199
    194200    fFadcTimeJitter = fadc_jitter;
     201   
     202    fEventReuse = reuse;
    195203}
    196204

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

    r7094 r7880  
    5555
    5656    Float_t  fFadcTimeJitter;
     57   
     58    Int_t    fEventReuse; // Number running from 0 to N-1, being N the number
     59                          // of times a Corsika event has been reused, by
     60                          // orienting the telescope in different ways or by
     61                          // setting it at a different location on the ground.
    5762
    5863public:
    … …  
    6368           Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
    6469           UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t,
    65            Float_t, Float_t, Float_t, Float_t) ;
     70           Float_t, Float_t, Float_t, Float_t, Int_t ireuse=0) ;
    6671
    6772    // Getter
    … …  
    107112               Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
    108113               UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t,
    109                Float_t, Float_t, Float_t, Float_t) ;
     114               Float_t, Float_t, Float_t, Float_t, Int_t ireuse=0);
    110115
    111116    // TObject
    … …  
    113118    void Clear(Option_t *opt=NULL);
    114119
    115     ClassDef(MMcEvt, 5)  //Stores Montecarlo Information of one event (eg. the energy)
     120    ClassDef(MMcEvt, 6)  //Stores Montecarlo Information of one event (eg. the energy)
    116121};
    117122

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.h

    r7094 r7880  
    2626    };
    2727
    28 private:
     28protected:
    2929  ParticleId_t fPartId;  // Type of particle
    3030  Float_t      fEnergy;  // [GeV] Energy
    … …  
    3636  Float_t      fTelescopeTheta;  // [rad]
    3737 
    38  public:
     38public:
    3939  MMcEvtBasic();
    4040  MMcEvtBasic(ParticleId_t, Float_t, Float_t, Float_t, Float_t);

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

    r7634 r7880  
    1 #ifndef __MMcFadcHeader__
    2 #define __MMcFadcHeader__
     1#ifndef MARS_MMcFadcHeader
     2#define MARS_MMcFadcHeader
    33
    44#ifndef MARS_MParContainer
    … …  
    1010
    1111#include "MFadcDefine.h"
    12 
    13 //
    14 // Version 5:
    15 //   Added member fGainFluctuations
    16 //
    17 // Version 6:
    18 //   Added member fNoiseGainFluctuations
    19 //
    20 // Version 7:
    21 //   Derived class from MCamEvent
    22 //
    2312
    2413class MMcFadcHeader : public MParContainer, public MCamEvent {

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcRunHeader.cxx

    r5340 r7880  
    5353//  Third version:
    5454//
    55 //  Byte_t fOpticLinksNoise;   Flag to state if the optic noise is simualted or not
     55//  Byte_t fOpticLinksNoise;   Flag to state if the optic noise is simualted
     56//                             or not
    5657//
    5758//
    … …  
    6162// from the north direction, anticlockwise (i.e, west is phi=90 degrees).
    6263//
     64//                                                     
     65// Class Version 5:
     66// ----------------
     67// removed members fSourceOffsetTheta, fSourceOffsetPhi (were no longer used)                                  //
     68//                   
     69// Class Version 6:
     70// ----------------
     71// removed members fTelesTheta, fTelesPhi (were no longer used)                                  //
     72//
     73// Class Version 7:
     74// ----------------
     75// + Float_t fRandomPointingConeSemiAngle;
     76//
    6377////////////////////////////////////////////////////////////////////////////
    64 
    6578#include "MMcRunHeader.hxx"
    6679
    … …  
    128141    fOpticLinksNoise= 0;
    129142
    130 }
    131 
    132 // --------------------------------------------------------------------------
    133 //
    134 // Destructor.
    135 //
    136 MMcRunHeader::~MMcRunHeader()
    137 {
    138 
     143    fRandomPointingConeSemiAngle=0;
    139144}
    140145
    … …  
    178183                        const UInt_t   refl,
    179184                        const UInt_t   cam,
    180                         const Byte_t   opticnoise)
     185                        const Byte_t   opticnoise,
     186                        const Float_t  conesmiangle)
    181187{
    182188    fMcRunNumber =runnumber;
    … …  
    225231    fCamVersion = cam;
    226232    fOpticLinksNoise= opticnoise;
     233
     234    fRandomPointingConeSemiAngle=conesmiangle;
    227235}
    228236

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

    r7745 r7880  
    11#ifndef MARS_MMcRunHeader
    22#define MARS_MMcRunHeader
    3 ///////////////////////////////////////////////////////////////////////
    4 //                                                                   //
    5 // MMcRunHeader                                                      //
    6 //                                                                   //
    7 // Version 5: removed members fSourceOffsetTheta, fSourceOffsetPhi   //
    8 //            (were no longer used)                                  //
    9 //                                                                   //
    10 // Version 6: removed members fTelesTheta, fTelesPhi                 //
    11 //            (were no longer used)                                  //
    12 //                                                                   //
    13 ///////////////////////////////////////////////////////////////////////
    143
    154#ifndef MARS_MParContainer
    … …  
    6554  UShort_t fCamVersion;
    6655
    67   /* ---- Run Header Informations ---- */
     56  // ---- Run Header Informations ----
    6857  Float_t fMcRunNumber;     // Run Number
    6958  UInt_t  fProductionSite;  // code to know where the run was generated
    … …  
    9180  Byte_t  fOpticLinksNoise;  // Noise from Optic Links simualted or not.
    9281
     82  // Semiaperture of the cone around the direction of the primary within which the
     83  // orientation of the telescope axis is scattered (deg). This is used in reflector
     84  // simulation to re-use each Corsika event more than once.
     85  Float_t fRandomPointingConeSemiAngle;
     86
     87
    9388public:
    9489  MMcRunHeader(const char *name=NULL, const char *title=NULL);
    95   ~MMcRunHeader();
    9690
    9791  void Fill(const Float_t  runnumber,
    … …  
    127121            const UInt_t   num0bslev,
    128122            const Float_t  heightlev[10],
    129             const UInt_t   corsika,
     123            const UInt_t   corsika,               
    130124            const UInt_t   refl,
    131125            const UInt_t   cam,
    132             const Byte_t   opticnoise
     126            const Byte_t   opticnoise,
     127            const Float_t  conesmiangle=0
    133128            );
    134129 
    … …  
    151146  Float_t GetImpactMax() const            {return fImpactMax;}
    152147
    153   ClassDef(MMcRunHeader, 6)     // storage container for general run info
     148  ClassDef(MMcRunHeader, 7)     // storage container for general run info
    154149};
     150
    155151#endif
    156 
    157 

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

    r7772 r7880  
    1 #ifndef __MMcTrig__
    2 #define __MMcTrig__
     1#ifndef MARS_MMcTrig
     2#define MARS_MMcTrig
    33
    44#ifndef MARS_MParContainer
    55#include "MParContainer.h"
    66#endif
    7 
     7#ifndef MARS_MTriggerDefine
    88#include "MTriggerDefine.h"
     9#endif
     10#ifndef MARS_Mdefine
    911#include "Mdefine.h"
     12#endif
    1013
    1114class MMcTrig : public MParContainer {

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.cxx

    r2173 r7880  
    2323//                             the amplitude of the single phe response
    2424//                             for the trigger
     25//
     26// Version 4
     27//   Added data members fGainFluctuations and fNoiseGainFluctuations
     28//
    2529//
    2630/////////////////////////
    … …  
    5458}
    5559
    56 MMcTrigHeader::~MMcTrigHeader() {
    57   //
    58   //  default destructor
    59   //
    60 }
    61 
    62 
    6360void MMcTrigHeader::Print(Option_t *opt) const {
    6461  //

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

    r7772 r7880  
    1 #ifndef __MMcTrigHeader__
    2 #define __MMcTrigHeader__
     1#ifndef MARS_MMcTrigHeader
     2#define MARS_MMcTrigHeader
    33
    44#ifndef MARS_MParContainer
    55#include "MParContainer.h"
    66#endif
    7 
     7#ifndef MARS_MTriggerDefine
    88#include "MTriggerDefine.h"
     9#endif
     10#ifndef MARS_Mdefine
    911#include "Mdefine.h"
    10 
    11 //
    12 // Version 4
    13 //   Added data members fGainFluctuations and fNoiseGainFluctuations
    14 //
     12#endif
    1513
    1614class MMcTrigHeader : public MParContainer{
    … …  
    4846 public:
    4947  MMcTrigHeader() ;
    50 
    51   ~MMcTrigHeader();
    5248
    5349  void Print(Option_t *opt=NULL) const;

  • trunk/MagicSoft/include-Classes/MMcFormat/MTriggerDefine.h

    r7188 r7880  
     1#ifndef MARS_MTriggerDefine
     2#define MARS_MTriggerDefine
    13//
    24//
    … …  
    110112//         2 means trigger_multi closed neighbours
    111113//
     114#endif

  • trunk/MagicSoft/include-Classes/MMcFormat/Mdefine.h

    r7772 r7880  
     1#ifndef MARS_Mdefine
     2#define MARS_Mdefine
    13//
    24//     Mdefine.h
    … …  
    3739#define MAX_PH_EL 500 //upper limit for colortable
    3840
     41#endif
Note: See TracChangeset for help on using the changeset viewer.