Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx	(revision 1581)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx	(revision 1585)
@@ -9,46 +9,46 @@
 {
  private:
-  Float_t      fEvtNumber;
-  UShort_t fPartId;         // Type of particle
-  Float_t  fEnergy;         // [GeV] Energy
+  UInt_t      fEvtNumber;
+  UShort_t     fPartId;     // Type of particle
+  Float_t      fEnergy;     // [GeV] Energy
   Float_t      fThick0;   
   Float_t      fFirstTarget;
-  Float_t      fzFirstInt;
+  Float_t      fZFirstInteraction;
 
   Float_t fTheta;           // [rad] Theta angle of event 
   Float_t fPhi;             // [rad] Phi angle of event 
 
-  Float_t fCoreD;           // Core d pos
-  Float_t fCoreX;           // Core x pos
-  Float_t fCoreY;           // Core y pos
-  Float_t fImpact;          // [mm] impact parameter
+  Float_t fCoreD;           // [cm] Core d pos
+  Float_t fCoreX;           // [cm] Core x pos
+  Float_t fCoreY;           // [cm] Core y pos
+  Float_t fImpact;          // [cm] impact parameter
 
-  /* ^^^ Up to here, the info from the CORSIKA event header. */
+  // Up to here, the info from the CORSIKA event header. 
 
-  /* Telescope orientation: */
-  Float_t	ftelescopePhi;    /* rad */
-  Float_t	ftelescopeTheta;  /* rad */
+  // Telescope orientation: 
+  Float_t	ftelescopePhi;    // [rad]
+  Float_t	ftelescopeTheta;  // [rad]
 
-  /* Time of first and last photon: */
-  Float_t      fTimeFirst;
-  Float_t      fTimeLast;
+  // Time of first and last photon:
+  Float_t      fTimeFirst;   // [ns]
+  Float_t      fTimeLast;    // [ns]
 
-  /* 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;
+  // 6 parameters and chi2 of the NKG fit to the longitudinal 
+  // particle distribution (see CORSIKA manual for explanation): 
+  //
+  Float_t       fLongiNmax;
+  Float_t       fLongit0;
+  Float_t       fLongitmax;
+  Float_t       fLongia;
+  Float_t       fLongib;
+  Float_t       fLongic;
+  Float_t       fLongichi2;
 
-  UInt_t fPhotIni;          // Initial number of photons
-  UInt_t fPassPhotAtm;      // Passed atmosphere
-  UInt_t fPassPhotRef;      // Passed reflector(reflectivity + effective area)
-  UInt_t fPassPhotCone;     // Passed glas
-  UInt_t fPhotElfromShower; // Passed qe coming from the shower
-  UInt_t fPhotElinCamera;   // usPhotElfromShower + mean of phe
+  UInt_t fPhotIni;          // [ph] Initial number of photons
+  UInt_t fPassPhotAtm;      // [ph] Passed atmosphere
+  UInt_t fPassPhotRef;      // [ph] Passed reflector(reflectivity + effective area)
+  UInt_t fPassPhotCone;     // [ph] Passed glas
+  UInt_t fPhotElfromShower; // [phe] Passed qe coming from the shower
+  UInt_t fPhotElinCamera;   // [phe] usPhotElfromShower + mean of phe
                             // from NSB
 
@@ -56,5 +56,5 @@
   MMcEvt() ;
   
-  MMcEvt( Float_t, UShort_t, Float_t, Float_t, Float_t,
+  MMcEvt( UInt_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, 
@@ -66,5 +66,5 @@
   void Clear(Option_t *opt=NULL);
 
-  void Fill( Float_t, UShort_t, Float_t, Float_t, Float_t, 
+  void Fill( UInt_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,