diff -u -r1.2 -r1.3
--- CalorimeterCalibration.properties	15 Jun 2010 20:19:40 -0000	1.2
+++ CalorimeterCalibration.properties	15 Jun 2010 21:48:26 -0000	1.3
@@ -22,24 +22,32 @@

 HCalMip_sig = 8.1E-5
 
 # Cut at values less than MPV-3*sigma

-#HCalMip_Cut = 6.0E-4

 HCalMip_Cut = 0.
 
 MuonLayering = 0
 

+# determined from single muons
+# values are RAW energy
+MuonMip_MPV = 8.5E-4
+MuonMip_sig = 8.1E-5
+
+# Cut at values less than MPV-3*sigma
+MuonMip_Cut = 0.
+
+

 # cut at times greater than this
 timeCut = 100.
 
 
 # sampling fractions..
 

-EMBarrel_SF = 1., 0.016630201989661284, 0.008438654785598399, 11.774056520950236

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

-EMEndcap_SF = 1., 0.01703143594635315, 0.008534297976391606, 11.013876980836622

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

-HadBarrel_SF = 1., 0.015399773245797601, 0.010224340062586393, 8.726619747396487

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

-HadEndcap_SF = 1., 0.01317263513986897, 0.008264912208331917, 9.155042746003543

+HadEndcap_SF = 1., 0.01317263513986897, 0.008264912208331917, 9.155042746003543, 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