Print

Print


Commit in lcsim/src/org/lcsim on MAIN
contrib/uiowa/ReclusterDriver.java+3-21.19 -> 1.20
recon/pfa/structural/ReclusterDriver.java+3-21.3 -> 1.4
+6-4
2 modified files
MJC: Add compile-time option to use analog HCAL calibration

lcsim/src/org/lcsim/contrib/uiowa
ReclusterDriver.java 1.19 -> 1.20
diff -u -r1.19 -r1.20
--- ReclusterDriver.java	27 Mar 2008 18:21:12 -0000	1.19
+++ ReclusterDriver.java	2 May 2008 17:04:52 -0000	1.20
@@ -37,7 +37,7 @@
   *
   * This version is PRELIMINARY.
   *
-  * @version $Id: ReclusterDriver.java,v 1.19 2008/03/27 18:21:12 mcharles Exp $
+  * @version $Id: ReclusterDriver.java,v 1.20 2008/05/02 17:04:52 mcharles Exp $
   * @author Mat Charles
   */
 
@@ -52,6 +52,7 @@
     }
 
     boolean m_useOldCalibration = false;
+    boolean m_useAnalogHcalCalibration = false;
 
     boolean m_megaDebug = false;
     boolean m_debug = false;
@@ -136,7 +137,7 @@
 	    org.lcsim.recon.pfa.structural.FuzzyPhotonClusterEnergyCalculator photonCalib = new org.lcsim.recon.pfa.structural.FuzzyPhotonClusterEnergyCalculator();
 	    m_photonCalib = photonCalib;
 	} else {
-	    org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator newNeutralCalib = new org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator();
+	    org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator newNeutralCalib = new org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator(m_useAnalogHcalCalibration);
 	    m_neutralCalib = newNeutralCalib;
 	    org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator chargedCalibration = new org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator("mips", newNeutralCalib);
 	    m_chargedCalib = chargedCalibration;

lcsim/src/org/lcsim/recon/pfa/structural
ReclusterDriver.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- ReclusterDriver.java	27 Mar 2008 18:21:45 -0000	1.3
+++ ReclusterDriver.java	2 May 2008 17:04:52 -0000	1.4
@@ -38,7 +38,7 @@
   * This version is superseded by ReclusterDTreeDriver,
   * which derives from it.
   *
-  * @version $Id: ReclusterDriver.java,v 1.3 2008/03/27 18:21:45 mcharles Exp $
+  * @version $Id: ReclusterDriver.java,v 1.4 2008/05/02 17:04:52 mcharles Exp $
   * @author Mat Charles <[log in to unmask]>
   */
 
@@ -53,6 +53,7 @@
     }
 
     boolean m_useOldCalibration = false;
+    boolean m_useAnalogHcalCalibration = false;
 
     boolean m_megaDebug = false;
     boolean m_debug = false;
@@ -137,7 +138,7 @@
 	    org.lcsim.recon.pfa.structural.FuzzyPhotonClusterEnergyCalculator photonCalib = new org.lcsim.recon.pfa.structural.FuzzyPhotonClusterEnergyCalculator();
 	    m_photonCalib = photonCalib;
 	} else {
-	    org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator newNeutralCalib = new org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator();
+	    org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator newNeutralCalib = new org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator(m_useAnalogHcalCalibration);
 	    m_neutralCalib = newNeutralCalib;
 	    org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator chargedCalibration = new org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator("mips", newNeutralCalib);
 	    m_chargedCalib = chargedCalibration;
CVSspam 0.2.8