Changeset 672 for trunk

Timestamp:

03/05/01 10:43:18 (24 years ago)

Author:

blanch

Message:

New input commands have been added:

	- write_McFadc: to write the FADC simulation information.
	- fadc_prop: gives the shape of the single phe response of the FADC

And new value has been added in the mean_NSB command that tells how many phes
have to come from the shower to do the NSB simulation in that shower (it speeds
up the simulation).

File:

• trunk/MagicSoft/Simulation/Detector/Camera/creadparam.cxx (modified) (11 diffs)

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

@@ -19 +19 @@
 //=
 //= $RCSfile: creadparam.cxx,v $
-//= $Revision: 1.8 $
-//= $Author: magicsol $ 
-//= $Date: 2001-02-23 10:55:43 $
+//= $Revision: 1.9 $
+//= $Author: blanch $ 
+//= $Date: 2001-03-05 10:43:18 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -77 +77 @@
 static int anaPixels = -1;      //@< number of pixels for the analysis
 static float meanNSB;           //@< NSB mean value (per pixel)
+static int nphe2NSB=0;            //@< Number of phe from shower to do NSB simulation 
 static float qThreshold;        //@< Threshold value
 static char NSB_directory[PATH_MAX_LENGTH];  //@< database for NSB
@@ -91 +92 @@
 static int Write_McEvt  = TRUE;
 static int Write_McTrig = FALSE;
+static int Write_McFadc = FALSE;
 static int Write_RawEvt = FALSE;
 static int Write_All_Data = FALSE;
@@ -116 +118 @@
 static int Trigger_loop_ltop = 0;
 static int Trigger_loop_utop = 2;
+static float FADC_response_ampl = MFADC_RESPONSE_AMPLITUDE;
+static float FADC_response_fwhm = MFADC_RESPONSE_FWHM;
 //!@}
 
@@ -246 +250 @@
           
       // get value of <NSB> (in photons)
-      sscanf(line, "%s %f", token, &meanNSB);
+      sscanf(line, "%s %f %d", token, &meanNSB, &nphe2NSB);
 
       break;
@@ -361 +365 @@
       break;
 
+    case write_McFadc:    //@< to write the McFadc info
+          
+      // change boolean value
+      Write_McFadc = TRUE;
+
+      break;
+
     case write_all_data:      //@< to write single pixel data
           
@@ -399 +410 @@
       break;
 
+    case fadc_prop:
+
+      //  Get parameters for the fadc  response for one phe
+      sscanf(line, "%s %f %f", token, &FADC_response_ampl,&FADC_response_fwhm);
+
+      break;
+
     case trigger_scan:
 
@@ -614 +632 @@
 //!@{
 int
-get_nsb(float *n)
+get_nsb(float *n, int *m)
 {
   *n = meanNSB;
+  *m = nphe2NSB;
   return ( simulateNSB );
 }
@@ -903 +922 @@
 
 //!-----------------------------------------------------------
+// @name write_McFadc
+//                                                
+// @desc write the McFadc class for each event to the .root file 
+//
+// @return  TRUE: we'll write it;  FALSE: we won't
+//
+//------------------------------------------------------------
+// @function 
+ 
+//!@{
+int
+get_write_McFadc(void)
+{
+  return ( Write_McFadc );
+}
+//!@}
+
+//!-----------------------------------------------------------
 // @name write_RawEvt
 //                                                
@@ -1018 +1055 @@
 {
   return ( Trigger_Scan );
+}
+//!@}
+
+//!-----------------------------------------------------------
+// @name Fadc_Propeties
+//                                                
+// @desc fix properties of the FADC response 
+//
+//------------------------------------------------------------
+// @function 
+
+//!@{
+void
+get_FADC_properties(float *ra, float *rf)
+{
+  *ra=FADC_response_ampl;
+  *rf=FADC_response_fwhm;
+
 }
 //!@}
@@ -1090 +1145 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.8  2001/02/23 10:55:43  magicsol
+// An input commmand that talls the path for the NSB database has been added.
+//
 // Revision 1.7  2001/01/15 12:37:48  magicsol
 // It has been introduced the option to read from the input card the overlaping