Index: trunk/data/DataCardDet.dat
===================================================================
--- trunk/data/DataCardDet.dat	(revision 72)
+++ trunk/data/DataCardDet.dat	(revision 94)
@@ -1,82 +1,90 @@
-#Detector characteristics
-MAX_TRACKER      2.5          
-MAX_CALO_CEN     3.0 
-MAX_CALO_FWD     5.0      		// forward calorimeter pseudorapidity coverage
-MAX_MU           2.4	     		// muon chambers pseudorapidity coverage
-MIN_CALO_VFWD	 5.2			// very forward calorimeter (if any) like CASTOR
-MAX_CALO_VFWD	 6.6
-MIN_ZDC		 8.3
-ZDC_S		 140			// distance of the ZDC to the IP in meters
-RP220_S		 220			// distance of the RP to the IP in meters
-RP220_X		 0.002			// distance of the RP to the beam in meters
-FP420_S		 420			// distance of the RP to the IP in meters
-FP420_X		 0.004			// distance of the RP to the beam in meters
+# Detector characteristics
+CEN_max_tracker    4                // Maximum tracker coverage          
+CEN_max_calo_cen   2.0                // central calorimeter coverage
+CEN_max_calo_fwd   5.0                // forward calorimeter pseudorapidity coverage
+CEN_max_mu         2.4                // muon chambers pseudorapidity coverage
+  
+# Energy resolution for electron/photon
+# \sigma/E = C + N/E + S/\sqrt{E}
+ELG_Scen          0.05              // S term for central ECAL
+ELG_Ncen          0.25              // N term for central ECAL
+ELG_Ccen          0.005              // C term for central ECAL
+ELG_Cfwd          0.107             // S term for forward ECAL
+ELG_Sfwd          2.084             // C term for forward ECAL
+ELG_Nfwd          0.0               // N term for central ECAL
 
-#Magnetic Field 
-TRACKING_RADIUS   129                   //radius of the BField coverage
-TRACKING_LENGTH   300                   //length of the BField coverage
-BFIELD_X          0
-BFIELD_Y          0
-BFIELD_Z         3.8
+# Energy resolution for hadrons in ecal/hcal/hf
+# \sigma/E = C + N/E + S/\sqrt{E}
+HAD_Shcal         1.5               // S term for central HCAL // hadronic calorimeter
+HAD_Nhcal         0.                // N term for central HCAL
+HAD_Chcal         0.05              // C term for central HCAL
+HAD_Shf           2.7               // S term for HF // forward calorimeter
+HAD_Nhf           0.                // N term for HF
+HAD_Chf           0.13              // C term for HF
 
+# Muon smearing
+MU_SmearPt        0.01
 
-#energy resolution for electron/photon
-# \sigma/E = C + N/E + S/\sqrt{E}
-ELG_Scen         0.05 			// S term for central ECAL
-ELG_Ncen         0.25   		// N term for central ECAL
-ELG_Ccen         0.0055 		// C term for central ECAL
-ELG_Cfwd         0.107  		// S term for forward ECAL
-ELG_Sfwd         2.084  		// C term for forward ECAL
-ELG_Nfwd         0.0    		// N term for central ECAL
+# Tracking efficiencies
+TRACK_ptmin       0.9               // minimal pt needed to reach the calorimeter in GeV
+TRACK_eff         100               // efficiency associated to the tracking
 
-#energy resolution for hadrons in ecal/hcal/hf
-# \sigma/E = C + N/E + S/\sqrt{E}
-HAD_Shcal 	 1.5			  // S term for central HCAL // hadronic calorimeter
-HAD_Nhcal 	 0.			  // N term for central HCAL
-HAD_Chcal 	 0.05			  // C term for central HCAL
-HAD_Shf 	 2.7			  // S term for HF // forward calorimeter
-HAD_Nhf 	 0.			  // N term for HF
-HAD_Chf 	 0.13			  // C term for HF
+# Calorimetric towers
+TOWER_number         40
+TOWER_eta_edges 0. 0.087 0.174 0.261 0.348 0.435 0.522 0.609 0.696 0.783 0.870 0.957 1.044 1.131 1.218 1.305 1.392 1.479 1.566 1.653 1.740 1.830 1.930 2.043 2.172 2.322 2.500 2.650 2.868 2.950 3.125 3.300 3.475 3.650 3.825 4.000 4.175 4.350 4.525 4.700 5.000
+## list of the edges of each tower in eta for eta>0 assuming a symmetric detector in eta<0
+### the list starts with the lower edge of the most central tower
+### the list ends with the higher edged of the most forward tower
+### there should be NTOWER+1 values
+#TOWER_dphi 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 20 20
+### list of the tower size in phi (in degrees), assuming that all towers are similar in phi for a given eta value
+### the list starts with the phi-size of the most central tower (eta=0)
+### the list ends with the phi-size of the most forward tower
+### there should be NTOWER values
+##
+#
 
-# muon smearing
-MU_SmearPt 	 0.01
+# Thresholds for reconstructed objetcs
+PTCUT_elec       10.0
+PTCUT_muon       10.0
+PTCUT_jet        20.0
+PTCUT_gamma      10.0
+PTCUT_taujet     10.0
 
-#thresholds for reconstructed objects
-ELEC_pt          10
-MUON_pt          10
-JET_pt           20
-TAUJET_pt        10
+# General jet variable
+JET_coneradius   0.7            // generic jet radius ; not for tau's !!!
+JET_jetalgo      1              // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
+JET_seed         1.0            // minimum seed to start jet reconstruction
 
-#For Tau-jet definition
-TAU_CONE_ENERGIE 0.15			 // Delta R = radius of the cone
-TAU_CONE_TRACKS  0.4			 //Delta R
-PT_TRACK_TAU	 2.0		         // GeV
+# Tagging definition
+BTAG_b           40
+BTAG_mistag_c    10
+BTAG_mistag_l    1
 
-#Tracker acceptance
-PT_TRACKS_MIN	 0.9 			 // minimal pt needed to reach the calorimeter in GeV 
-TRACKING_EFF	 100			 // efficiency associated to the tracking
+# FLAGS
+FLAG_bfield      1                       //1 to run the bfield propagation else 0
+FLAG_vfd         1                       //1 to run the very forward detectors else 0
+FLAG_trigger     1                       //1 to run the trigger selection else 0
+FLAG_frog        1                       //1 to run the FROG event display
 
-#tagging definition
-TAGGING_B 	 40 
-MISTAGGING_C 	 10
-MISTAGGING_L 	 1
+# In case BField propagation allowed
+TRACK_radius      129                   //radius of the BField coverage
+TRACK_length      300                   //length of the BField coverage
+TRACK_bfield_x    0                     //X composant of the BField
+TRACK_bfield_y    0                     //Y composant of the BField
+TRACK_bfield_z    3.8                   //Z composant of the BField
 
-#Trigger flag
-DOTRIGGER        1                       //1 to run the trigger else 0
+# In case Very forward detectors allowed
+VFD_min_calo_vfd  5.2                   // very forward calorimeter (if any) like CASTOR
+VFD_max_calo_vfd  6.6
+VFD_min_zdc       8.3
+VFD_s_zdc         140                   // distance of the Zero Degree Calorimeter, from the Interaction poin, in [m]
 
-#DeltaR cone definition
-CONERADIUS  	0.7
-JETALGO           1               // 1 for Cone algorithm 2 for MidPoint algorithm 3 for SIScone algorithm 4 for kt algorithm
+RP_220_s          220                   // distance of the RP to the IP, in meters
+RP_220_x          0.002                 // distance of the RP to the beam, in meters
+RP_420_s          420                   // distance of the RP to the IP, in meters
+RP_420_x          0.004                 // distance of the RP to the beam, in meters
 
-#Calorimetric towers
-NTOWERS		40
-TOWER_ETA_EDGES 0. 0.087 0.174 0.261 0.348 0.435 0.522 0.609 0.696 0.783 0.870 0.957 1.044 1.131 1.218 1.305 1.392 1.479 1.566 1.653 1.740 1.830 1.930 2.043 2.172 2.322 2.500 2.650 2.868 2.950 3.125 3.300 3.475 3.650 3.825 4.000 4.175 4.350 4.525 4.700 5.000
-# list of the edges of each tower in eta for eta>0 assuming a symmetric detector in eta<0
-# the list starts with the lower edge of the most central tower
-# the list ends with the higher edged of the most forward tower
-# there should be NTOWER+1 values
-TOWER_DPHI 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 20 20 
-# list of the tower size in phi (in degrees), assuming that all towers are similar in phi for a given eta value
-# the list starts with the phi-size of the most central tower (eta=0)
-# the list ends with the phi-size of the most forward tower
-# there should be NTOWER values
+# In case FROG event display allowed
+NEvents_Frog      2
+
