--- UserCode/MitProd/TreeFiller/interface/AssociationMaps.h	2008/07/07 16:14:01	1.4
+++ UserCode/MitProd/TreeFiller/interface/AssociationMaps.h	2008/09/24 09:01:09	1.12
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------------------------------------------
-// $Id: AssociationMaps.h,v 1.4 2008/07/07 16:14:01 loizides Exp $
+// $Id: AssociationMaps.h,v 1.12 2008/09/24 09:01:09 bendavid Exp $
 //
 // AssociationMaps
 //
@@ -8,31 +8,48 @@
 // Authors: J.Bendavid
 //--------------------------------------------------------------------------------------------------
 
-#ifndef TREEFILLER_ASSOCIATIONMAPS_H
-#define TREEFILLER_ASSOCIATIONMAPS_H
+#ifndef MITPROD_TREEFILLER_ASSOCIATIONMAPS_H
+#define MITPROD_TREEFILLER_ASSOCIATIONMAPS_H
  
 #include "MitProd/TreeFiller/interface/AssociationMap.h"
 #include "MitAna/DataTree/interface/Track.h"
+#include "MitAna/DataTree/interface/BasicCluster.h"
+#include "MitAna/DataTree/interface/CaloTower.h"
+#include "MitAna/DataTree/interface/Types.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
+#include "DataFormats/EgammaReco/interface/BasicCluster.h"
+#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
+#include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
-#include "MitAna/DataTree/interface/GenParticle.h"
-#include "MitAna/DataTree/interface/SimParticle.h"
+#include "DataFormats/CaloTowers/interface/CaloTowerDetId.h"
+#include "MitAna/DataTree/interface/MCParticle.h"
 #include "MitAna/DataTree/interface/Electron.h"
 #include "MitAna/DataTree/interface/Conversion.h"
+#include "SimDataFormats/Track/interface/SimTrack.h"
+#include "SimDataFormats/Track/interface/SimTrackContainer.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 
+namespace mithep
 {
-  typedef AssociationMap<const reco::TrackRef,       mithep::Track*>        TrackMap;
-  typedef AssociationMap<const reco::GsfTrackRef,    mithep::Track*>        GsfTrackMap;
-  typedef AssociationMap<const Int_t,                mithep::GenParticle*>  GenParticleMap;
-  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 reco::BasicClusterRef, mithep::BasicCluster*> BasicClusterMap;
+  typedef AssociationMap<const reco::SuperClusterRef, mithep::SuperCluster*> SuperClusterMap;
+  typedef AssociationMap<const Int_t,                 mithep::MCParticle*>   GenParticleMap;
+  typedef AssociationMap<const SimTrackRef,           mithep::MCParticle*>   SimTrackMap;
+  typedef AssociationMap<const TrackingParticleRef,   mithep::MCParticle*>   TrackingParticleMap;
+  typedef AssociationMap<const reco::TrackRef,        mithep::Electron*>     ConversionElectronMap;
+  typedef AssociationMap<const reco::ConversionRef,   mithep::Conversion*>   ConversionMap;
+  typedef AssociationMap<const mitedm::BasePartPtr,   mithep::Particle*>     BasePartMap;
+  typedef AssociationMap<const CaloTowerDetId,        mithep::CaloTower*>    CaloTowerMap;
 }   
 #endif