Index: trunk/MagicSoft/include-Classes/MMcFormat/MFadcDefine.h
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MFadcDefine.h	(revision 4577)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MFadcDefine.h	(revision 5253)
@@ -1,41 +1,26 @@
 //
-//  --> Frist of all the WIDTH of the time slice of one FADC slice 
-//      this is 3.33333 nsec.
+//  --> Sampling frequency of the FADC, in number of slices
+//  per nsec, for the original 300 MHz FADCs of MAGIC. WARNING:
+//  DO NOT CHANGE this number to set a different sampling frequency
+//  of the signals! USE instead the "fadc_GHz" command in the camera
+//  input card (see instructions)
 //
-#define WIDTH_FADC_TIMESLICE   (50./15.)       //  this means 3.33 nsec 
+#define FADC_SLICES_PER_NSEC 0.3
 //
-//  --> Second the number of slices to fill in MFADC. This must by 
-//      connected to the MTrigger class. The time of interest must be
-//      equal in both classes. 
-//
-#define SLICES_MFADC           (TOTAL_TRIGGER_TIME / WIDTH_FADC_TIMESLICE)
 //
 //  --> The amount of FADC slice written to the raw format.
-//
 #define FADC_SLICES  15
 //
-//  --> The amount of ns before trigger that would be read from the ADC
-//      in oder to show also the start of the pulse before the
-//      the trigger time.
-//
-#define TIME_BEFORE_TRIGGER    10.
-//  --> like the trigger the FADC value will also have a standard response
-//      to one single Photo electron. This response is binned with smaller
-//      bins. The WIDTH of that response function is done here. 
-// 
-#define SUBBINS     5.
-#define WIDTH_RESPONSE_MFADC   (WIDTH_FADC_TIMESLICE /  SUBBINS )  
-// 5 sub-bin in one FADC slice 
-//
-//  --> the number of Response slices
-//
-#define RESPONSE_SLICES_MFADC   45         
+//  --> Number of bins per FADC slice that we will use for the analog 
+//      signal simulation.
+#define SUBBINS     5
 //
 //
-#define MFADC_RESPONSE_FWHM        5.0
+// --> Default values of the single photoelectron response going to the FADC,
+//     in the case the gaussian shape is chosen.
+//
+#define MFADC_RESPONSE_FWHM       5.0
+#define MFADC_RESPONSE_INTEGRAL   4.0
 
-//
-//
-#define MFADC_RESPONSE_INTEGRAL   4.0
 //
 // -->  The maximum number of FADC channels
@@ -43,5 +28,12 @@
 #define MFADC_CHANNELS  3500
 //
-// Ratio of high to low gain:
+//  --> Ratio of high to low gain:
+#define HIGH2LOWGAIN 10.
 //
-#define HIGH2LOWGAIN 10.
+//
+//  --> The amount of ns before trigger that would be shown from the ADC
+//      history in order to show also the start of the pulse before the
+//      the trigger time.-> JUST FOR DISPLAY purposes! (see MFadc::Scan)
+#define TIME_BEFORE_TRIGGER    10.  
+// 
+//
Index: trunk/MagicSoft/include-Classes/MMcFormat/MTriggerDefine.h
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MTriggerDefine.h	(revision 4577)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MTriggerDefine.h	(revision 5253)
@@ -32,5 +32,5 @@
 //      Dead time of the detector after second level trigger fires
 //
-#define SLICES_PER_NSEC         4
+#define TRIG_SLICES_PER_NSEC         4
 //      
 //      Each nano second is divided into the number of this values slices. 
@@ -39,5 +39,5 @@
 //      In the current settings this are 1000 slices
 //
-#define TRIGGER_TIME_SLICES     (TOTAL_TRIGGER_TIME*SLICES_PER_NSEC) 
+#define TRIGGER_TIME_SLICES     (TOTAL_TRIGGER_TIME*TRIG_SLICES_PER_NSEC) 
 //
 //
@@ -46,12 +46,15 @@
 //       ------>>>   SETTINGS for the RESPONSE FUNCTION
 // 
-#define RESPONSE_SLICES        40
+#define RESPONSE_SLICES_TRIG        40
 //
-//       This is for the standard response Signal to 1 Photoelectron
-//       that leaves the Photocathode
-//       The whole Timescale for the signal is 10 nsec
+//       This is the dimension of the array containing the standard response Signal 
+//       for 1 Photoelectron, as seen at the input of the discriminators (for the 
+//       trigger simulation). Each bin corresponds to 1./TRIG_SLICES_PER_NSEC nanoseconds,
+//       so by default it is 0.25 ns and hence the total range is 10 ns. This should be 
+//       enough for any reasonable single photoelectron response (should be much narrower 
+//       than 10 ns!)
 //
+
 //       The Response function
-//
 //       These values are discussed with Eckart. We start from this point. 
 //
@@ -61,5 +64,5 @@
 //
 //       This are the Standard values of the response function for
-//       1 photo electron. ( 1 means 1 mV per phote electron ) 
+//       1 photo electron. ( 1 means 1 mV per photoelectron ) 
 //
 //
Index: trunk/MagicSoft/include-Classes/MMcFormat/Mdefine.h
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/Mdefine.h	(revision 4577)
+++ trunk/MagicSoft/include-Classes/MMcFormat/Mdefine.h	(revision 5253)
@@ -11,6 +11,4 @@
 //     Number of the Slices of one Fadc. Be carefull this is the number of 
 //     slices for one gain branch. We sample two times this number. 
-
-#define     FADC_SLICES            15
 
 //     ParticleId for Monte Carlo simulation
@@ -29,6 +27,4 @@
 #define FALSE 0
 
-#define MAX_ADC 30  // nummber of ADC conversions per pixel
-
 //camera dimensions and definitions
 #define PIXEL_SIZE  0.00175  // radians