Changeset 5321 for trunk/MagicSoft/include-Classes/MMcFormat

Timestamp:

10/26/04 20:21:50 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/include-Classes/MMcFormat

Files:

• MMcEvt.cxx (modified) (4 diffs)
• MMcEvt.hxx (modified) (5 diffs)
• MMcFadcHeader.hxx (modified) (3 diffs)

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

@@ -68 +68 @@
                 Float_t  elec,
                 Float_t  muon,
-                Float_t  other) {
+                Float_t  other,
+                Float_t  fadc_jitter) {
 
     fName  = "MMcEvt";
@@ -118 +119 @@
   fMuonCphFraction=muon;
   fOtherCphFraction=other;
+
+  fFadcTimeJitter = fadc_jitter;
 }
 
@@ -190 +193 @@
                    Float_t  elec,
                    Float_t  muon,
-                   Float_t  other ) {
+                   Float_t  other,
+                   Float_t  fadc_jitter) {
   //
   //  All datamembers are filled with the correspondin parameters. 
@@ -235 +239 @@
   fOtherCphFraction=other;
 
+  fFadcTimeJitter = fadc_jitter;
 }
 

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

@@ -80 +80 @@
   Float_t  fOtherCphFraction;
   
-
+  Float_t  fFadcTimeJitter;
 
  public:
@@ -90 +90 @@
           Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, 
           UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t,
-          Float_t, Float_t, Float_t) ; 
+          Float_t, Float_t, Float_t, Float_t) ; 
   
   ~MMcEvt(); 
@@ -101 +101 @@
              Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
              UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t,
-             Float_t, Float_t, Float_t) ; 
+             Float_t, Float_t, Float_t, Float_t) ; 
 
   //virtual void AsciiWrite(ofstream &fout) const;
@@ -138 +138 @@
   Float_t GetLongit0()   const { return fLongit0; }
   Float_t GetLongitmax() const { return fLongitmax; }
+
+  Float_t GetFadcTimeJitter() const { return fFadcTimeJitter; }
 
   void SetPartId(Short_t PartId)
@@ -230 +232 @@
 
 
-  ClassDef(MMcEvt, 3)  //Stores Montecarlo Information of one event (eg. the energy)
+  ClassDef(MMcEvt, 4)  //Stores Montecarlo Information of one event (eg. the energy)
 
 };

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

@@ -52 +52 @@
   Float_t fLow2HighGain;    // low gain factor 
 
+  Bool_t  fGainFluctuations;
+  // kTRUE if PMT gain fluctuations were simulated (=> default in camera simulation)
+
+
  public:
   MMcFadcHeader(const char *name=NULL, const char *title=NULL);
@@ -100 +104 @@
   }
   
+  void SetGainFluctuations(Bool_t x) { fGainFluctuations = x; }
+
   Float_t GetPedestal(UInt_t i) const    { return fPedesMean[i]; }
   Float_t GetPedestalRmsHigh(UInt_t i) const { return fPedesSigmaHigh[i]; }
@@ -111 +117 @@
   UInt_t GetNumPixel() const { return MFADC_CHANNELS; }
 
-  ClassDef(MMcFadcHeader, 4)  //Stores Montecarlo Information describing the FADC behaviour
+  ClassDef(MMcFadcHeader, 5)  //Stores Montecarlo Information describing the FADC behaviour
 
 };