Index: trunk/MagicSoft/Simulation/Detector/Camera/camera.h
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/camera.h	(revision 388)
+++ trunk/MagicSoft/Simulation/Detector/Camera/camera.h	(revision 389)
@@ -19,7 +19,7 @@
 //=
 //= $RCSfile: camera.h,v $
-//= $Revision: 1.4 $
-//= $Author: petry $ 
-//= $Date: 2000-02-18 17:42:39 $
+//= $Revision: 1.5 $
+//= $Author: blanch $ 
+//= $Date: 2000-05-11 13:58:42 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -98,5 +98,5 @@
 #define WIDTH_TIMESLICE   3.3
  
-#define NOTIME 999999999
+#define NOTIME 9e+10
 
 #define SIN60   0.866025403784439
@@ -237,14 +237,4 @@
 };
 
-class Photoelectron{
- public:
-  int iarrtime_ns; // arrival time taken from the corresponding photon
-  int ipixnum;     // pixel in which the phe was evoked (starts at 0)
-  
-  Photoelectron(); // constructor (code in camera.cxx)
-
-};
-
-
 //=------------------------------------------------------------
 //!@subsection Pre-defined file names.
@@ -290,5 +280,6 @@
 		  float minwl_nm, // the minimum accepted wavelength
 		  float maxwl_nm, // the maximum accepted wavelength
-		  class Photoelectron phe[iMAXNUMPHE], // the generated phes
+		  class MTrigger *trigger,
+		  class MFadc *fadc,
 		  int *itotnphe, // total number of produced photoelectrons
 		  float *nphe, // number of photoelectrons in each pixel
@@ -300,5 +291,4 @@
 int produce_nsbrates( char *inname,
 		      struct camera *cam,
-		      class Photoelectron phe[iMAXNUMPHE],
 		      float nsbrate[][iNUMWAVEBANDS]
 		      );
@@ -312,5 +302,6 @@
 		      float extinction[iNUMWAVEBANDS],
 		      float fnpx[iMAXNUMPIX],
-		      Photoelectron photo[iMAXNUMPHE],
+		      class MTrigger *trigger,
+		      class MFadc *fadc,
 		      int *inphe,
 		      float base_mv[iMAXNUMPIX]); 
@@ -325,4 +316,18 @@
 /*
  *$Log: not supported by cvs2svn $
+ *Revision 1.4  2000/02/18 17:42:39  petry
+ *This version includes drastic changes and belongs to camera.cxx 1.5.
+ *It is not yet finished and not immediately useful because the
+ *trigger simulation is not yet re-implemented. I had to take it
+ *out together with some other stuff in order to tidy the whole
+ *program up. This is not meant as an insult to anyone. I needed
+ *to do this in order to be able to work on it.
+ *
+ *This version has been put in the repository in order to be
+ *able to share the further development with others.
+ *
+ *If you need something working, wait or take an earlier one.
+ *See file README.
+ *
  *Revision 1.3  1999/11/11 20:29:29  harald
  *Small changes to run the new version on a linux machine.