Changeset 5321 for trunk/MagicSoft


Ignore:
Timestamp:
10/26/04 20:21:50 (20 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5310 r5321  
    1919
    2020                                                 -*-*- END OF LINE -*-*-
     21
     22 2004/10/26: Abelardo Moralejo
     23
     24   * mmc/MMcEvt.[hxx,cxx], MMcFadcHeader.hxx
     25     - added new data members fFadcTimeJitter and fGainFluctuations for
     26       new camera simulation options. Updated class versions to 4 and 5
     27       respectively
    2128
    2229 2004/10/22: Thomas Bretz

  • trunk/MagicSoft/Simulation/Detector/Camera/camera.h

    r5319 r5321  
    1919//=
    2020//= $RCSfile: camera.h,v $
    21 //= $Revision: 1.25 $
     21//= $Revision: 1.26 $
    2222//= $Author: moralejo $
    23 //= $Date: 2004-10-26 14:03:00 $
     23//= $Date: 2004-10-26 19:21:20 $
    2424//=
    2525//=//////////////////////////////////////////////////////////////////////
    … …  
    316316                  float *tmax_ns,    // maximum arrival time of all phes
    317317                  int telescope,      // Telescope that is being analised to get the right QE.
    318                   float mirror_fraction // Fraction of working mirror
     318                  float mirror_fraction, // Fraction of working mirror
     319                  float fadc_jitter  // Time jitter due to FADC clock noise
    319320                  );
    320321
    … …  
    369370/*
    370371 *$Log: not supported by cvs2svn $
     372 *Revision 1.25  2004/10/26 14:03:00  moralejo
     373 **** empty log message ***
     374 *
    371375 *Revision 1.24  2004/10/19 10:35:05  moralejo
    372376 **** empty log message ***

  • trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx

    r5319 r5321  
    255255  }
    256256
     257  Bool_t GetGainFluctuations() { return fGainFluctuations; }
     258
    257259} ;
    258260

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

    r2528 r5321  
    6868                Float_t  elec,
    6969                Float_t  muon,
    70                 Float_t  other) {
     70                Float_t  other,
     71                Float_t  fadc_jitter) {
    7172
    7273    fName  = "MMcEvt";
    … …  
    118119  fMuonCphFraction=muon;
    119120  fOtherCphFraction=other;
     121
     122  fFadcTimeJitter = fadc_jitter;
    120123}
    121124
    … …  
    190193                   Float_t  elec,
    191194                   Float_t  muon,
    192                    Float_t  other ) {
     195                   Float_t  other,
     196                   Float_t  fadc_jitter) {
    193197  //
    194198  //  All datamembers are filled with the correspondin parameters.
    … …  
    235239  fOtherCphFraction=other;
    236240
     241  fFadcTimeJitter = fadc_jitter;
    237242}
    238243

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

    r4513 r5321  
    8080  Float_t  fOtherCphFraction;
    8181 
    82 
     82  Float_t  fFadcTimeJitter;
    8383
    8484 public:
    … …  
    9090          Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
    9191          UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t,
    92           Float_t, Float_t, Float_t) ;
     92          Float_t, Float_t, Float_t, Float_t) ;
    9393 
    9494  ~MMcEvt();
    … …  
    101101             Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
    102102             UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t,
    103              Float_t, Float_t, Float_t) ;
     103             Float_t, Float_t, Float_t, Float_t) ;
    104104
    105105  //virtual void AsciiWrite(ofstream &fout) const;
    … …  
    138138  Float_t GetLongit0()   const { return fLongit0; }
    139139  Float_t GetLongitmax() const { return fLongitmax; }
     140
     141  Float_t GetFadcTimeJitter() const { return fFadcTimeJitter; }
    140142
    141143  void SetPartId(Short_t PartId)
    … …  
    230232
    231233
    232   ClassDef(MMcEvt, 3)  //Stores Montecarlo Information of one event (eg. the energy)
     234  ClassDef(MMcEvt, 4)  //Stores Montecarlo Information of one event (eg. the energy)
    233235
    234236};

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

    r3610 r5321  
    5252  Float_t fLow2HighGain;    // low gain factor
    5353
     54  Bool_t  fGainFluctuations;
     55  // kTRUE if PMT gain fluctuations were simulated (=> default in camera simulation)
     56
     57
    5458 public:
    5559  MMcFadcHeader(const char *name=NULL, const char *title=NULL);
    … …  
    100104  }
    101105 
     106  void SetGainFluctuations(Bool_t x) { fGainFluctuations = x; }
     107
    102108  Float_t GetPedestal(UInt_t i) const    { return fPedesMean[i]; }
    103109  Float_t GetPedestalRmsHigh(UInt_t i) const { return fPedesSigmaHigh[i]; }
    … …  
    111117  UInt_t GetNumPixel() const { return MFADC_CHANNELS; }
    112118
    113   ClassDef(MMcFadcHeader, 4)  //Stores Montecarlo Information describing the FADC behaviour
     119  ClassDef(MMcFadcHeader, 5)  //Stores Montecarlo Information describing the FADC behaviour
    114120
    115121};
Note: See TracChangeset for help on using the changeset viewer.