Changeset 5248 for trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.cxx

Timestamp:

10/12/04 14:43:18 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.cxx (modified) (5 diffs)

trunk/MagicSoft/Simulation/Detector/StarResponse/srreadparam.cxx

@@ -19 +19 @@
 //=
 //= $RCSfile: srreadparam.cxx,v $
-//= $Revision: 1.5 $
+//= $Revision: 1.6 $
 //= $Author: moralejo $ 
-//= $Date: 2004-09-17 13:51:02 $
+//= $Date: 2004-10-12 13:41:09 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -75 +75 @@
 static float Simulated_Phe_p = 0.1;          //@< precision for phe loop
 static int   FADC_Shape=0;
-static float FADC_Integ=MFADC_RESPONSE_INTEGRAL;
-static float FADC_FWHM=MFADC_RESPONSE_FWHM;
-static int   Trig_Shape=0;
-static float Trig_Ampl=1.0;
-static float Trig_FWHM=2.0;
-static int   Write_Root=0;
+static float FADC_Integ = MFADC_RESPONSE_INTEGRAL;
+static float FADC_FWHM = MFADC_RESPONSE_FWHM;
+static float FADC_slices_per_ns = FADC_SLICES_PER_NSEC;
+static int   Trig_Shape = 0;
+static float Trig_Ampl = 1.0;
+static float Trig_FWHM = 2.0;
+static int   Write_Root = 0;
 //!@}
 
@@ -169 +170 @@
       break;
 
+    case fadc_GHz:  //  Get FADC sampling frequency in GHz
+
+      sscanf(line, "%s %f", token, &FADC_slices_per_ns);
+
+      break;
+
     case write_root:          //@< Write histogram
 
@@ -273 +280 @@
 //!@{
 void
-get_fadc_properties(int *shape, float *integ, float *fwhm)
+get_fadc_properties(int *shape, float *integ, float *fwhm, float *fadc_spns)
 {
   *shape =  FADC_Shape;
   *integ =  FADC_Integ;
-  *fwhm =  FADC_FWHM;
+  *fwhm  =  FADC_FWHM;
+  *fadc_spns = FADC_slices_per_ns;
 }
 //!@}
@@ -306 +314 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.5  2004/09/17 13:51:02  moralejo
+//
+// Adapted headers to current c++ style, removed -Wno-deprecated from
+// compilation options.
+//
 // Revision 1.4  2004/09/16 16:20:13  moralejo
 // *** empty log message ***