Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 1542)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 1580)
@@ -28,6 +28,10 @@
 }
 
-MMcEvt::MMcEvt( UShort_t usPId,
-		Float_t  fEner, 
+MMcEvt::MMcEvt( Float_t  fEvtNum,
+		UShort_t usPId,
+		Float_t  fEner,
+		Float_t  fThi0,
+		Float_t  fFirTar,
+		Float_t  fzFirInt,
 		Float_t  fThet, 
 		Float_t  fPhii, 
@@ -35,5 +39,16 @@
 		Float_t  fCorX, 
 		Float_t  fCorY,
-		Float_t  fImpa, 
+		Float_t  fImpa,
+		Float_t  fTPhii,
+		Float_t  fTThet,
+		Float_t  fTFirst,
+		Float_t  fTLast,
+		Float_t  fL_Nmax,
+		Float_t  fL_t0,
+		Float_t  fL_tmax,
+		Float_t  fL_a,
+		Float_t  fL_b,
+		Float_t  fL_c,
+		Float_t  fL_chi2,
 		UInt_t   uiPin, 
 		UInt_t   uiPat,  
@@ -53,6 +68,10 @@
   //  
 
+  fEvtNumber = fEvtNum;
   fPartId = usPId  ;
   fEnergy  = fEner  ;
+  fThick0 = fThi0;
+  fFirstTarget = fFirTar;
+  fzFirstInt = fzFirInt;
 
   fTheta   = fThet ;
@@ -63,4 +82,16 @@
   fCoreY   = fCorY ;
   fImpact  = fImpa ;
+
+  ftelescopePhi = fTPhii;
+  ftelescopeTheta = fTThet;
+  fTimeFirst = fTFirst;
+  fTimeLast = fTLast;
+  flongi_Nmax = fL_Nmax;
+  flongi_t0 = fL_t0;
+  flongi_a = fL_a;
+  flongi_b = fL_b;
+  flongi_c = fL_c;
+  flongi_chi2 = fL_chi2;
+
 
   fPhotIni      = uiPin ;
@@ -107,6 +138,10 @@
 }
 
-void MMcEvt::Fill( UShort_t usPId, 
+void MMcEvt::Fill( Float_t  fEvtNum,
+		   UShort_t usPId, 
 		   Float_t  fEner, 
+		   Float_t  fThi0,
+		   Float_t  fFirTar,
+		   Float_t  fzFirInt,
 		   Float_t  fThet, 
 		   Float_t  fPhii, 
@@ -115,4 +150,15 @@
 		   Float_t  fCorY,
 		   Float_t  fImpa, 
+		   Float_t  fTPhii,
+		   Float_t  fTThet,
+		   Float_t  fTFirst,
+		   Float_t  fTLast,
+		   Float_t  fL_Nmax,
+		   Float_t  fL_t0,
+		   Float_t  fL_tmax,
+		   Float_t  fL_a,
+		   Float_t  fL_b,
+		   Float_t  fL_c,
+		   Float_t  fL_chi2,
 		   UInt_t   uiPin, 
 		   UInt_t   uiPat,  
@@ -127,6 +173,10 @@
   //  
 
+  fEvtNumber = fEvtNum;
   fPartId = usPId  ;
   fEnergy = fEner  ;
+  fThick0 = fThi0;
+  fFirstTarget = fFirTar;
+  fzFirstInt = fzFirInt;
 
   fTheta  = fThet ;
@@ -137,4 +187,15 @@
   fCoreY  = fCorY ;
   fImpact = fImpa ;
+
+  ftelescopePhi = fTPhii;
+  ftelescopeTheta = fTThet;
+  fTimeFirst = fTFirst;
+  fTimeLast = fTLast;
+  flongi_Nmax = fL_Nmax;
+  flongi_t0 = fL_t0;
+  flongi_a = fL_a;
+  flongi_b = fL_b;
+  flongi_c = fL_c;
+  flongi_chi2 = fL_chi2;
 
   fPhotIni      = uiPin ;
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx	(revision 1542)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx	(revision 1580)
@@ -9,6 +9,10 @@
 {
  private:
+  Float_t      fEvtNumber;
   UShort_t fPartId;         // Type of particle
   Float_t  fEnergy;         // [GeV] Energy
+  Float_t      fThick0;   
+  Float_t      fFirstTarget;
+  Float_t      fzFirstInt;
 
   Float_t fTheta;           // [rad] Theta angle of event 
@@ -19,4 +23,25 @@
   Float_t fCoreY;           // Core y pos
   Float_t fImpact;          // [mm] impact parameter
+
+  /* ^^^ Up to here, the info from the CORSIKA event header. */
+
+  /* Telescope orientation: */
+  Float_t	ftelescopePhi;    /* rad */
+  Float_t	ftelescopeTheta;  /* rad */
+
+  /* Time of first and last photon: */
+  Float_t      fTimeFirst;
+  Float_t      fTimeLast;
+
+  /* 6 parameters and chi2 of the NKG fit to the longitudinal 
+   * particle distribution (see CORSIKA manual for explanation): 
+   */
+  Float_t       flongi_Nmax;
+  Float_t       flongi_t0;
+  Float_t       flongi_tmax;
+  Float_t       flongi_a;
+  Float_t       flongi_b;
+  Float_t       flongi_c;
+  Float_t       flongi_chi2;
 
   UInt_t fPhotIni;          // Initial number of photons
@@ -31,6 +56,8 @@
   MMcEvt() ;
   
-  MMcEvt( UShort_t, 
-	  Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
+  MMcEvt( Float_t, UShort_t, Float_t, Float_t, Float_t,
+	  Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
+	  Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, 
+	  Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, 
 	  UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t ) ; 
   
@@ -39,6 +66,8 @@
   void Clear(Option_t *opt=NULL);
 
-  void Fill( UShort_t, 
-	     Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
+  void Fill( Float_t, UShort_t, Float_t, Float_t, Float_t, 
+	     Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
+	     Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
+	     Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
 	     UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t ) ; 
 
@@ -100,5 +129,5 @@
 
 
-  ClassDef(MMcEvt, 1)  //Stores Montecarlo Information of one event (eg. the energy)
+  ClassDef(MMcEvt, 2)  //Stores Montecarlo Information of one event (eg. the energy)
 
 };