Changeset 5079 for trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.hxx

Timestamp:

09/16/04 16:56:48 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.hxx (modified) (8 diffs)

trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.hxx

@@ -49 +49 @@
  private:
   Int_t numpix;
+  Int_t fInnerPixelsNum; // number of inner (small) pixels.
   //
   //    then for all pixels the shape of all the analog signals 
@@ -55 +56 @@
   Float_t  pedestal[CAMERA_PIXELS] ;  //  Pedestal of FADCs
 
-  Float_t  sig[CAMERA_PIXELS][(Int_t) SLICES_MFADC] ; //  the analog signal for pixels
+  Float_t  sig[CAMERA_PIXELS][(Int_t) SLICES_MFADC] ; //  the analog signal for pixels, in bins of width
+                                                      //  equal to the FADC slice: 50/15 ns, but with a
+                                                      //  total of SLICES_MFADC (=48 now) bins.
   Float_t noise[((Int_t) SLICES_MFADC)*1001];
+  Float_t noise_outer[((Int_t) SLICES_MFADC)*1001];
   Int_t digital_noise[((Int_t) SLICES_MFADC)*1001];
 
-  UChar_t  output[CAMERA_PIXELS][FADC_SLICES];  //  the analog signal for pixels that is read after a trigger occurs (high gain).
-
-  UChar_t  output_lowgain[CAMERA_PIXELS][FADC_SLICES]; //  analog signal, low gain.
+  Float_t  output[CAMERA_PIXELS][FADC_SLICES];  //  the analog signal for pixels that is read after a trigger 
+                                                //  occurs (high gain). Only 15 (=FADC_SLICES) bins
+
+  Float_t  output_lowgain[CAMERA_PIXELS][FADC_SLICES]; //  analog signal, low gain.
+
   Float_t high2low_gain;
   //
   //    first the data for the response function
   //
+  Int_t shape_resp ;                      // index shape of the phe_response function
+                                          // = 0 --> Gaussian
+                                          // = 1 --> Pulpo set-up
   Float_t fwhm_resp ;                      // fwhm of the phe_response function (in ns)
   Float_t integ_resp ;                      // area below curve of the phe_response function (in counts * ns)
@@ -73 +82 @@
   //    We may end up with a different reponse for the outer pixels
   //
+  Int_t shape_resp_outer ;                      // index shape of the phe_response function
+                                          // = 0 --> Gaussian
+                                          // = 1 --> Pulpo set-up
   Float_t fwhm_resp_outer ;                      // fwhm of the phe_response function (in ns)
   Float_t integ_resp_outer ;                      // area below curve of the phe_response function (in counts * ns)
@@ -90 +102 @@
 
   MFadc(Int_t pix=577,
+        Int_t shape=0,
         Float_t ampl=MFADC_RESPONSE_INTEGRAL, 
         Float_t fwhm=MFADC_RESPONSE_FWHM,
+        Int_t shapeout=0,
         Float_t amplout=MFADC_RESPONSE_INTEGRAL, 
         Float_t fwhmout=MFADC_RESPONSE_FWHM,
@@ -114 +128 @@
   void SetPedestals( Float_t *ped);
 
+  void SetShape( Int_t inner, Int_t outer){
+    shape_resp=inner;
+    shape_resp_outer=outer;
+  }
+
   void SetFwhm( Float_t fwhm){
     fwhm_resp=fwhm;
@@ -136 +155 @@
   void Offset( Float_t, Int_t );
 
-  void SetElecNoise(Float_t value=2.0);
-
-  void ElecNoise(Float_t value=2.0) ; 
+  void SetElecNoise(Float_t value1=2.0, Float_t value2=2.0, UInt_t ninpix=CAMERA_PIXELS);
+
+  void ElecNoise(); 
 
   void SetDigitalNoise(Float_t value=2.0);
@@ -154 +173 @@
   Float_t GetPedestalNoise (Int_t pix, Int_t ishigh);
 
+  Float_t AddNoiseInSlices( Int_t pix, Int_t ishigh, Int_t n_slices);
+
   void TriggeredFadc(Float_t time);
 
@@ -163 +184 @@
 
   void SetHigh2LowGain(Float_t h2l) {high2low_gain=h2l;}
+
+  Float_t GetShape() {
+    return shape_resp;
+  }
 
   Float_t GetIntegral() {