Index: trunk/MagicSoft/Simulation/Detector/Camera/creadparam.cxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/creadparam.cxx	(revision 5166)
+++ trunk/MagicSoft/Simulation/Detector/Camera/creadparam.cxx	(revision 5245)
@@ -19,7 +19,7 @@
 //=
 //= $RCSfile: creadparam.cxx,v $
-//= $Revision: 1.29 $
+//= $Revision: 1.30 $
 //= $Author: moralejo $ 
-//= $Date: 2004-09-17 14:48:21 $
+//= $Date: 2004-10-12 13:32:02 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -49,5 +49,5 @@
 static float FADC_Noise_inner = 2.0;         //@< Value for FADC ElecNoise
 static float FADC_Noise_outer = 2.0;         //@< Value for FADC ElecNoise
-static float Digital_Noise = 1.0;            //@< Value for FADC  digital Noise
+static float Digital_Noise = 0.0;            //@< Value for FADC  digital Noise
 static float Trig_Noise = 0.3;                //@< Factor for Trigger ElecNoise
 static int simulateNSB = TRUE;                //@< Will we simulate NSB?
@@ -90,7 +90,9 @@
 static float FADC_response_ampl = MFADC_RESPONSE_INTEGRAL;
 static float FADC_response_fwhm = MFADC_RESPONSE_FWHM;
-static int FADC_shape_out = 0;
+static int   FADC_shape_out = 0;
 static float FADC_resp_ampl_out = MFADC_RESPONSE_INTEGRAL;
 static float FADC_resp_fwhm_out = MFADC_RESPONSE_FWHM;
+static float FADC_slices_per_ns = FADC_SLICES_PER_NSEC;
+static int   FADC_slices_written = FADC_SLICES;
 static float High_to_Low = 10.0;      //@< Low gain channel respct to High
 
@@ -184,6 +186,6 @@
     // if it is not a valid line, just ignore it
     if (i == end_file+1) {
-      cerr << "Skipping unknown token in [" << line << "]\n";
-      continue;
+      cerr << "ERROR: Unknown token in [" << line << "]\n";
+      exit(-1);
     }
 
@@ -472,4 +474,11 @@
       break;
 
+    case fadc_GHz:
+
+      //  Get FADC sampling frequency in GHz (default 0.3)
+      sscanf(line, "%s %f %i", token, &FADC_slices_per_ns, &FADC_slices_written);
+
+      break;
+
     case trigger_scan:
 
@@ -1203,13 +1212,15 @@
 void
 get_FADC_properties(int *shape,float *ra, float *rf,
-		    int *shapeo, float *rao, float *rfo)
-{
-  *shape=FADC_shape;
-  *ra=FADC_response_ampl;
-  *rf=FADC_response_fwhm;
-  *shapeo=FADC_shape_out;
-  *rao=FADC_resp_ampl_out;
-  *rfo=FADC_resp_fwhm_out;
-
+		    int *shapeo, float *rao, float *rfo, 
+		    float *fadc_spns, int *fadc_slices)
+{
+  *shape = FADC_shape;
+  *ra = FADC_response_ampl;
+  *rf = FADC_response_fwhm;
+  *shapeo = FADC_shape_out;
+  *rao = FADC_resp_ampl_out;
+  *rfo = FADC_resp_fwhm_out;
+  *fadc_spns = FADC_slices_per_ns;
+  *fadc_slices = FADC_slices_written;
 }
 //!@}
@@ -1282,5 +1293,5 @@
 
 //!-----------------------------------------------------------
-// @name get_FADC_pedesta
+// @name get_FADC_pedestal
 //                                                
 // @desc get the value for the FADC pedestals
@@ -1362,4 +1373,8 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.29  2004/09/17 14:48:21  moralejo
+//
+// Changes to adapt headers to c++ style.
+//
 // Revision 1.28  2004/09/16 15:27:08  moralejo
 // Updated in CVS after some time (see changes below)
Index: trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h	(revision 5166)
+++ trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h	(revision 5245)
@@ -19,7 +19,7 @@
 //=
 //= $RCSfile: creadparam.h,v $
-//= $Revision: 1.26 $
+//= $Revision: 1.27 $
 //= $Author: moralejo $ 
-//= $Date: 2004-09-17 14:48:21 $
+//= $Date: 2004-10-12 13:32:02 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -103,4 +103,5 @@
 T(fadc_prop),       /* values of fadc properties */ \
 T(fadc_outer),      /* values of fadc properties for outer pixels */ \
+T(fadc_GHz),        /* FADC sampling frequency (GHz) */ \
 T(trigger_single),  /* trigger conditions */ \
 T(Trigger_Loop_Output_Only_Specialists),   /* special steercard */ \
@@ -175,5 +176,6 @@
 int get_Trigger_Scan(void);
 void get_Trigger_properties(float *gl, float *ot, float *ra, float *rf);
-void get_FADC_properties(int *shape, float *ra, float *rf,int *shapeo, float *rao, float *rfo);
+void get_FADC_properties(int *shape, float *ra, float *rf,int *shapeo, float *rao, float *rfo, 
+			 float *fadc_spns, int *fadc_slices);
 float get_FADC_pedestal(void);
 int get_Trigger_Loop(float *lt, float *ut, float *st, int *lm, int *um, int *lg, int *ug);
@@ -203,4 +205,8 @@
 /*
  * $Log: not supported by cvs2svn $
+ * Revision 1.26  2004/09/17 14:48:21  moralejo
+ *
+ * Changes to adapt headers to c++ style.
+ *
  * Revision 1.25  2004/09/16 15:27:08  moralejo
  * Updated in CVS after some time (see changes below)