lcsim-cal-calib/src/org/lcsim/cal/calib

diff -u -r1.1 -r1.2
--- ClusterEnergyAnalysis.java	15 Jul 2008 01:28:48 -0000	1.1
+++ ClusterEnergyAnalysis.java	15 Jul 2008 01:45:14 -0000	1.2
@@ -3,7 +3,7 @@

  *
  * Created on July 14, 2008, 6:18 PM
  *

- * $Id: ClusterEnergyAnalysis.java,v 1.1 2008/07/15 01:28:48 ngraf Exp $

+ * $Id: ClusterEnergyAnalysis.java,v 1.2 2008/07/15 01:45:14 ngraf Exp $

  */
 
 package org.lcsim.cal.calib;

@@ -78,6 +78,21 @@

             
             _ecalLayering = _cond.getDoubleArray("ECalLayering");
             _useFirstLayer = _cond.getDouble("IsFirstEmLayerSampling")==1.;

+
+            // photons
+            String photonFitParametersList = _cond.getString("PhotonFitParameters");
+            String[]  photonFitParameters = photonFitParametersList.split(",\\s");
+            for(int i=0; i<photonFitParameters.length; ++i)
+            {
+                _fitParameters.put(photonFitParameters[i], _cond.getDouble(photonFitParameters[i]));
+            }
+            // neutral hadrons
+            String hadronFitParametersList = _cond.getString("NeutralHadronFitParameters");
+            String[]  hadronFitParameters = hadronFitParametersList.split(",\\s");
+            for(int i=0; i<hadronFitParameters.length; ++i)
+            {
+                _fitParameters.put(hadronFitParameters[i], _cond.getDouble(hadronFitParameters[i]));
+            }

             
             _initialized = true;
         }