Index: trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx	(revision 339)
+++ trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx	(revision 340)
@@ -21,7 +21,7 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.2 $
-// $Author: harald $ 
-// $Date: 1999-11-19 08:40:42 $
+// $Revision: 1.3 $
+// $Author: petry $ 
+// $Date: 2000-01-20 18:22:17 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -704,6 +704,4 @@
 
   // initalize the ROOT file 
-  //
-  //     erzeuge ein Root file 
   //
 
@@ -1172,13 +1170,8 @@
 	  wl = cphoton.get_wl();
 	  
-	  if ( wl < 1.0 )
-	    break;
-	  
-	  if ( (wl > 600.0) || (wl < 290.0) )
-	    break;
-	  
-	  // check if photon is inside outermost camera radius
-
-	  if(sqrt(cx*cx + cy*cy) > (cam.dxc[ct_NPixels-1]+1.5*ct_PixelWidth)){ 
+	  // check if photon has valid wavelength and is inside outermost camera radius
+
+	  if( (wl > 800.0) || (wl < 290.0) ||
+	      (sqrt(cx*cx + cy*cy) > (cam.dxc[ct_NPixels-1]+1.5*ct_PixelWidth)) ){ 
 	   
 	    // read next CPhoton
@@ -2281,5 +2274,5 @@
   perror(funct);
 
-  abort();
+  exit(1);
 }
 //!@}
@@ -3111,4 +3104,7 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.2  1999/11/19 08:40:42  harald
+// Now it is possible to compile the camera programm under osf1.
+//
 // Revision 1.1.1.1  1999/11/05 11:59:31  harald
 // This the starting point for CVS controlled further developments of the