Index: trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h	(revision 2288)
+++ trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h	(revision 2289)
@@ -19,7 +19,7 @@
 //=
 //= $RCSfile: creadparam.h,v $
-//= $Revision: 1.16 $
+//= $Revision: 1.17 $
 //= $Author: blanch $ 
-//= $Date: 2003-01-14 13:37:32 $
+//= $Date: 2003-07-17 18:05:13 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -154,6 +154,8 @@
 T(root_file),       /* ROOT file */                               \
 T(ct_file),         /* file with the characteristics of the CT */ \
+T(qe_file),         /* file with the characteristics of the CT */ \
 T(ana_pixels),      /* size of the camera for parameters calculation */  \
 T(elec_noise_off),  /* de-activates ElecNoise for FADC and Trigger channels */\
+T(fadc_pedestal),      /* Pedestal value for FADC */\
 T(fadc_noise),      /* ElecNoise for FADC */\
 T(trig_noise),      /* ElecNoise for trigger */\
@@ -163,15 +165,10 @@
 T(nsb_mean),        /* mean value of NSB contribution per pixel */ \
 T(nsb_directory),   /* database for the NSB  */ \
+T(nsb_dir_outer),   /* database for the NSB  */ \
 T(pixel_thres),     /* value of q0 for trigger for a given pixel */ \
 T(secure_disc),     /* Ac value to rise discrimnator threshold */ \
-T(tail_cut),        /* value of tail cut (t0) */ \
-T(islands_on),      /* DO count islands */ \
-T(islands_off),     /* do NOT count islands */ \
-T(islands_cut),     /* value of islands cut (i0) */ \
 T(seeds),           /* seeds for random number generation */ \
 T(data_from_stdin), /* to read data from STDIN */ \
 T(skip),            /* skip pathological showers */ \
-T(read_phe_all),    /* id., but was processed with write_all_events */ \
-T(read_phe),        /* read an already camera processed file */ \
 T(write_all_events),/* write to file .phe ALL images (even w.o. trigger)*/ \
 T(nowrite_McEvt),   /* nowrite to file .root McEvt infos */ \
@@ -181,6 +178,4 @@
 T(write_all_data),  /* write to file .dat ALL image data */ \
 T(select_energy),   /* energy range to read: only for .phe files */ \
-T(trigger_radius),  /* trigger radius for the camera */ \
-T(correction),      /* factor for correction in the pixel values */ \
 T(trigger_scan),    /* show signal in the diskriminator */ \
 T(fadc_scan),       /* show fadc signal */ \
@@ -188,9 +183,8 @@
 T(trigger_prop),    /* values of trigger properties */ \
 T(fadc_prop),    /* values of fadc properties */ \
+T(fadc_outer),    /* values of fadc properties for outer pixels */ \
 T(trigger_single),  /* trigger conditions */ \
 T(Trigger_Loop_Output_Only_Specialists),   /* special steercard */ \
-T(telescope_axis),   /* Direction of the axis telescope */ \
 T(source_offset),   /* Displacement of the source from the center */ \
-T(corsika_vers),    /* Version of Corsika */ \
 T(end_file)         /* end of the parameters file */
   
@@ -214,9 +208,4 @@
 #define ITEM_MAX_LENGTH  40
 #define PATH_MAX_LENGTH  120
-
-// mean values of NSB contribution per pixel
-
-static const float Mean_NSB_MAGIC = 5.0; //@< for MAGIC
-static const float Mean_NSB_CT1 = 5.0;   //@< for CT1
 
 //!@}
@@ -239,9 +228,9 @@
 char *get_loop_filename(void);
 char *get_ct_filename(void);
+char *get_qe_filename(void);
 char *get_nsb_directory(void);
+char *get_nsb_directory_outer(void);
 int add_elec_noise(float *fadc, float *trig);
 int get_nsb(float *n, int *m);
-float get_tail_cut(void);
-int get_islands_cut(int *n);
 long int get_seeds(int n);
 int get_ana_pixels(void);
@@ -249,21 +238,16 @@
 int get_nskip_showers( void ); 
 int get_data_from_stdin(void);
-int get_read_phe(void);
-int get_read_phe_all(void);
 int get_write_all_events(void);
-//
 int get_write_McEvt(void);
 int get_write_McTrig(void);
 int get_write_McFadc(void);
 int get_write_RawEvt(void);
-//
 int get_write_all_data(void);
 int get_select_energy(float *le, float *ue);
-int get_trigger_radius(float *radius);
-int get_correction(float *corr);
 int get_FADC_Scan(void);
 int get_Trigger_Scan(void);
 void get_Trigger_properties(float *gl, float *ot, float *ra, float *rf);
-void get_FADC_properties(float *ra, float *rf);
+void get_FADC_properties(float *ra, float *rf, float *rao, float *rfo);
+float get_FADC_pedestal(void);
 int get_Trigger_Loop(float *lt, float *ut, float *st, int *lm, int *um, int *lg, int *ug);
 void get_Trigger_Single(float *t, int *m, int *g);
@@ -271,7 +255,5 @@
 void get_secure_threhold(float *ac, float *disc);
 int get_indi_thres_pixel(void);
-void get_teles_axis(float *th, float *p);
 void get_source_off(float *th, float *p);
-int get_corsika_ver(void);
 //!@}
 
@@ -289,4 +271,7 @@
 /*
  * $Log: not supported by cvs2svn $
+ * Revision 1.16  2003/01/14 13:37:32  blanch
+ * Option to set a dc value to rise the discriminator threshold has been added.
+ *
  * Revision 1.15  2002/07/16 16:20:59  blanch
  * Modifications done for the camera.cxx version, where a first implementation