4 modified files
lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.4 -r1.5
--- MassPlots.java 25 Aug 2008 22:02:05 -0000 1.4
+++ MassPlots.java 22 Oct 2008 19:24:09 -0000 1.5
@@ -111,7 +111,10 @@
} catch(FixNumberOfJetsFinder.NumJetsNotFoundException e) {
System.out.println("NumJetsNoFoundException: "+e.getMessage()+" when trying to make mass/energy plots for '"+m_inputListName+"'");
return;
- }
+ } catch(java.lang.IllegalArgumentException e) {
+ System.out.println("IllegalArgumentException: "+e.getMessage()+" when trying to make mass/energy plots for '"+m_inputListName+"'");
+ return;
+ }
// Event cut: Both reconstructed jets have cos(theta) < 0.8
// Event cut 2: Both quarks have cos(theta) < 0.8
lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.1 -r1.2
--- MinimalRunPFANewTracking.java 11 Sep 2008 00:45:58 -0000 1.1
+++ MinimalRunPFANewTracking.java 22 Oct 2008 19:24:09 -0000 1.2
@@ -42,7 +42,7 @@
void flushParticles() {
// Flush things for output
- add(new FlushReconstructedParticlesDriver("DTreeReclusteredParticles", "Flushed_DTreeReclusteredParticles", "FlushedClusters_DTreeReclusteredParticles"));
+ add(new FlushReconstructedParticlesDriver("DTreeReclusteredParticles", "FlushedDTreeReclusteredParticles", "FlushedClustersDTreeReclusteredParticles"));
}
void writeOutMini() {
lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.12 -r1.13
--- SetUpDTreeForReclustering.java 21 Oct 2008 23:55:26 -0000 1.12
+++ SetUpDTreeForReclustering.java 22 Oct 2008 19:24:09 -0000 1.13
@@ -119,7 +119,7 @@
add(new VetoHitsFromClusters("PhotonsMinusMuonHits", "ShowerFinderMapTrackToMip", "PhotonClustersForDTree"));
if (findVetoedPhotons) {
// Test: pick out vetoed clusters
- add(new ListSubtractDriver("PreliminaryPhotonClustersForDTree", "PhotonClustersForDTree", "VetoedPhotonClusters"));
+ add(new ListSubtractDriver("PreliminaryPhotonClustersForDTreeMinusElectrons", "PhotonClustersForDTree", "VetoedPhotonClusters"));
add(new CheckDisjoint("PhotonClustersForDTree", "VetoedPhotonClusters"));
add(new RemoveHitsFromClusters("VetoedPhotonClusters", "MuonTrackClusterMap", "VetoedPhotonClustersMinusMuonHits"));
add(new RemoveHitsFromClusters("VetoedPhotonClustersMinusMuonHits", "ShowerFinderMapTrackToMip", "VetoedPhotonClustersMinusMuonHitsAndMipHits"));
lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.2 -r1.3
--- TrackToElectronMapMaker.java 22 Oct 2008 17:43:40 -0000 1.2
+++ TrackToElectronMapMaker.java 22 Oct 2008 19:24:09 -0000 1.3
@@ -12,7 +12,7 @@
/**
* Try to make electrons.
*
- * @version $Id: TrackToElectronMapMaker.java,v 1.2 2008/10/22 17:43:40 mcharles Exp $
+ * @version $Id: TrackToElectronMapMaker.java,v 1.3 2008/10/22 19:24:09 mcharles Exp $
* @author [log in to unmask]
*/
@@ -28,7 +28,7 @@
m_outputElectronClusterListName = outputElectronClusterList;
m_inputPhotonListName = inputPhotonList;
m_findCluster = findCluster;
- m_photonCalib = new QNeutralHadronClusterEnergyCalculator();
+ m_photonCalib = new QPhotonClusterEnergyCalculator();
}
@@ -70,6 +70,8 @@
// Accept as electron
electronCandidateMap.put(tr, matchedCluster);
}
+ } else {
+ throw new AssertionError("Internal consistency failure");
}
}
}
@@ -83,6 +85,7 @@
if (electronClusters.contains(clus)) { throw new AssertionError("Book-keeping failure"); }
electronClusters.add(clus);
electronTracks.add(tr);
+ outputMap.put(tr,clus);
}
}
CVSspam 0.2.8