--- UserCode/MitProd/TreeFiller/interface/AssociationMaps.h	2008/07/02 19:41:02	1.2
+++ UserCode/MitProd/TreeFiller/interface/AssociationMaps.h	2008/07/30 08:39:50	1.7
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------------------------------------------
-// $Id: AssociationMaps.h,v 1.2 2008/07/02 19:41:02 bendavid Exp $
+// $Id: AssociationMaps.h,v 1.7 2008/07/30 08:39:50 loizides Exp $
 //
 // AssociationMaps
 //
@@ -13,24 +13,30 @@
  
 #include "MitProd/TreeFiller/interface/AssociationMap.h"
 #include "MitAna/DataTree/interface/Track.h"
+#include "MitAna/DataTree/interface/Types.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
-#include "MitAna/DataTree/interface/SimParticle.h"
+#include "MitAna/DataTree/interface/MCParticle.h"
 #include "MitAna/DataTree/interface/Electron.h"
 #include "MitAna/DataTree/interface/Conversion.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h"
 #include "DataFormats/EgammaCandidates/interface/Conversion.h"
 #include "DataFormats/EgammaCandidates/interface/ConversionFwd.h"
+#include "MitEdm/DataFormats/interface/BasePartFwd.h"
 
 namespace mithep 
 {
-  typedef AssociationMap<const reco::TrackRef,      mithep::Track*>        TrackMap;
-  typedef AssociationMap<const reco::GsfTrackRef,   mithep::Track*>        GsfTrackMap;
-  typedef AssociationMap<const TrackingParticleRef, mithep::SimParticle*>  SimParticleMap;
-  typedef AssociationMap<const reco::TrackRef,      mithep::Electron*>     ConversionElectronMap;
-  typedef AssociationMap<const reco::ConversionRef, mithep::Conversion*>   ConversionMap;
+  typedef std::pair<int,int> PairIntKey;
+
+  typedef AssociationMap<const reco::TrackRef,       mithep::Track*>        TrackMap;
+  typedef AssociationMap<const reco::GsfTrackRef,    mithep::Track*>        GsfTrackMap;
+  typedef AssociationMap<const Int_t,                mithep::MCParticle*>   GenParticleMap;
+  typedef AssociationMap<const TrackingParticleRef,  mithep::MCParticle*>   SimParticleMap;
+  typedef AssociationMap<const reco::TrackRef,       mithep::Electron*>     ConversionElectronMap;
+  typedef AssociationMap<const reco::ConversionRef,  mithep::Conversion*>   ConversionMap;
+  typedef AssociationMap<const PairIntKey,           mithep::Particle*>     BasePartMap;
 }   
 #endif