Changeset 6714 for trunk/MagicSoft

Timestamp:

03/02/05 21:47:58 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Simulation/Detector

Files:

• Camera/TOBEDONE (modified) (1 diff)
• Camera/input.card (modified) (1 diff)
• include-MFadc/MFadc.cxx (modified) (5 diffs)
• include-MFadc/MFadc.hxx (modified) (2 diffs)

trunk/MagicSoft/Simulation/Detector/Camera/TOBEDONE

@@ -3 +3 @@
 
 - Introduce correlations in the electronic noise
-
-- Change default delay of low gain pulse w.r.t. high gain (add option in input card). Make that it can have any value, not just a number of slices.
-
-- Introduce realistic time jitter of PMTs 
 
 - Make one MMcConfigRunHeader per telescope

trunk/MagicSoft/Simulation/Detector/Camera/input.card

@@ -11 +11 @@
 # The values below correspond roughly to 10 LED UV 
 #calibration_run 375. 12. 120. 2.5 5000
-calibration_run 375. 12. 120. 0.01 1
+calibration_run 375. 12. 200. 0.01 1
 # line below shows how to create a pedestal run (= cal. with 0-photon pulses):
 #calibration_run 0. 0. 0. 0. 1000

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

@@ -24 +24 @@
              Float_t trigger_delay, Float_t fadc_slices_per_ns,
              Int_t fadc_slices_written, Int_t gainswitchamp,
-             Int_t shiftfromswitch2lowgain, Int_t hi2logainpeak) {
+             Int_t shiftfromswitch2lowgain, Float_t hi2logainpeak) {
   //
   //  Constructor overloaded II 
@@ -213 +213 @@
     p5_LG = fPulseParametersLG[5];
     p6_LG = fPulseParametersLG[6];
+
+    p2_LG += (fHi2LoGainPeak - fFadcSlices); // Adjust distance between high and low gain peaks
 
 
@@ -313 +315 @@
     p6_LG = fPulseParametersLG[6];
 
+    p2_LG += (fHi2LoGainPeak - fFadcSlices); // Adjust distance between high and low gain peaks
+
     for (i=0; i< fResponseSlicesFadc ; i++ )
       {
@@ -988 +992 @@
 
       // Now put the low gain:
-      // FIXME: for now, the shift between the high and low gain peaks has to be an integer number
-      // of FADC slices. But in the data the shift is ~16.5 slices. This has to be implemented.
       i=0;
       for ( Int_t is = iFirstSlice; is < (iFirstSlice+fFadcSlices); is++ ) 
@@ -997 +999 @@
               if (switch_i > 0 && (i+fFadcSlices) >= switch_i)
                 output_lowgain[ip][i] = pedestal[ip] + 
-                  (sig_LG[ip][is-(fHi2LoGainPeak-fFadcSlices)]-pedestal[ip])/high2low_gain;
+                  (sig_LG[ip][is]-pedestal[ip])/high2low_gain;
               // Once the shift occurs, low gain is filled with the high
               // gain signal scaled down by the factor high2low_gain

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

@@ -120 +120 @@
   // By default it is now 13 slices (see constructor)
 
-  Int_t fHi2LoGainPeak;
+  Float_t fHi2LoGainPeak;
   // Distance in FADC slices from the signal peak in the high gain to the signal peak in
   // the low gain. By default we set now 16 slices (see constructor).
@@ -151 +151 @@
         Int_t   gainswitchamp = 120,
         Int_t   shiftfromswitch2lowgain = 13,
-        Int_t   hi2logainpeak = 16);
+        Float_t hi2logainpeak = 16.5);
 
   void SetSeed(UInt_t seed)  {GenElec->SetSeed(seed);}