Index: trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx	(revision 709)
+++ trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx	(revision 723)
@@ -21,7 +21,7 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.23 $
-// $Author: blanch $ 
-// $Date: 2001-03-28 16:13:41 $
+// $Revision: 1.24 $
+// $Author: magicsol $ 
+// $Date: 2001-04-06 16:48:09 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -385,4 +385,6 @@
   //@'
 
+  int ioscar=0;
+
   char inname[256];           //@< input file name
   char starfieldname[256];    //@< starfield input file name
@@ -1128,5 +1130,4 @@
 
       while( isA( flag, FLAG_START_OF_EVENT   )){ // while there is a next event
-
 	//
 	// Clear Trigger and Fadc
@@ -1141,5 +1142,4 @@
 	
 	// get MCEventHeader
-	
 	fread( (char*)&mcevth, mcevth.mysize(), 1, inputfile );
 
@@ -1443,7 +1443,7 @@
 			   mcevth.get_coreY(),
 			   impactD,
-			   ulli, 
-			   ulli, 
-			   (UInt_t) ncph, 
+			   (UInt_t)mcevth.get_CORSIKA(), 
+			   (UInt_t)mcevth.get_AtmAbs(), 
+			   (UInt_t)mcevth.get_MirrAbs()+mcevth.get_OutOfMirr()+mcevth.get_BlackSpot(), 
 			   (UInt_t) ncph, 
 			   (UInt_t) inumphe,
@@ -1452,5 +1452,5 @@
 	    //  Fill the Tree with the current leaves of each branch
 	    i=EvtTree.Fill() ;
-    
+
 	    //  Clear the branches
 	    if(Write_McTrig){
@@ -1559,7 +1559,7 @@
 			   mcevth.get_coreY(),
 			   impactD,
-			   ulli, 
-			   ulli, 
-			   (UInt_t) ncph, 
+			   (UInt_t)mcevth.get_CORSIKA(), 
+			   (UInt_t)mcevth.get_AtmAbs(), 
+			   (UInt_t)mcevth.get_MirrAbs()+mcevth.get_OutOfMirr()+mcevth.get_BlackSpot(), 
 			   (UInt_t) ncph, 
 			   (UInt_t) inumphe,
@@ -1574,7 +1574,5 @@
 	    
 	    EvtTree.Fill() ; 
-	    
-	  
-	  
+	    	  	  
 	    //
 	    //    if a first level trigger occurred, then 
@@ -2854,5 +2852,4 @@
 	  
     // check if wl is inside table; outside the table, QE is assumed to be zero
-
     
     if((wl < qept[0][0]) || (wl > qept[0][pointsQE-1])){
@@ -3220,4 +3217,8 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.23  2001/03/28 16:13:41  blanch
+// While feeling the MMcFadeHeader branch the boolean conditoin was wrong. It has
+// been solved.
+//
 // Revision 1.22  2001/03/20 18:52:43  blanch
 // *** empty log message ***
@@ -3268,4 +3269,8 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.23  2001/03/28 16:13:41  blanch
+// While feeling the MMcFadeHeader branch the boolean conditoin was wrong. It has
+// been solved.
+//
 // Revision 1.22  2001/03/20 18:52:43  blanch
 // *** empty log message ***