lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.5 -r1.6
--- FlushReconstructedParticlesDriver.java 12 Aug 2008 17:17:50 -0000 1.5
+++ FlushReconstructedParticlesDriver.java 9 Sep 2008 23:04:10 -0000 1.6
@@ -39,13 +39,14 @@
public void process(EventHeader event) {
// Grab raw hitmaps
Map<Long, CalorimeterHit> hitMap = new HashMap<Long, CalorimeterHit>();
- for (CalorimeterHit hit : event.get(CalorimeterHit.class, "EcalBarrHits")) { hitMap.put(hit.getCellID(), hit); }
- for (CalorimeterHit hit : event.get(CalorimeterHit.class, "HcalBarrHits")) { hitMap.put(hit.getCellID(), hit); }
- for (CalorimeterHit hit : event.get(CalorimeterHit.class, "MuonBarrHits")) { hitMap.put(hit.getCellID(), hit); }
- for (CalorimeterHit hit : event.get(CalorimeterHit.class, "EcalEndcapHits")) { hitMap.put(hit.getCellID(), hit); }
- for (CalorimeterHit hit : event.get(CalorimeterHit.class, "HcalEndcapHits")) { hitMap.put(hit.getCellID(), hit); }
- for (CalorimeterHit hit : event.get(CalorimeterHit.class, "MuonEndcapHits")) { hitMap.put(hit.getCellID(), hit); }
- for (CalorimeterHit hit : event.get(CalorimeterHit.class, "ForwardEcalEndcapHits")) { hitMap.put(hit.getCellID(), hit); }
+ addHits(event, "EcalBarrHits", hitMap);
+ addHits(event, "HcalBarrHits", hitMap);
+ addHits(event, "MuonBarrHits", hitMap);
+ addHits(event, "EcalEndcapHits", hitMap);
+ addHits(event, "HcalEndcapHits", hitMap);
+ addHits(event, "MuonEndcapHits", hitMap);
+ addHits(event, "ForwardEcalEndcapHits", hitMap);
+ addHits(event, "LumiCalHits", hitMap);
if (!event.hasCollection(ReconstructedParticle.class, m_inputParticleListName)) {
// Collection is missing this event
@@ -108,6 +109,15 @@
return output;
}
+ private void addHits(EventHeader event, String name, Map<Long, CalorimeterHit> hitMap) {
+ if (event.hasCollection(CalorimeterHit.class, name)) {
+ List<CalorimeterHit> hitsToAdd = event.get(CalorimeterHit.class, name);
+ for (CalorimeterHit hit : hitsToAdd) {
+ hitMap.put(hit.getCellID(), hit);
+ }
+ }
+ }
+
String m_inputParticleListName;
String m_outputParticleListName;
String m_outputClusterListName;