Index: trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h	(revision 410)
+++ trunk/MagicSoft/Simulation/Detector/Camera/creadparam.h	(revision 411)
@@ -19,7 +19,7 @@
 //=
 //= $RCSfile: creadparam.h,v $
-//= $Revision: 1.4 $
-//= $Author: blanch $ 
-//= $Date: 2000-05-11 14:23:28 $
+//= $Revision: 1.5 $
+//= $Author: MagicSol $ 
+//= $Date: 2000-07-04 14:13:34 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -141,5 +141,4 @@
 T(starfield_file),  /* starfield file */                              \
 T(data_file),       /* data file */                              \
-T(diag_file),       /* diagnostic output file (ROOT format) */   \
 T(root_file),       /* ROOT file */                              \
 T(ct_file),         /* file with the characteristics of the CT */  \
@@ -161,5 +160,4 @@
 T(nowrite_McEvt),   /* nowrite to file .root McEvt infos */ \
 T(write_McTrig),    /* write to file .root McTrig infos */ \
-T(write_RawEvt),    /* write to file .root RawEvt infos */ \
 T(write_all_data),  /* write to file .dat ALL image data */ \
 T(select_energy),   /* energy range to read: only for .phe files */ \
@@ -169,4 +167,7 @@
 T(fadc_scan),       /* show fadc signal */ \
 T(trigger_loop),    /* make loop over trigger conditions */ \
+T(trigger_prop),    /* values of trigger properties */ \
+T(trigger_single),  /* trigger conditions */ \
+T(Trigger_Loop_Output_Only_Specialists),   /* special steercard */ \
 T(end_file)         /* end of the parameters file */
   
@@ -210,6 +211,6 @@
 char *get_starfield_filename(void);
 char *get_data_filename(void);
-char *get_diag_filename(void);
 char *get_root_filename(void);
+char *get_loop_filename(void);
 char *get_ct_filename(void);
 int get_nsb(float *n);
@@ -236,5 +237,7 @@
 int get_FADC_Scan(void);
 int get_Trigger_Scan(void);
+void get_Trigger_properties(float *gl, float *ra, float *rf);
 int get_Trigger_Loop(int *lt, int *ut, int *lm, int *um, int *lg, int *ug);
+void get_Trigger_Single(float *t, int *m, int *g);
 //!@}
 
@@ -252,4 +255,7 @@
 /*
  * $Log: not supported by cvs2svn $
+ * Revision 1.4  2000/05/11 14:23:28  blanch
+ * Thi version owns to the version 1.4 of creadparam.cxx.
+ *
  * Revision 1.3  2000/03/24 18:15:46  blanch
  * *** empty log message ***
Index: trunk/MagicSoft/Simulation/Detector/Camera/input.card
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/input.card	(revision 410)
+++ trunk/MagicSoft/Simulation/Detector/Camera/input.card	(revision 411)
@@ -1,19 +1,60 @@
 camera 0.3
+# Reflector file that the program reads
+input_file /hdb1/users/blanch/Ref_pro/prova.rfl
+#
+# Reflector format file that gives the NSB from the stars
+starfield_file    /hdb1/users/blanch/Starfield/Ref_stf1
+#
+# Output file with a brief summary about trigger
+data_file /hdb1/users/blanch/test.dat
+#
+# Root file with the output information
+root_file /hdb1/users/blanch/Cam_test.root
+#
+# Information about the telescope
+ct_file ../Data/magic.def
+#
+# Diskriminator and response properties (gate_lentgh, amplitude and fwhm)
+# needed for the trigger studies
+trigger_prop 3.0 1.0 2.0
+#
+# Trigger loop mode (theshold, multiplicity and topology)
+trigger_loop 0 2 4 4 1 1
+#
+# Single trigger mode (theshold, multiplicity and topology)
+#trigger_single 4 4 1
+#
+# Write also images that do not trigger
+#write_all_images
+#
+# Analised pixels
+ana_pixels 595
+#
+# Switch on NSB
+#nsb_on
+#
+# Switch off NSB
+nsb_off
+# Number of photon from the diffuse NSB
+nsb_mean 0.09
+#
+# Show signal of diskriminator on the screen
+#trigger_scan
+#
+# Show signal of FADC on the screen
+#fadc_scan
+#
+# Select Energy of particles
+#select_energy 0 10000000000
+#
+# Skip showers (interactive)
+#skip
+#
+#Data from STDIN
 #data_from_stdin
-input_file    /data/reflect/test.rfl
-output_file   /data/camera/test.phe
-data_file     /data/camera/test.dat
-diag_file     /data/camera/test-diag.root
-root_file     /data/camera/test-raw.root
-write_all_images
-write_all_data
-ct_file       ../Data/magic.def
-ana_pixels    595
-nsb_mean      0.
-nsb_off
-threshold     0.0
-tail_cut      0.0
-islands_off
-seeds   69184 10406
-end_file   
-
+#
+# Seeds for random numbers
+seeds 69184 10406
+#
+# End of steercards
+end_file
Index: trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx	(revision 410)
+++ trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx	(revision 411)
@@ -157,4 +157,6 @@
   MTrigger() ; 
 
+  MTrigger(float gate, float ampl, float fwhm) ; 
+  
   ~MTrigger() ;