Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 5320)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 5321)
@@ -19,4 +19,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/10/26: Abelardo Moralejo
+
+   * mmc/MMcEvt.[hxx,cxx], MMcFadcHeader.hxx
+     - added new data members fFadcTimeJitter and fGainFluctuations for 
+       new camera simulation options. Updated class versions to 4 and 5 
+       respectively
 
  2004/10/22: Thomas Bretz
Index: /trunk/MagicSoft/Simulation/Detector/Camera/camera.h
===================================================================
--- /trunk/MagicSoft/Simulation/Detector/Camera/camera.h	(revision 5320)
+++ /trunk/MagicSoft/Simulation/Detector/Camera/camera.h	(revision 5321)
@@ -19,7 +19,7 @@
 //=
 //= $RCSfile: camera.h,v $
-//= $Revision: 1.25 $
+//= $Revision: 1.26 $
 //= $Author: moralejo $ 
-//= $Date: 2004-10-26 14:03:00 $
+//= $Date: 2004-10-26 19:21:20 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -316,5 +316,6 @@
 		  float *tmax_ns,    // maximum arrival time of all phes
 		  int telescope,      // Telescope that is being analised to get the right QE.
-		  float mirror_fraction // Fraction of working mirror
+		  float mirror_fraction, // Fraction of working mirror
+		  float fadc_jitter  // Time jitter due to FADC clock noise
 		  ); 
 
@@ -369,4 +370,7 @@
 /*
  *$Log: not supported by cvs2svn $
+ *Revision 1.25  2004/10/26 14:03:00  moralejo
+ **** empty log message ***
+ *
  *Revision 1.24  2004/10/19 10:35:05  moralejo
  **** empty log message ***
Index: /trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx
===================================================================
--- /trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx	(revision 5320)
+++ /trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx	(revision 5321)
@@ -255,4 +255,6 @@
   }
 
+  Bool_t GetGainFluctuations() { return fGainFluctuations; }
+
 } ; 
 
Index: /trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx
===================================================================
--- /trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 5320)
+++ /trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 5321)
@@ -68,5 +68,6 @@
 		Float_t  elec,
 		Float_t  muon,
-		Float_t  other) {
+		Float_t  other,
+		Float_t  fadc_jitter) {
 
     fName  = "MMcEvt";
@@ -118,4 +119,6 @@
   fMuonCphFraction=muon;
   fOtherCphFraction=other;
+
+  fFadcTimeJitter = fadc_jitter;
 }
 
@@ -190,5 +193,6 @@
 		   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,4 +239,5 @@
   fOtherCphFraction=other;
 
+  fFadcTimeJitter = fadc_jitter;
 }
 
Index: /trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx
===================================================================
--- /trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx	(revision 5320)
+++ /trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx	(revision 5321)
@@ -80,5 +80,5 @@
   Float_t  fOtherCphFraction;
   
-
+  Float_t  fFadcTimeJitter;
 
  public:
@@ -90,5 +90,5 @@
 	  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,5 +101,5 @@
 	     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,4 +138,6 @@
   Float_t GetLongit0()   const { return fLongit0; }
   Float_t GetLongitmax() const { return fLongitmax; }
+
+  Float_t GetFadcTimeJitter() const { return fFadcTimeJitter; }
 
   void SetPartId(Short_t PartId)
@@ -230,5 +232,5 @@
 
 
-  ClassDef(MMcEvt, 3)  //Stores Montecarlo Information of one event (eg. the energy)
+  ClassDef(MMcEvt, 4)  //Stores Montecarlo Information of one event (eg. the energy)
 
 };
Index: /trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx
===================================================================
--- /trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx	(revision 5320)
+++ /trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx	(revision 5321)
@@ -52,4 +52,8 @@
   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,4 +104,6 @@
   }
   
+  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,5 +117,5 @@
   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
 
 };