Migrate code to new Association interface

Migrate code to new interfaces for AssociationMap
and AssociationVector. This is one in a series of
commits related to this migration and part of this
commit fixes some of the migration done in previous
commits.

DataFormats/Common/interface/Ref.h

@@ -431,8 +431,8 @@ namespace edm {
     // Compile time check that the argument is a C* or C const*
     // or derived from it.
     void checkTypeAtCompileTime(product_type const*) {}
-    
-    mutable RefCoreWithIndex product_;    
+
+    mutable RefCoreWithIndex product_;
   };
 }
 

EgammaAnalysis/PhotonIDProducers/src/PiZeroDiscriminatorProducer.cc

@@ -106,7 +106,6 @@ void PiZeroDiscriminatorProducer::produce(Event& evt, const EventSetup& es) {
   if ( debugL_pi0 <= pDEBUG ) {
     cout << "\n PiZeroDiscriminatorProducer: pPreshowerShapeClustersY->size() = " << clustersY->size() << endl;
   }
-  auto_ptr<PhotonPi0DiscriminatorAssociationMap> Pi0Assocs_p(new PhotonPi0DiscriminatorAssociationMap);
 
   Handle< EcalRecHitCollection > pEBRecHits;
   evt.getByToken( barrelRecHitCollectionToken_, pEBRecHits );
@@ -132,6 +131,8 @@ void PiZeroDiscriminatorProducer::produce(Event& evt, const EventSetup& es) {
     cout << " PiZeroDiscriminatorProducer: Photon Collection size : " << corrPhoCollection.size() << endl;
   }
 
+  auto_ptr<PhotonPi0DiscriminatorAssociationMap> Pi0Assocs_p(new PhotonPi0DiscriminatorAssociationMap(correctedPhotonHandle));
+
   for( PhotonCollection::const_iterator  iPho = corrPhoCollection.begin(); iPho != corrPhoCollection.end(); iPho++) {
 
       float Phot_En   = iPho->energy();

HLTrigger/btau/src/ConeIsolation.cc

@@ -26,7 +26,7 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-
+#include "FWCore/Framework/interface/makeRefToBaseProdFrom.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/BTauReco/interface/JetTag.h"
@@ -102,7 +102,7 @@ ConeIsolation::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
    std::auto_ptr<reco::JetTagCollection>             tagCollection;
    std::auto_ptr<reco::IsolatedTauTagInfoCollection> extCollection( new reco::IsolatedTauTagInfoCollection() );
    if (not jetTracksAssociation->empty()) {
-     RefToBaseProd<reco::Jet> prod( jetTracksAssociation->keyProduct() );
+     RefToBaseProd<reco::Jet> prod( edm::makeRefToBaseProdFrom(jetTracksAssociation->begin()->first, iEvent) );
      tagCollection.reset( new reco::JetTagCollection(prod) );
    } else {
      tagCollection.reset( new reco::JetTagCollection() );

PhysicsTools/HepMCCandAlgos/plugins/MCTruthCompositeMatcherNew.cc

@@ -12,6 +12,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/transform.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/makeRefToBaseProdFrom.h"
 #include "DataFormats/Common/interface/Handle.h"
 
 namespace reco {
@@ -69,7 +70,7 @@ namespace reco {
 	    indices[i] = found ? int(mc.key()) : -1;
 	  }
 	}
-	CandidateBaseRefProd ref(cands);
+	CandidateBaseRefProd ref(edm::makeRefToBaseProdFrom(cands->refAt(0), evt));
 	filler.insert(ref, indices.begin(), indices.end());
 	filler.fill();
       }

PhysicsTools/JetMCAlgos/plugins/GenJetBCEnergyRatio.cc

@@ -16,6 +16,7 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/makeRefToBaseProdFrom.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/JetReco/interface/Jet.h"
@@ -89,8 +90,9 @@ void GenJetBCEnergyRatio::produce( Event& iEvent, const EventSetup& iEs )
   JetBCEnergyRatioCollection * jtc2;
 
   if (genjets.product()->size() > 0) {
-    jtc1 = new JetBCEnergyRatioCollection(RefToBaseProd<Jet>(genjets));
-    jtc2 = new JetBCEnergyRatioCollection(RefToBaseProd<Jet>(genjets));
+    const JetRef jj = genjets->refAt(0);
+    jtc1 = new JetBCEnergyRatioCollection(edm::makeRefToBaseProdFrom(jj, iEvent));
+    jtc2 = new JetBCEnergyRatioCollection(edm::makeRefToBaseProdFrom(jj, iEvent));
   } else {
     jtc1 = new JetBCEnergyRatioCollection();
     jtc2 = new JetBCEnergyRatioCollection();

PhysicsTools/JetMCAlgos/plugins/JetFlavourIdentifier.cc

@@ -45,6 +45,7 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/makeRefToBaseProdFrom.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //#include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
@@ -146,7 +147,8 @@ void JetFlavourIdentifier::produce( Event& iEvent, const EventSetup& iEs )
   // Create a JetFlavourMatchingCollection
   JetFlavourMatchingCollection *jfmc;
   if (!theTagByRef->empty()) {
-    jfmc = new JetFlavourMatchingCollection(theTagByRef->keyProduct());
+    RefToBase<Jet> jj = theTagByRef->begin()->first;
+    jfmc = new JetFlavourMatchingCollection(edm::makeRefToBaseProdFrom(jj, iEvent));
   } else {
     jfmc = new JetFlavourMatchingCollection();
   }

RecoBTau/JetTagComputer/plugins/JetTagProducer.cc

@@ -134,7 +134,7 @@ JetTagProducer::produce(Event& iEvent, const EventSetup& iSetup)
   auto_ptr<JetTagCollection> jetTagCollection;
   if (tagInfoHandle.product()->size() > 0) {
     RefToBase<Jet> jj = tagInfoHandle->begin()->jet();
-    jetTagCollection.reset(new JetTagCollection(RefToBaseProd<Jet>(edm::makeRefToBaseProdFrom(jj, iEvent))));
+    jetTagCollection.reset(new JetTagCollection(edm::makeRefToBaseProdFrom(jj, iEvent)));
   } else
     jetTagCollection.reset(new JetTagCollection());
 

RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronCombinedIsolationProducer.cc

@@ -67,7 +67,7 @@ void EgammaHLTElectronCombinedIsolationProducer::produce(edm::Event& iEvent, con
   if(TrackIsolWeight_ != 0) 
     iEvent.getByToken(TrackIsolTag_,TrackIsoMap);
 
-  reco::ElectronIsolationMap TotalIsolMap;
+  reco::ElectronIsolationMap TotalIsolMap(electronHandle);
   double TotalIso=0;
   for(reco::ElectronCollection::const_iterator iElectron = electronHandle->begin(); iElectron != electronHandle->end(); iElectron++){
     TotalIso=0; 

RecoEgamma/EgammaHLTProducers/src/EgammaHLTElectronDetaDphiProducer.cc

@@ -73,10 +73,8 @@ void EgammaHLTElectronDetaDphiProducer::produce(edm::Event& iEvent, const edm::E
   edm::ESHandle<MagneticField> theMagField;
   iSetup.get<IdealMagneticFieldRecord>().get(theMagField);
 
-  reco::ElectronIsolationMap detaMap;
-  reco::ElectronIsolationMap dphiMap;
-  reco::RecoEcalCandidateIsolationMap detaCandMap;
-  reco::RecoEcalCandidateIsolationMap dphiCandMap;
+  reco::ElectronIsolationMap detaMap(electronHandle);
+  reco::ElectronIsolationMap dphiMap(electronHandle);
 
   if(!useSCRefs_){
 
@@ -91,6 +89,9 @@ void EgammaHLTElectronDetaDphiProducer::produce(edm::Event& iEvent, const edm::E
   }else { //we loop over reco ecal candidates
      edm::Handle<reco::RecoEcalCandidateCollection> recoEcalCandHandle;
      iEvent.getByToken(recoEcalCandidateProducer_,recoEcalCandHandle);
+     reco::RecoEcalCandidateIsolationMap detaCandMap(recoEcalCandHandle);
+     reco::RecoEcalCandidateIsolationMap dphiCandMap(recoEcalCandHandle);
+
      for(reco::RecoEcalCandidateCollection::const_iterator iRecoEcalCand = recoEcalCandHandle->begin(); iRecoEcalCand != recoEcalCandHandle->end(); iRecoEcalCand++){
 
        reco::RecoEcalCandidateRef recoEcalCandRef(recoEcalCandHandle,iRecoEcalCand-recoEcalCandHandle->begin());
@@ -101,19 +102,20 @@ void EgammaHLTElectronDetaDphiProducer::produce(edm::Event& iEvent, const edm::E
        detaCandMap.insert(recoEcalCandRef, dEtaDPhi.first);
        dphiCandMap.insert(recoEcalCandRef, dEtaDPhi.second);
      }//end loop over reco ecal candidates
+
+    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> detaCandMapForEvent(new reco::RecoEcalCandidateIsolationMap(detaCandMap));
+    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> dphiCandMapForEvent(new reco::RecoEcalCandidateIsolationMap(dphiCandMap));
+    iEvent.put(detaCandMapForEvent, "Deta" );
+    iEvent.put(dphiCandMapForEvent, "Dphi" );
+
   }//end if between electrons or reco ecal candidates
 
   if(!useSCRefs_){
     std::auto_ptr<reco::ElectronIsolationMap> detMap(new reco::ElectronIsolationMap(detaMap));
     std::auto_ptr<reco::ElectronIsolationMap> dphMap(new reco::ElectronIsolationMap(dphiMap));
     iEvent.put(detMap, "Deta" );
     iEvent.put(dphMap, "Dphi" );
-  }else{
-    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> detaCandMapForEvent(new reco::RecoEcalCandidateIsolationMap(detaCandMap));
-    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> dphiCandMapForEvent(new reco::RecoEcalCandidateIsolationMap(dphiCandMap));
-    iEvent.put(detaCandMapForEvent, "Deta" );
-    iEvent.put(dphiCandMapForEvent, "Dphi" );
-  }     
+  }
 }
 
 std::pair<float,float> EgammaHLTElectronDetaDphiProducer::calDEtaDPhiSCTrk(reco::ElectronRef& eleref, const reco::BeamSpot::Point& bsPosition,const MagneticField *magField) {

RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFChargedIsolationProducer.cc

@@ -67,12 +67,11 @@ void EgammaHLTPFChargedIsolationProducer::produce(edm::Event& iEvent, const edm:
   iEvent.getByToken(pfCandidateProducer_, pfHandle);
   const reco::PFCandidateCollection* forIsolation = pfHandle.product();
 
-  reco::ElectronIsolationMap eleMap;
-  reco::RecoEcalCandidateIsolationMap recoEcalCandMap;
-
   if(useSCRefs_) {
 
     iEvent.getByToken(recoEcalCandidateProducer_, recoEcalCandHandle);
+    reco::RecoEcalCandidateIsolationMap recoEcalCandMap(recoEcalCandHandle);
+
     iEvent.getByToken(beamSpotProducer_, recoBeamSpotHandle);
     const reco::BeamSpot::Point& beamSpotPosition = recoBeamSpotHandle->position(); 
 
@@ -117,10 +116,13 @@ void EgammaHLTPFChargedIsolationProducer::produce(edm::Event& iEvent, const edm:
 
       recoEcalCandMap.insert(candRef, sum);
     }
+    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> mapForEvent(new reco::RecoEcalCandidateIsolationMap(recoEcalCandMap));
+    iEvent.put(mapForEvent);
 
   } else {
 
     iEvent.getByToken(electronProducer_,electronHandle);
+    reco::ElectronIsolationMap eleMap(electronHandle);   
 
     float dRveto = -1;
 
@@ -159,13 +161,6 @@ void EgammaHLTPFChargedIsolationProducer::produce(edm::Event& iEvent, const edm:
 
       eleMap.insert(eleRef, sum);
     }   
-
-  }
-
-  if(useSCRefs_){
-    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> mapForEvent(new reco::RecoEcalCandidateIsolationMap(recoEcalCandMap));
-    iEvent.put(mapForEvent);
-  }else{
     std::auto_ptr<reco::ElectronIsolationMap> mapForEvent(new reco::ElectronIsolationMap(eleMap));
     iEvent.put(mapForEvent);
   }

RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFNeutralIsolationProducer.cc

@@ -100,13 +100,11 @@ void EgammaHLTPFNeutralIsolationProducer::produce(edm::Event& iEvent, const edm:
   iEvent.getByToken(pfCandidateProducer_, pfHandle);
   const reco::PFCandidateCollection* forIsolation = pfHandle.product();
 
-  reco::ElectronIsolationMap eleMap;
-  reco::RecoEcalCandidateIsolationMap recoEcalCandMap;
-
   if(useSCRefs_) {
 
     iEvent.getByToken(recoEcalCandidateProducer_,recoecalcandHandle);
-
+    reco::RecoEcalCandidateIsolationMap recoEcalCandMap(recoecalcandHandle);
+
     float dRVeto = -1.;
     float etaStrip = -1;
 
@@ -163,10 +161,13 @@ void EgammaHLTPFNeutralIsolationProducer::produce(edm::Event& iEvent, const edm:
 
       recoEcalCandMap.insert(candRef, sum);
     }
+    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> mapForEvent(new reco::RecoEcalCandidateIsolationMap(recoEcalCandMap));
+    iEvent.put(mapForEvent);
 
   } else {
 
     iEvent.getByToken(electronProducer_,electronHandle);
+    reco::ElectronIsolationMap eleMap(electronHandle);
 
     float dRVeto = -1.;
     float etaStrip = -1;
@@ -218,13 +219,6 @@ void EgammaHLTPFNeutralIsolationProducer::produce(edm::Event& iEvent, const edm:
 
       eleMap.insert(eleRef, sum);
     }   
-
-  }
-
-  if(useSCRefs_){
-    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> mapForEvent(new reco::RecoEcalCandidateIsolationMap(recoEcalCandMap));
-    iEvent.put(mapForEvent);
-  }else{
     std::auto_ptr<reco::ElectronIsolationMap> mapForEvent(new reco::ElectronIsolationMap(eleMap));
     iEvent.put(mapForEvent);
   }

RecoEgamma/EgammaHLTProducers/src/EgammaHLTPFPhotonIsolationProducer.cc

@@ -105,13 +105,11 @@ void EgammaHLTPFPhotonIsolationProducer::produce(edm::Event& iEvent, const edm::
 
   iEvent.getByToken(pfCandidateProducer_, pfHandle);
 
-  reco::ElectronIsolationMap eleMap;
-  reco::RecoEcalCandidateIsolationMap recoEcalCandMap;
-
   if(useSCRefs_) {
 
     iEvent.getByToken(recoEcalCandidateProducer_,recoecalcandHandle);
-
+    reco::RecoEcalCandidateIsolationMap recoEcalCandMap(recoecalcandHandle);
+
     float dRVeto = -1.;
     float etaStrip = -1;
 
@@ -190,10 +188,13 @@ void EgammaHLTPFPhotonIsolationProducer::produce(edm::Event& iEvent, const edm::
 
       recoEcalCandMap.insert(candRef, sum);
     }
+    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> mapForEvent(new reco::RecoEcalCandidateIsolationMap(recoEcalCandMap));
+    iEvent.put(mapForEvent);
 
   } else {
 
     iEvent.getByToken(electronProducer_,electronHandle);
+    reco::ElectronIsolationMap eleMap(electronHandle);
 
     float dRVeto = -1.;
     float etaStrip = -1;
@@ -269,13 +270,6 @@ void EgammaHLTPFPhotonIsolationProducer::produce(edm::Event& iEvent, const edm::
 
       eleMap.insert(eleRef, sum);
     }   
-
-  }
-
-  if(useSCRefs_){
-    std::auto_ptr<reco::RecoEcalCandidateIsolationMap> mapForEvent(new reco::RecoEcalCandidateIsolationMap(recoEcalCandMap));
-    iEvent.put(mapForEvent);
-  }else{
     std::auto_ptr<reco::ElectronIsolationMap> mapForEvent(new reco::ElectronIsolationMap(eleMap));
     iEvent.put(mapForEvent);
   }

RecoTauTag/RecoTau/plugins/PFRecoTauChargedHadronProducer.cc

@@ -155,7 +155,7 @@ void PFRecoTauChargedHadronProducer::produce(edm::Event& evt, const edm::EventSe
 
   if ( pfJets.size() ) {
     edm::Handle<reco::PFJetCollection> pfJetCollectionHandle;
-    evt.get(jets.id(), pfJetCollectionHandle);
+    evt.get(pfJets.id(), pfJetCollectionHandle);
     pfJetChargedHadronAssociations.reset(new reco::PFJetChargedHadronAssociation(reco::PFJetRefProd(pfJetCollectionHandle)));
   } else {
     pfJetChargedHadronAssociations.reset(new reco::PFJetChargedHadronAssociation);

RecoTauTag/RecoTau/plugins/RecoTauPiZeroProducer.cc

@@ -140,7 +140,7 @@ void RecoTauPiZeroProducer::produce(edm::Event& evt, const edm::EventSetup& es)
 
   if (jetRefs.size()) {
     edm::Handle<reco::PFJetCollection> pfJetCollectionHandle;
-    evt.get(jetView.id(), pfJetCollectionHandle);
+    evt.get(jetRefs.id(), pfJetCollectionHandle);
     association.reset(
         new reco::JetPiZeroAssociation(reco::PFJetRefProd(pfJetCollectionHandle)));
   } else {