Changeset 340 for trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx

Timestamp:

01/20/00 18:22:17 (25 years ago)

Author:

petry

Message:

Found little bug which makes camera crash if it finds a photon
of invalid wavelength. This bug is now fixed and the range
of valid wavelengths extended to 290 - 800 nm.
This is in preparation for the NSB simulation to come.
Dirk

File:

• trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx (modified) (5 diffs)

trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx

@@ -21 +21 @@
 //
 // $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 +704 @@
 
   // initalize the ROOT file 
-  //
-  //     erzeuge ein Root file 
   //
 
@@ -1172 +1170 @@
           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 +2274 @@
   perror(funct);
 
-  abort();
+  exit(1);
 }
 //!@}
@@ -3111 +3104 @@
 //
 // $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