Author: [log in to unmask]
Date: Wed Mar 25 20:02:37 2015
New Revision: 2572
Log:
check for missing collections before trying to add them
Modified:
java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java
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 Wed Mar 25 20:02:37 2015
@@ -258,10 +258,20 @@
}
if (triggerMCParticles == null || triggerMCParticles.isEmpty()) {
lcsimEvent.put(MCEvent.MC_PARTICLES, mcParticles);
- lcsimEvent.put(ecalCollectionName, ecalHits, SimCalorimeterHit.class, 0xe0000000);
- lcsimEvent.put(trackerCollectionName, trackerHits, SimTrackerHit.class, 0xc0000000);
if (verbosity >= 1) {
- System.out.println("Adding " + mcParticles.size() + " MCParticles, " + ecalHits.size() + " SimCalorimeterHits, " + trackerHits.size() + " SimTrackerHits");
+ System.out.println("Adding " + mcParticles.size() + " MCParticles");
+ }
+ if (ecalHits != null) {
+ lcsimEvent.put(ecalCollectionName, ecalHits, SimCalorimeterHit.class, 0xe0000000);
+ if (verbosity >= 1) {
+ System.out.println("Adding " + ecalHits.size() + " SimCalorimeterHits");
+ }
+ }
+ if (trackerHits != null) {
+ lcsimEvent.put(trackerCollectionName, trackerHits, SimTrackerHit.class, 0xc0000000);
+ if (verbosity >= 1) {
+ System.out.println("Adding " + trackerHits.size() + " SimTrackerHits");
+ }
}
if (ecalScoringPlaneHits != null) {
lcsimEvent.put(ecalScoringPlaneHitsCollectionName, ecalScoringPlaneHits, SimTrackerHit.class, 0);
@@ -271,10 +281,20 @@
}
} else {
lcsimEvent.put(MCEvent.MC_PARTICLES, triggerMCParticles);
- lcsimEvent.put(ecalCollectionName, triggerECalHits, SimCalorimeterHit.class, 0xe0000000);
- lcsimEvent.put(trackerCollectionName, triggerTrackerHits, SimTrackerHit.class, 0xc0000000);
if (verbosity >= 1) {
- System.out.println("Adding " + triggerMCParticles.size() + " MCParticles, " + triggerECalHits.size() + " SimCalorimeterHits, " + triggerTrackerHits.size() + " SimTrackerHits");
+ System.out.println("Adding " + triggerMCParticles.size() + " MCParticles");
+ }
+ if (triggerECalHits != null) {
+ lcsimEvent.put(ecalCollectionName, triggerECalHits, SimCalorimeterHit.class, 0xe0000000);
+ if (verbosity >= 1) {
+ System.out.println("Adding " + triggerECalHits.size() + " SimCalorimeterHits");
+ }
+ }
+ if (triggerTrackerHits != null) {
+ lcsimEvent.put(trackerCollectionName, triggerTrackerHits, SimTrackerHit.class, 0xc0000000);
+ if (verbosity >= 1) {
+ System.out.println("Adding " + triggerTrackerHits.size() + " SimTrackerHits");
+ }
}
if (triggerECalScoringPlaneHits != null) {
lcsimEvent.put(ecalScoringPlaneHitsCollectionName, triggerECalScoringPlaneHits, SimTrackerHit.class, 0);
|