Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 618)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 619)
@@ -21,5 +21,5 @@
   //  set all values to zero
 
-  usPartId = 0  ;
+  fPartId = 0  ;
   fEnergy  = 0. ;
 
@@ -32,9 +32,10 @@
   fImpact  = 0. ;
 
-  usPhotIni      = 0 ;
-  usPassPhotAtm  = 0 ;
-  usPassPhotRef  = 0 ;
-  usPassPhotCone = 0 ;
-  usPhotEl       = 0 ;
+  fPhotIni      = 0 ;
+  fPassPhotAtm  = 0 ;
+  fPassPhotRef  = 0 ;
+  fPassPhotCone = 0 ;
+  fPhotElfromShower = 0 ;
+  fPhotElinCamera = 0 ;
 }
 
@@ -47,9 +48,10 @@
 		Float_t  fCorY,
 		Float_t  fImpa, 
-		UShort_t usPin, 
-		UShort_t usPat,  
-		UShort_t usPre, 
-		UShort_t usPco,  
-		UShort_t usPel ) {
+		UInt_t   uiPin, 
+		UInt_t   uiPat,  
+		UInt_t   uiPre, 
+		UInt_t   uiPco,  
+		UInt_t   uiPelS,
+		UInt_t   uiPelC ) {
   //
   //  constuctor II 
@@ -60,5 +62,5 @@
   //  
 
-  usPartId = usPId  ;
+  fPartId = usPId  ;
   fEnergy  = fEner  ;
 
@@ -71,9 +73,10 @@
   fImpact  = fImpa ;
 
-  usPhotIni      = usPin ;
-  usPassPhotAtm  = usPat ;
-  usPassPhotRef  = usPre ;
-  usPassPhotCone = usPco ;
-  usPhotEl       = usPel ;
+  fPhotIni      = uiPin ;
+  fPassPhotAtm  = uiPat ;
+  fPassPhotRef  = uiPre ;
+  fPassPhotCone = uiPco ;
+  fPhotElfromShower = uiPelS ;
+  fPhotElinCamera   = uiPelC ;
 }
 
@@ -94,5 +97,5 @@
   //  reset all values to zero
 
-  usPartId = 0  ;
+  fPartId = 0  ;
   fEnergy  = 0. ;
 
@@ -105,10 +108,12 @@
   fImpact  = 0. ;
 
-  usPhotIni      = 0 ;
-  usPassPhotAtm  = 0 ;
-  usPassPhotRef  = 0 ;
-  usPassPhotCone = 0 ;
-  usPhotEl       = 0 ;
+  fPhotIni      = 0 ;
+  fPassPhotAtm  = 0 ;
+  fPassPhotRef  = 0 ;
+  fPassPhotCone = 0 ;
+  fPhotElfromShower = 0 ;
+  fPhotElinCamera   = 0 ;
 }
+
 void MMcEvt::Fill( UShort_t usPId, 
 		   Float_t  fEner, 
@@ -119,9 +124,10 @@
 		   Float_t  fCorY,
 		   Float_t  fImpa, 
-		   UShort_t usPin, 
-		   UShort_t usPat,  
-		   UShort_t usPre, 
-		   UShort_t usPco,  
-		   UShort_t usPel ) {
+		   UInt_t   uiPin, 
+		   UInt_t   uiPat,  
+		   UInt_t   uiPre, 
+		   UInt_t   uiPco,  
+		   UInt_t   uiPelS,  
+		   UInt_t   uiPelC ) {
   //
   //  All datamembers are filled with the correspondin parameters. 
@@ -130,5 +136,5 @@
   //  
 
-  usPartId = usPId  ;
+  fPartId = usPId  ;
   fEnergy  = fEner  ;
 
@@ -141,9 +147,10 @@
   fImpact  = fImpa ;
 
-  usPhotIni      = usPin ;
-  usPassPhotAtm  = usPat ;
-  usPassPhotRef  = usPre ;
-  usPassPhotCone = usPco ;
-  usPhotEl       = usPel ;
+  fPhotIni      = uiPin ;
+  fPassPhotAtm  = uiPat ;
+  fPassPhotRef  = uiPre ;
+  fPassPhotCone = uiPco ;
+  fPhotElfromShower = uiPelS ;
+  fPhotElinCamera = uiPelC ;
 }
 
@@ -154,12 +161,9 @@
   //  print out the data member on screen
   //
-  cout << endl << "Monte Carlo output:" << endl;
-  cout << " Particle Id:    " << usPartId << endl;
-  cout << " Energy [GeV]:   " << fEnergy  << endl;
-  cout << " Impactpar. [m]: " << fImpact  << endl;
-  cout << " Photoelectrons: " << usPhotEl << endl;
+  cout <<endl << "Monte Carlo output:" <<endl;
+  cout << " Particle Id    : " << fPartId ; 
+  cout << " Energy (GeV)   : " << fEnergy  ; 
+  cout << " Impactpar. (m) : " << fImpact  ; 
+  cout << " Photoelectrons : " << fPhotElfromShower ; 
   cout << endl ; 
 }
-
-    
-