EGM IDs for MiniAOD Reprocessing (76X)

DataFormats/EgammaCandidates/interface/Photon.h

@@ -443,6 +443,9 @@ namespace reco {
     float sumPhotonEtHighThreshold() const {return pfIsolation_.sumPhotonEtHighThreshold;}
     float sumPUPt() const {return pfIsolation_.sumPUPt;}
 
+    /// Get Particle Flow Isolation variables block
+    const PflowIsolationVariables& getPflowIsolationVariables() const { return pfIsolation_; }
+
     /// Set Particle Flow Isolation variables
     void setPflowIsolationVariables ( const PflowIsolationVariables& pfisol ) {  pfIsolation_ = pfisol;} 
 

PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py

@@ -176,21 +176,22 @@ def miniAOD_customizeCommon(process):
 
     #VID Electron IDs
     electron_ids = ['RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_PHYS14_PU20bx25_V2_cff',
-                    'RecoEgamma.ElectronIdentification.Identification.heepElectronID_HEEPV51_cff',
+                    'RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Spring15_50ns_V1_cff',
                     'RecoEgamma.ElectronIdentification.Identification.heepElectronID_HEEPV60_cff',
-                    'RecoEgamma.ElectronIdentification.Identification.mvaElectronID_PHYS14_PU20bx25_nonTrig_V1_cff']
+                    'RecoEgamma.ElectronIdentification.Identification.mvaElectronID_Spring15_25ns_nonTrig_V1_cff']
     switchOnVIDElectronIdProducer(process,DataFormat.MiniAOD)
     process.egmGsfElectronIDs.physicsObjectSrc = \
         cms.InputTag("reducedEgamma","reducedGedGsfElectrons")
     process.electronMVAValueMapProducer.src = \
         cms.InputTag('reducedEgamma','reducedGedGsfElectrons')
     for idmod in electron_ids:
-        setupAllVIDIdsInModule(process,idmod,setupVIDElectronSelection)
+        setupAllVIDIdsInModule(process,idmod,setupVIDElectronSelection,None,False)
 
     #VID Photon IDs
     photon_ids = ['RecoEgamma.PhotonIdentification.Identification.cutBasedPhotonID_PHYS14_PU20bx25_V2_cff',
-                  'RecoEgamma.PhotonIdentification.Identification.mvaPhotonID_PHYS14_PU20bx25_nonTrig_V1_cff',
-                  'RecoEgamma.PhotonIdentification.Identification.mvaPhotonID_Spring15_50ns_nonTrig_V0_cff']
+                  'RecoEgamma.PhotonIdentification.Identification.cutBasedPhotonID_Spring15_50ns_V1_cff',
+                  'RecoEgamma.PhotonIdentification.Identification.mvaPhotonID_Spring15_25ns_nonTrig_V0_cff',
+                  'RecoEgamma.PhotonIdentification.Identification.mvaPhotonID_Spring15_50ns_nonTrig_V2_cff']
     switchOnVIDPhotonIdProducer(process,DataFormat.MiniAOD) 
     process.egmPhotonIDs.physicsObjectSrc = \
         cms.InputTag("reducedEgamma","reducedGedPhotons")
@@ -201,8 +202,8 @@ def miniAOD_customizeCommon(process):
     process.photonMVAValueMapProducer.src = \
         cms.InputTag('reducedEgamma','reducedGedPhotons')
     for idmod in photon_ids:
-        setupAllVIDIdsInModule(process,idmod,setupVIDPhotonSelection)
-
+        setupAllVIDIdsInModule(process,idmod,setupVIDPhotonSelection,None,False)
+    
     # Adding puppi jets
     process.load('CommonTools.PileupAlgos.Puppi_cff')
     process.load('RecoJets.JetProducers.ak4PFJetsPuppi_cfi')

PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py

@@ -25,7 +25,7 @@ def setupVIDSelection(vidproducer,cutflow):
     )    
     sys.stderr.write('Added ID \'%s\' to %s\n'%(cutflow.idName.value(),vidproducer.label()))
 
-def addVIDSelectionToPATProducer(patProducer,idProducer,idName):
+def addVIDSelectionToPATProducer(patProducer,idProducer,idName,addUserData=True):
     patProducerIDs = None
     userDatas = None
     for key in patProducer.__dict__.keys():
@@ -38,21 +38,22 @@ def addVIDSelectionToPATProducer(patProducer,idProducer,idName):
     if userDatas is None:
         raise Exception('StrangePatModule','%s does not have UserData sources!'%patProducer.label())
     setattr(patProducerIDs,idName,cms.InputTag('%s:%s'%(idProducer,idName)))    
-    if( len(userDatas.userClasses.src) == 1 and 
-        type(userDatas.userClasses.src[0]) is str and 
-        userDatas.userClasses.src[0] == ''            ):
-        userDatas.userClasses.src = cms.VInputTag(cms.InputTag('%s:%s'%(idProducer,idName)))        
-    else:
-        userDatas.userClasses.src.append(cms.InputTag('%s:%s'%(idProducer,idName)))
-    sys.stderr.write('\t--- %s:%s added to %s\n'%(idProducer,idName,patProducer.label()))
-
-def setupAllVIDIdsInModule(process,id_module_name,setupFunction,patProducer=None):
+    if( addUserData ):
+        if( len(userDatas.userClasses.src) == 1 and 
+            type(userDatas.userClasses.src[0]) is str and 
+            userDatas.userClasses.src[0] == ''            ):
+            userDatas.userClasses.src = cms.VInputTag(cms.InputTag('%s:%s'%(idProducer,idName)))        
+        else:
+            userDatas.userClasses.src.append(cms.InputTag('%s:%s'%(idProducer,idName)))
+        sys.stderr.write('\t--- %s:%s added to %s\n'%(idProducer,idName,patProducer.label()))
+
+def setupAllVIDIdsInModule(process,id_module_name,setupFunction,patProducer=None,addUserData=True):
 #    idmod = importlib.import_module(id_module_name)
     idmod= __import__(id_module_name, globals(), locals(), ['idName','cutFlow'])
     for name in dir(idmod):
         item = getattr(idmod,name)
         if hasattr(item,'idName') and hasattr(item,'cutFlow'):
-            setupFunction(process,item,patProducer)
+            setupFunction(process,item,patProducer,addUserData)
 
 # Supported data formats defined via "enum"
 class DataFormat:
@@ -84,7 +85,7 @@ def switchOnVIDElectronIdProducer(process, dataFormat):
     #    
     sys.stderr.write('Added \'egmGsfElectronIDs\' to process definition (%s format)!\n' % dataFormatString)
 
-def setupVIDElectronSelection(process,cutflow,patProducer=None):
+def setupVIDElectronSelection(process,cutflow,patProducer=None,addUserData=True):
     if not hasattr(process,'egmGsfElectronIDs'):
         raise Exception('VIDProducerNotAvailable','egmGsfElectronIDs producer not available in process!')
     setupVIDSelection(process.egmGsfElectronIDs,cutflow)
@@ -93,7 +94,7 @@ def setupVIDElectronSelection(process,cutflow,patProducer=None):
         if patProducer is None:
             patProducer = process.patElectrons
         idName = cutflow.idName.value()
-        addVIDSelectionToPATProducer(patProducer,'egmGsfElectronIDs',idName)
+        addVIDSelectionToPATProducer(patProducer,'egmGsfElectronIDs',idName,addUserData)
 
 ####
 # Muons
@@ -157,7 +158,7 @@ def switchOnVIDPhotonIdProducer(process, dataFormat):
     #    
     sys.stderr.write('Added \'egmPhotonIDs\' to process definition (%s format)!\n' % dataFormatString)
 
-def setupVIDPhotonSelection(process,cutflow,patProducer=None):
+def setupVIDPhotonSelection(process,cutflow,patProducer=None,addUserData=True):
     if not hasattr(process,'egmPhotonIDs'):
         raise Exception('VIDProducerNotAvailable','egmPhotonIDs producer not available in process!\n')
     setupVIDSelection(process.egmPhotonIDs,cutflow)
@@ -166,6 +167,6 @@ def setupVIDPhotonSelection(process,cutflow,patProducer=None):
         if patProducer is None:
             patProducer = process.patPhotons
         idName = cutflow.idName.value()
-        addVIDSelectionToPATProducer(patProducer,'egmPhotonIDs',idName)
+        addVIDSelectionToPATProducer(patProducer,'egmPhotonIDs',idName,addUserData)
 
 

RecoEgamma/EgammaTools/interface/AnyMVAEstimatorRun2Base.h

@@ -34,6 +34,10 @@ class AnyMVAEstimatorRun2Base {
   // The name is a unique name associated with a particular MVA implementation,
   // it is found as a const data member in a derived class.
   virtual const std::string& getName() const = 0;
+  // An extra variable string set during construction that can be used
+  // to distinguish different instances of the estimator configured with
+  // different weight files. The tag can be used to construct names of ValueMaps, etc.
+  virtual const std::string& getTag() const = 0;
 
   // fills a vector of floats in the order that arguments are provided
   template<typename... Args>

RecoEgamma/EgammaTools/interface/MVAValueMapProducer.h

@@ -80,9 +80,11 @@ MVAValueMapProducer<ParticleType>::MVAValueMapProducer(const edm::ParameterSet&
     //
     // Compose and save the names of the value maps to be produced
     //
-    //const auto& currentEstimator = mvaItr->second;
-    const std::string thisValueMapName = mvaItr->first + "Values";
-    const std::string thisCategoriesMapName = mvaItr->first + "Categories";
+    const auto& currentEstimator = mvaItr->second;
+    const std::string full_name = ( currentEstimator->getName() + 
+                                    currentEstimator->getTag()    );
+    std::string thisValueMapName = full_name + "Values";
+    std::string thisCategoriesMapName = full_name + "Categories";    
     mvaValueMapNames_.push_back( thisValueMapName );
     mvaCategoriesMapNames_.push_back( thisCategoriesMapName );