Commit in lcsim/src/org/lcsim/recon/cluster/util on MAIN
QNeutralHadronClusterEnergyCalculator.java+61.5 -> 1.6
QPhotonClusterEnergyCalculator.java+21.3 -> 1.4
+8
2 modified files
Use CalorimeterInformation class

lcsim/src/org/lcsim/recon/cluster/util
QNeutralHadronClusterEnergyCalculator.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- QNeutralHadronClusterEnergyCalculator.java	26 Jan 2010 16:09:25 -0000	1.5
+++ QNeutralHadronClusterEnergyCalculator.java	3 Feb 2010 19:41:35 -0000	1.6
@@ -29,8 +29,11 @@
     protected int nFrontLayersEcal;
     protected int eBid;
     protected int eEid;
+    protected int eLid;
     protected int hBid;
     protected int hEid;
+    protected int mBid;
+    protected int mEid;
     public QNeutralHadronClusterEnergyCalculator()
     {
     }
@@ -60,8 +63,11 @@
         CalorimeterInformation ci = CalorimeterInformation.instance();
         eBid = ci.getSystemID("EM_BARREL");
         eEid = ci.getSystemID("EM_ENDCAP");
+        eLid = ci.getSystemID("LUMI");
         hBid = ci.getSystemID("HAD_BARREL");
         hEid = ci.getSystemID("HAD_ENDCAP");
+        mBid = ci.getSystemID("MUON_BARREL");
+        mEid = ci.getSystemID("MUON_ENDCAP");
     }
     public double getEnergy(Cluster c)
     {

lcsim/src/org/lcsim/recon/cluster/util
QPhotonClusterEnergyCalculator.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- QPhotonClusterEnergyCalculator.java	26 Jan 2010 16:09:25 -0000	1.3
+++ QPhotonClusterEnergyCalculator.java	3 Feb 2010 19:41:35 -0000	1.4
@@ -30,6 +30,7 @@
     protected int nFrontLayersEcal;
     protected int eBid;
     protected int eEid;
+    protected int eLid;
     public QPhotonClusterEnergyCalculator()
     {
     }
@@ -49,6 +50,7 @@
         CalorimeterInformation ci = CalorimeterInformation.instance();
         eBid = ci.getSystemID("EM_BARREL");
         eEid = ci.getSystemID("EM_ENDCAP");
+        eLid = ci.getSystemID("LUMI");
     }
     public double getEnergy(Cluster c)
     {
CVSspam 0.2.8