lcsim/src/org/lcsim/recon/pfa/structural
diff -u -r1.2 -r1.3
--- ReclusterDTreeDriver.java 26 Mar 2008 20:11:08 -0000 1.2
+++ ReclusterDTreeDriver.java 27 Mar 2008 18:21:45 -0000 1.3
@@ -33,7 +33,7 @@
* in this package, which uses the implementation in
* org.lcsim.recon.cluster.directedtree developed by NIU).
*
- * @version $Id: ReclusterDTreeDriver.java,v 1.2 2008/03/26 20:11:08 mcharles Exp $
+ * @version $Id: ReclusterDTreeDriver.java,v 1.3 2008/03/27 18:21:45 mcharles Exp $
* @author Mat Charles <[log in to unmask]>
*/
@@ -74,7 +74,7 @@
protected int m_punchThroughHitMinimum = 4;
public ReclusterDTreeDriver(String dTreeClusterList, String trackList, String mcList) {
- System.out.println("ReclusterDTreeDriver version 0.15");
+ System.out.println("ReclusterDTreeDriver version 0.2");
initTrackMatch();
initCalibration();
initPlots();
lcsim/src/org/lcsim/recon/pfa/structural
diff -u -r1.2 -r1.3
--- ReclusterDriver.java 26 Mar 2008 20:11:08 -0000 1.2
+++ ReclusterDriver.java 27 Mar 2008 18:21:45 -0000 1.3
@@ -20,6 +20,11 @@
import org.lcsim.recon.cluster.structural.*;
import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
import org.lcsim.geometry.Detector;
+import org.lcsim.recon.pfa.structural.FuzzyCalorimeterHit;
+import org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator;
+import org.lcsim.recon.pfa.structural.FuzzyQPhotonClusterEnergyCalculator;
+import org.lcsim.recon.pfa.structural.FuzzyPhotonClusterEnergyCalculator;
+import org.lcsim.recon.pfa.structural.FuzzyNeutralHadronClusterEnergyCalculator;
/**
* An algorithm to recluster showers using E/p information
@@ -33,7 +38,7 @@
* This version is superseded by ReclusterDTreeDriver,
* which derives from it.
*
- * @version $Id: ReclusterDriver.java,v 1.2 2008/03/26 20:11:08 mcharles Exp $
+ * @version $Id: ReclusterDriver.java,v 1.3 2008/03/27 18:21:45 mcharles Exp $
* @author Mat Charles <[log in to unmask]>
*/
@@ -47,6 +52,8 @@
m_debugEoverP = debug;
}
+ boolean m_useOldCalibration = false;
+
boolean m_megaDebug = false;
boolean m_debug = false;
boolean m_debugTiming = false;
@@ -120,14 +127,24 @@
protected void initCalibration() {
// Calibration
- FuzzyNeutralHadronClusterEnergyCalculator neutralCalib = new FuzzyNeutralHadronClusterEnergyCalculator();
- neutralCalib.setMinimumAllowedEnergy(0.0);
- m_neutralCalib = neutralCalib;
- ChargedHadronClusterEnergyCalculator chargedCalibration = new ChargedHadronClusterEnergyCalculator("mips", neutralCalib);
- m_chargedCalib = chargedCalibration;
- add(chargedCalibration);
- FuzzyPhotonClusterEnergyCalculator photonCalib = new FuzzyPhotonClusterEnergyCalculator();
- m_photonCalib = photonCalib;
+ if (m_useOldCalibration) {
+ org.lcsim.recon.pfa.structural.FuzzyNeutralHadronClusterEnergyCalculator neutralCalib = new org.lcsim.recon.pfa.structural.FuzzyNeutralHadronClusterEnergyCalculator();
+ neutralCalib.setMinimumAllowedEnergy(0.0);
+ m_neutralCalib = neutralCalib;
+ org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator chargedCalibration = new org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator("mips", neutralCalib);
+ m_chargedCalib = chargedCalibration;
+ add(chargedCalibration);
+ 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();
+ m_neutralCalib = newNeutralCalib;
+ org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator chargedCalibration = new org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator("mips", newNeutralCalib);
+ m_chargedCalib = chargedCalibration;
+ add(chargedCalibration);
+ org.lcsim.recon.pfa.structural.FuzzyQPhotonClusterEnergyCalculator newPhotonCalib = new org.lcsim.recon.pfa.structural.FuzzyQPhotonClusterEnergyCalculator();
+ m_photonCalib = newPhotonCalib;
+ }
}
protected void debugProcess(EventHeader event) {