Merged pyVID_and_newIDs_74X from repository lgray

ikrav · Apr 27, 2015 · 1fafc0f · 1fafc0f
2 parents fb33662 + 6117701
commit 1fafc0f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/RecoEgamma/PhotonIdentification/BuildFile.xml b/RecoEgamma/PhotonIdentification/BuildFile.xml
@@ -7,6 +7,7 @@
 <use   name="DataFormats/BeamSpot"/>
 <use   name="Geometry/CaloGeometry"/>
 <use   name="RecoEgamma/EgammaIsolationAlgos"/>
+
 <export>
   <lib   name="1"/>
 </export>
diff --git a/RecoEgamma/PhotonIdentification/src/classes.h b/RecoEgamma/PhotonIdentification/src/classes.h
@@ -13,25 +13,25 @@ namespace RecoEgamma_PhotonIdentification {
   struct dictionary {    
     typedef VersionedSelector<reco::Photon> VersionedPhotonSelector;
     typedef MakeVersionedSelector<reco::Photon> MakeVersionedPhotonSelector;
-    typedef MakePtrFromCollection<reco::Photon> MakePhoPtrFromCollection;
+    typedef MakePtrFromCollection<reco::PhotonCollection> MakePhoPtrFromCollection;
     typedef PrintVIDToString<reco::Photon> PrintPhotonVIDToString;
 
     typedef VersionedSelector<pat::Photon> VersionedPatPhotonSelector;
-    typedef MakeVersionedSelector<pat::Electron> MakeVersionedPatElectronSelector;
-    typedef MakePtrFromCollection<std::vector<pat::Electron> > MakePatPtrFromCollection;
-    typedef PrintVIDToString<pat::Electron> PrintPatElectronVIDToString;
+    typedef MakeVersionedSelector<pat::Photon> MakeVersionedPatPhotonSelector;
+    typedef MakePtrFromCollection<std::vector<pat::Photon> > MakePatPtrFromCollection;
+    typedef PrintVIDToString<pat::Photon> PrintPatPhotonVIDToString;
 
     //for using the selectors in python
     VersionedPhotonSelector vGsfElectronSelector;    
-    MakeVersionedGsfElectronSelector vMakePhotonVersionedSelector;
+    MakeVersionedPhotonSelector vMakePhotonVersionedSelector;
     PrintPhotonVIDToString vPhoPrintVIDToString;
     MakePhoPtrFromCollection vPhoMakePtrFromCollection;  
 
     VersionedPatPhotonSelector vPatPhotonSelector; 
     MakeVersionedPatPhotonSelector vMakePatPhotonVersionedSelector;
     PrintPatPhotonVIDToString vPatPrintVIDToString;
     MakePatPtrFromCollection vPatMakePtrFromCollection;
-    MakePtrFromCollection<std::vector<pat::Photon>, pat::Photon, reco::Photon > vPatToPhoMakePtrFromCollection;
+    MakePtrFromCollection<std::vector<pat::Photon>, pat::Photon, reco::Photon> vPatToPhoMakePtrFromCollection;
 
   };
 }