Index: trunk/interface/SmearUtil.h
===================================================================
--- trunk/interface/SmearUtil.h	(revision 465)
+++ trunk/interface/SmearUtil.h	(revision 494)
@@ -92,29 +92,30 @@
   ~RESOLution() { delete [] TOWER_eta_edges; delete [] TOWER_dphi;};
  
-  // Detector coverage
+  // Detector coverage for the central detector
   float CEN_max_tracker;    // tracker pseudorapidity coverage
   float CEN_max_calo_cen;   // central calorimeter pseudorapidity coverage
+  float CEN_max_calo_ec;    // calorimeter endcap pseudorapidity coverage
   float CEN_max_calo_fwd;   // forward calorimeter pseudorapidity coverage
   float CEN_max_mu;         // muon chambers pseudorapidity coverage
 
-  float VFD_min_calo_vfd;  // very forward calorimeter pseudorapidity coverage
-  float VFD_max_calo_vfd;  // very forward calorimeter pseudorapidity coverage
+  float VFD_min_calo_vfd;   // very forward calorimeter pseudorapidity coverage
+  float VFD_max_calo_vfd;   // very forward calorimeter pseudorapidity coverage
   float VFD_min_zdc;        // coverage for Zero Degree Calorimeter, for photons and neutrons
-  float VFD_s_zdc;   // distance of the Zero Degree Calorimeter, from the Interaction poin, in [m]
-
-  float RP_220_s; // distance of the RP to the IP, in meters
-  float RP_220_x; // distance of the RP to the beam, in meters
-  float RP_420_s; // distance of the RP to the IP, in meters
-  float RP_420_x; // distance of the RP to the beam, in meters
-  string RP_beam1Card;   // optics file for beam 1
-  string RP_beam2Card;   // optics file for beam 2
-  string RP_IP_name;     // label for IP in the optics file ("IP1" or "IP5")
-  float  RP_offsetEl_s;  // distance from IP (in meter) where both beams separate
-  float  RP_offsetEl_x;  // distance of separation in horizontal plane, in meter
-  float  RP_offsetEl_y;  // distance of separation in vertical plane, in meter
-  float  RP_cross_x;	 // IP offset in horizontal plane, in micrometer
-  float  RP_cross_y;     // IP offset in vertical plane, in micrometer
-  float  RP_cross_ang_x; // half crossing angle, in microradian, horizontal plane
-  float  RP_cross_ang_y; // half crossing angle, in microradian, vertical plane
+  float VFD_s_zdc;          // distance of the Zero Degree Calorimeter, from the Interaction poin, in [m]
+
+  float RP_220_s;           // distance of the RP to the IP, in meters
+  float RP_220_x;           // distance of the RP to the beam, in meters
+  float RP_420_s;           // distance of the RP to the IP, in meters
+  float RP_420_x;           // distance of the RP to the beam, in meters
+  string RP_beam1Card;      // optics file for beam 1
+  string RP_beam2Card;      // optics file for beam 2
+  string RP_IP_name;        // label for IP in the optics file ("IP1" or "IP5")
+  float  RP_offsetEl_s;     // distance from IP (in meter) where both beams separate
+  float  RP_offsetEl_x;     // distance of separation in horizontal plane, in meter
+  float  RP_offsetEl_y;     // distance of separation in vertical plane, in meter
+  float  RP_cross_x;	    // IP offset in horizontal plane, in micrometer
+  float  RP_cross_y;        // IP offset in vertical plane, in micrometer
+  float  RP_cross_ang_x;    // half crossing angle, in microradian, horizontal plane
+  float  RP_cross_ang_y;    // half crossing angle, in microradian, vertical plane
 
 
@@ -124,4 +125,7 @@
   float ELG_Ncen;   // N term for central ECAL
   float ELG_Ccen;   // C term for central ECAL
+  float ELG_Sec ;   // S term for central ECAL endcap
+  float ELG_Nec ;   // N term for central ECAL endcap
+  float ELG_Cec ;   // C term for central ECAL endcap
   float ELG_Sfwd;   // S term for forward ECAL
   float ELG_Cfwd;   // C term for forward ECAL
@@ -131,15 +135,18 @@
   float ELG_Nzdc;   // N term for zdc-em sections
   
-  //energy resolution for hadrons in ecal/hcal/hf
+  //energy resolution for hadrons in ecal/hcal/fwd
   // \sigma/E = C + N/E + S/\sqrt{E}
-  float HAD_Shcal;   // S term for central HCAL // hadronic calorimeter
-  float HAD_Nhcal;   // N term for central HCAL
-  float HAD_Chcal;   // C term for central HCAL
-  float HAD_Shf;     // S term for central HF // forward calorimeter
-  float HAD_Nhf;     // N term for central HF
-  float HAD_Chf;     // C term for central HF
-  float HAD_Szdc;    // S term for zdc-had sections
-  float HAD_Czdc;    // C term for zdc-had sections
-  float HAD_Nzdc;    // N term for zdc-had sections
+  float HAD_Scen;   // S term for central HCAL // hadronic calorimeter -- previously HAD_Shcal
+  float HAD_Ncen;   // N term for central HCAL			       -- previously HAD_Nhcal
+  float HAD_Ccen;   // C term for central HCAL			       -- previously HAD_Chcal
+  float HAD_Sec ;   // S term for central HCAL endcap
+  float HAD_Nec ;   // N term for central HCAL endcap
+  float HAD_Cec ;   // C term for central HCAL endcap
+  float HAD_Sfwd;   // S term for central FCAL // forward calorimeter  -- previously HAD_Shf
+  float HAD_Nfwd;   // N term for central FCAL                         -- previously HAD_Nhf
+  float HAD_Cfwd;   // C term for central FCAL                         -- previously HAD_Chf
+  float HAD_Szdc;   // S term for zdc-had sections
+  float HAD_Czdc;   // C term for zdc-had sections
+  float HAD_Nzdc;   // N term for zdc-had sections
  
   // muon smearing
@@ -295,3 +302,4 @@
 void print_header();
 string get_time_date();
+void warning(const string oldname, const string newname);
 #endif
