Merge pull request cms-sw#49 from jkiesele/master

Fixes and extensions for gen particle collection

Definitions.md

@@ -4,7 +4,7 @@
 | ------------- | ------------- | ----- | ----- |
 | event/run/lumi | - | - | general event info |
 | vtx | `mix:MergedCaloTruth` | `std::vector<TrackingVertex>` | general event info |
-| genpart | `mix::MergedTrackTruth` | `std::vector<TrackingParticle>` | truth level tracks/particles |
+| genpart | `g4SimHits` | `std::vector<SimTrack>` | truth level tracks/particles |
 | simcluster | `mix:MergedCaloTruth` | `std::vector<SimCluster>` | Geant particle and its associated hits (DetIds) in the HGCal |
 | pfcluster | `particleFlowClusterHGCal` | `std::vector<reco::PFCluster>` | mapping of the SimCluster DetIds to the reconstructed hits |
 | cluster2d | `imagingClusterHGCal` | `reco::CaloClusterCollection` | reconstructed layer (2D) clusters - those that are associated to a multicluster have `cluster2d_multicluster >= 0`, which is the index of the `multiclus` in the ntuple |
@@ -18,4 +18,3 @@ Mind that when running on *centrally produced/RelVal samples*, some collections
 | branch name | collection name | collection type | definition  |
 | ------------- | ------------- | ----- | ----- |
 | vtx | `g4SimHits` | `std::vector<SimVertex>` | general event info |
-| genpart | `g4SimHits` | `std::vector<SimTrack>` | truth level tracks/particles |