diff -u -r1.1 -r1.2
--- CalorimeterCalibration.properties	8 Oct 2010 17:56:37 -0000	1.1
+++ CalorimeterCalibration.properties	3 Nov 2010 15:05:15 -0000	1.2
@@ -1,5 +1,6 @@

 # clic_sid_cdr_a
 # 101008 cgrefe

+# 110310 ngraf

 
 ECalLayering = 0, 1, 21
 

@@ -41,13 +42,13 @@

 
 # sampling fractions..
 

-EMBarrel_SF = 1., 0.016630201989661284, 0.008438654785598399, 11.774056520950236, 1.

+EMBarrel_SF = 1., 0.016899044571442624, 0.008260980655773463, 0.04592684671110982, 1.

-EMEndcap_SF = 1., 0.01703143594635315, 0.008534297976391606, 11.013876980836622, 1.

+EMEndcap_SF = 1., 0.017376024122308494, 0.008556121695565768, 0.04012605948862796, 1.

-HadBarrel_SF = 1., 0.015399773245797601, 0.010224340062586393, 8.726619747396487, 1.

+HadBarrel_SF = 1., 0.017990935339458187, 0.009434991274110906, 0.04610306645368307, 1.

-HadEndcap_SF = 1., 0.01317263513986897, 0.008264912208331917, 9.155042746003543, 1.

+HadEndcap_SF = 1., 0.015827213009307405, 0.00902209628442222, 0.03518366963894324, 1.

 
 
 PhotonFitParameters = gamma_em1b_0, gamma_em1b_1, gamma_em1e_0, gamma_em1e_1, gamma_em2b_0, gamma_em2b_1, gamma_em2e_0, gamma_em2e_1, gamma_hadb_0, gamma_hadb_1, gamma_hade_0, gamma_hade_1

@@ -82,6 +83,7 @@

 
 
 # These are the simulation output list of SimCalorimeterHits

+# todo: handle BeamCalHits, HcalPlugHits, LumiCalHits

 BaseHitCollectionNames = EcalBarrelHits, EcalEndcapHits, LumiCalHits, HcalBarrelHits, HcalEndcapHits, MuonBarrelHits, MuonEndcapHits
 
 EMCalorimeterCollections = EcalBarrelHits, EcalEndcapHits, LumiCalHits