Author: [log in to unmask]
Date: Thu Feb 5 17:53:16 2015
New Revision: 2053
Log:
Use standard EventHeader get method to get collections.
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/examples/DetailedAnalysisDriver.java
java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutputDriver.java
java/trunk/tracking/src/test/java/org/hps/recon/tracking/TruthResidualTest.java
java/trunk/users/src/main/java/org/hps/users/holly/EcalClusterICPosition.java
java/trunk/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java
java/trunk/users/src/main/java/org/hps/users/meeg/KinkAnalysisDriver.java
java/trunk/users/src/main/java/org/hps/users/mgraham/DetailedAnalysisDriver.java
java/trunk/users/src/main/java/org/hps/users/mgraham/jlabrotation/DetailedAnalysisDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/examples/DetailedAnalysisDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/examples/DetailedAnalysisDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/examples/DetailedAnalysisDriver.java Thu Feb 5 17:53:16 2015
@@ -222,7 +222,7 @@
// dump SThit information
String[] input_hit_collections = {"TrackerHits"};
for (String input : input_hit_collections) {
- List<SimTrackerHit> sthits = event.getSimTrackerHits(input);
+ List<SimTrackerHit> sthits = event.get(SimTrackerHit.class, input);
int[] nhits = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
for (SimTrackerHit st : sthits) {
String detector = st.getDetectorElement().getName();
Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java Thu Feb 5 17:53:16 2015
@@ -158,10 +158,10 @@
@Override
protected void process(EventHeader event) {
- if (event.hasCollection(SimCalorimeterHit.class, ecalCollectionName) && !event.getSimCalorimeterHits(ecalCollectionName).isEmpty()) {
+ if (event.hasCollection(SimCalorimeterHit.class, ecalCollectionName) && !event.get(SimCalorimeterHit.class, ecalCollectionName).isEmpty()) {
mcParticles = event.getMCParticles();
- ecalHits = event.getSimCalorimeterHits(ecalCollectionName);
- trackerHits = event.getSimTrackerHits(trackerCollectionName);
+ ecalHits = event.get(SimCalorimeterHit.class, ecalCollectionName);
+ trackerHits = event.get(SimTrackerHit.class, trackerCollectionName);
if (event.hasCollection(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName)) {
ecalScoringPlaneHits = event.get(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName);
}
@@ -169,8 +169,8 @@
if (ClockSingleton.getClock() % triggerSpacing == 0) {
if (event.hasCollection(MCParticle.class)) {
triggerMCParticles = event.getMCParticles();
- triggerECalHits = event.getSimCalorimeterHits(ecalCollectionName);
- triggerTrackerHits = event.getSimTrackerHits(trackerCollectionName);
+ triggerECalHits = event.get(SimCalorimeterHit.class, ecalCollectionName);
+ triggerTrackerHits = event.get(SimTrackerHit.class, trackerCollectionName);
if (event.hasCollection(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName)) {
triggerECalScoringPlaneHits = event.get(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName);
}
@@ -216,7 +216,7 @@
if (rejectBackground && queuedEvent.hasCollection(LCRelation.class, relationCollectionName)) {
writeThisEvent = false;
List<LCRelation> trueHitRelations = queuedEvent.get(LCRelation.class, relationCollectionName);
- List<SimTrackerHit> trueHits = queuedEvent.getSimTrackerHits(trackerCollectionName);
+ List<SimTrackerHit> trueHits = queuedEvent.get(SimTrackerHit.class, trackerCollectionName);
for (LCRelation relation : trueHitRelations) {
if (trueHits.contains((SimTrackerHit) relation.getTo())) {
writeThisEvent = true;
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutputDriver.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutputDriver.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutputDriver.java Thu Feb 5 17:53:16 2015
@@ -93,7 +93,7 @@
List<SimTrackerHit> simTrackerHits = new ArrayList<SimTrackerHit>();
if (event.hasCollection(SimTrackerHit.class, "TrackerHits")) {
- simTrackerHits = event.getSimTrackerHits("TrackerHits");
+ simTrackerHits = event.get(SimTrackerHit.class, "TrackerHits");
}
if(isMC) {
Modified: java/trunk/tracking/src/test/java/org/hps/recon/tracking/TruthResidualTest.java
=============================================================================
--- java/trunk/tracking/src/test/java/org/hps/recon/tracking/TruthResidualTest.java (original)
+++ java/trunk/tracking/src/test/java/org/hps/recon/tracking/TruthResidualTest.java Thu Feb 5 17:53:16 2015
@@ -107,7 +107,7 @@
mcParticles = event.get(MCParticle.class,"MCParticle");
}
- List<SimTrackerHit> simTrackerHits = event.getSimTrackerHits("TrackerHits");
+ List<SimTrackerHit> simTrackerHits = event.get(SimTrackerHit.class, "TrackerHits");
if(simTrackerHits != null && mcParticles != null) {
Modified: java/trunk/users/src/main/java/org/hps/users/holly/EcalClusterICPosition.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/holly/EcalClusterICPosition.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/holly/EcalClusterICPosition.java Thu Feb 5 17:53:16 2015
@@ -227,7 +227,7 @@
mcList.add(m);
}
- List<SimTrackerHit> trHit = event.getSimTrackerHits(trackerCollectionName);
+ List<SimTrackerHit> trHit = event.get(SimTrackerHit.class, trackerCollectionName);
for (SimTrackerHit t : trHit){
trackHits.add(t);
}
Modified: java/trunk/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java Thu Feb 5 17:53:16 2015
@@ -294,7 +294,7 @@
@Override
public boolean goodEvent(EventHeader event) {
// List<SimCalorimeterHit> ecalHits = event.getSimCalorimeterHits("EcalHits");
- List<SimTrackerHit> trackerHits = event.getSimTrackerHits("TrackerHits");
+ List<SimTrackerHit> trackerHits = event.get(SimTrackerHit.class, "TrackerHits");
Set<Integer> topLayers = new HashSet<Integer>();
Set<Integer> botLayers = new HashSet<Integer>();
@@ -323,7 +323,7 @@
@Override
public boolean goodEvent(EventHeader event) {
- List<SimCalorimeterHit> ecalHits = event.getSimCalorimeterHits("EcalHits");
+ List<SimCalorimeterHit> ecalHits = event.get(SimCalorimeterHit.class, "EcalHits");
// List<SimTrackerHit> trackerHits = event.getSimTrackerHits("TrackerHits");
double maxE = 0;
@@ -353,7 +353,7 @@
@Override
public boolean goodEvent(EventHeader event) {
- List<SimCalorimeterHit> ecalHits = event.getSimCalorimeterHits("EcalHits");
+ List<SimCalorimeterHit> ecalHits = event.get(SimCalorimeterHit.class, "EcalHits");
// List<SimTrackerHit> trackerHits = event.getSimTrackerHits("TrackerHits");
double topE = 0, botE = 0;
@@ -384,7 +384,7 @@
@Override
public boolean goodEvent(EventHeader event) {
// List<SimCalorimeterHit> ecalHits = event.getSimCalorimeterHits("EcalHits");
- List<SimTrackerHit> trackerHits = event.getSimTrackerHits("TrackerHits");
+ List<SimTrackerHit> trackerHits = event.get(SimTrackerHit.class, "TrackerHits");
List<MCParticle> mcParticles = event.getMCParticles();
Map<MCParticle, Set<Integer>> particleMap = new HashMap<MCParticle, Set<Integer>>();
Modified: java/trunk/users/src/main/java/org/hps/users/meeg/KinkAnalysisDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/meeg/KinkAnalysisDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/meeg/KinkAnalysisDriver.java Thu Feb 5 17:53:16 2015
@@ -106,7 +106,7 @@
}
- List<SimTrackerHit> trackerHits = event.getSimTrackerHits("TrackerHits");
+ List<SimTrackerHit> trackerHits = event.get(SimTrackerHit.class, "TrackerHits");
// Map<MCParticle, List<SimTrackerHit>> hitMap = new HashMap<MCParticle, List<SimTrackerHit>>();
Map<MCParticle, Map<Integer, SimTrackerHit>> trackMap = new HashMap<MCParticle, Map<Integer, SimTrackerHit>>();
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/DetailedAnalysisDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/DetailedAnalysisDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/DetailedAnalysisDriver.java Thu Feb 5 17:53:16 2015
@@ -246,7 +246,7 @@
// dump SThit information
String[] input_hit_collections = {"TrackerHits"};
for (String input : input_hit_collections) {
- List<SimTrackerHit> sthits = event.getSimTrackerHits(input);
+ List<SimTrackerHit> sthits = event.get(SimTrackerHit.class, input);
int[] nhits = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
for (SimTrackerHit st : sthits) {
String detector = st.getDetectorElement().getName();
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/jlabrotation/DetailedAnalysisDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/jlabrotation/DetailedAnalysisDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/jlabrotation/DetailedAnalysisDriver.java Thu Feb 5 17:53:16 2015
@@ -211,7 +211,7 @@
// dump SThit information
String[] input_hit_collections = {"TrackerHits"};
for (String input : input_hit_collections) {
- List<SimTrackerHit> sthits = event.getSimTrackerHits(input);
+ List<SimTrackerHit> sthits = event.get(SimTrackerHit.class, input);
int[] nhits = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
for (SimTrackerHit st : sthits) {
String detector = st.getDetectorElement().getName();
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java Thu Feb 5 17:53:16 2015
@@ -90,7 +90,7 @@
protected void process(EventHeader event) {
- List<SimTrackerHit> simTrackerHits = event.getSimTrackerHits("TrackerHits");
+ List<SimTrackerHit> simTrackerHits = event.get(SimTrackerHit.class, "TrackerHits");
if (simTrackerHits == null) {
throw new RuntimeException("Missing SimTrackerHit collection");
}
|