Merge pull request fastmachinelearning#14 from gmelachr/from-CMSSW_15_1_0_pre1

put nanoBPH_cff under nanoAOD and add entry for BPH in relval_nano matrix

Author: gmelachr

Configuration/PyReleaseValidation/python/relval_nano.py

@@ -179,6 +179,9 @@ def subnext(self):
 steps['NANO_mc14.0'] = merge([{'--era': 'Run3,run3_nanoAOD_pre142X', '--conditions': 'auto:phase1_2024_realistic'},
                               _NANO_mc])
 
+steps['BPHNANO_mc14.0'] = merge([{'-s': 'NANO:@BPH', '-n': '1000'},
+                                 steps['NANO_mc14.0']])
+
 steps['muPOGNANO_mc14.0'] = merge([{'-s': 'NANO:@MUPOG,DQM:@nanoAODDQM', '-n': '1000'},
                                    steps['NANO_mc14.0']])
 
@@ -236,6 +239,9 @@ def subnext(self):
 steps['NANO_data14.0_prompt'] = merge([{'-s': 'NANO:@Prompt,DQM:@nanoAODDQM', '-n': '1000'},
                                        steps['NANO_data14.0']])
 
+steps['BPHNANO_data14.0'] = merge([{'-s': 'NANO:@BPH', '-n': '1000'},
+                                   steps['NANO_data14.0']])
+
 steps['muPOGNANO_data14.0'] = merge([{'-s': 'NANO:@MUPOG,DQM:@nanoAODDQM', '-n': '1000'},
                                      steps['NANO_data14.0']])
 
@@ -359,6 +365,7 @@ def subnext(self):
 
 # POG/PAG custom NANOs, MC
 _wfn.subnext()
+workflows[_wfn()] = ['BPHNANOmc140X', ['TTbarMINIAOD14.0', 'BPHNANO_mc14.0']]
 workflows[_wfn()] = ['muPOGNANOmc140X', ['TTbarMINIAOD14.0', 'muPOGNANO_mc14.0']]
 workflows[_wfn()] = ['EGMNANOmc140X', ['TTbarMINIAOD14.0', 'EGMNANO_mc14.0']]
 workflows[_wfn()] = ['BTVNANOmc140X', ['TTbarMINIAOD14.0', 'BTVNANO_mc14.0']]
@@ -370,6 +377,7 @@ def subnext(self):
 
 # POG/PAG custom NANOs, data
 _wfn.subnext()
+workflows[_wfn()] = ['BPHNANOdata140Xrun3', ['MuonEG2024MINIAOD14.0', 'BPHNANO_data14.0']]
 workflows[_wfn()] = ['muPOGNANO140Xrun3', ['MuonEG2024MINIAOD14.0', 'muPOGNANO_data14.0']]
 workflows[_wfn()] = ['EGMNANOdata140Xrun3', ['MuonEG2024MINIAOD14.0', 'EGMNANO_data14.0']]
 workflows[_wfn()] = ['BTVNANOdata140Xrun3', ['MuonEG2024MINIAOD14.0', 'BTVNANO_data14.0']]

PhysicsTools/NanoAOD/python/autoNANO.py

@@ -40,7 +40,7 @@ def expandNanoMapping(seqList, mapping, key):
                        'customize': '@Scout+PhysicsTools/NanoAOD/custom_run3scouting_cff.customiseScoutingNanoFromMini'},
     # BPH nano
     'BPH' : {'sequence': '@PHYS',
-             'customize': '@PHYS+PhysicsTools/BPHNano/nanoBPH_cff.nanoAOD_customizeBPH'},
+             'customize': '@PHYS+PhysicsTools/NanoAOD/custom_bph_cff.nanoAOD_customizeBPH'},
     # JME nano
     'JME': {'sequence': '@PHYS',
             'customize': '@PHYS+PhysicsTools/NanoAOD/custom_jme_cff.PrepJMECustomNanoAOD'},

PhysicsTools/NanoAOD/python/custom_bph_cff.py

@@ -0,0 +1,115 @@
+from __future__ import print_function
+import FWCore.ParameterSet.Config as cms
+from PhysicsTools.NanoAOD.common_cff import *
+from PhysicsTools.NanoAOD.globals_cff import *
+from PhysicsTools.NanoAOD.nano_cff import *
+from PhysicsTools.NanoAOD.vertices_cff import *
+from PhysicsTools.NanoAOD.NanoAODEDMEventContent_cff import *
+from PhysicsTools.NanoAOD.triggerObjects_cff import *
+
+
+##for gen and trigger muon
+from PhysicsTools.BPHNano.pverticesBPH_cff import *
+from PhysicsTools.BPHNano.genparticlesBPH_cff import *
+from PhysicsTools.BPHNano.particlelevelBPH_cff import *
+
+## BPH collections
+from PhysicsTools.BPHNano.muons_cff import *
+from PhysicsTools.BPHNano.MuMu_cff import *
+from PhysicsTools.BPHNano.tracks_cff import *
+from PhysicsTools.BPHNano.DiTrack_cff import *
+from PhysicsTools.BPHNano.V0_cff import *
+from PhysicsTools.BPHNano.BToKLL_cff import *
+from PhysicsTools.BPHNano.BToTrkTrkLL_cff import *
+from PhysicsTools.BPHNano.BToV0LL_cff import *
+
+
+vertexTable.svSrc = cms.InputTag("slimmedSecondaryVertices")
+
+
+
+nanoSequence = cms.Sequence(nanoMetadata + 
+                            cms.Sequence(vertexTask) +
+                            cms.Sequence(globalTablesTask)+ 
+                            cms.Sequence(vertexTablesTask) +
+                            cms.Sequence(pVertexTable)#+
+#                            cms.Sequence(nanoSequenceCommon)                           
+                          )
+
+
+
+def nanoAOD_customizeMC(process):
+    process.load('PhysicsTools.BPHNano.particlelevelBPH_cff')
+    process.load('PhysicsTools.BPHNano.genparticlesBPH_cff')
+    process.nanoSequence = cms.Sequence(process.nanoSequence +process.particleLevelBPHSequence + process.genParticleBPHSequence+ process.genParticleBPHTables )
+    return process
+
+
+
+def nanoAOD_customizeMuonBPH(process):
+    process.load('PhysicsTools.BPHNano.muons_cff')
+    process.nanoSequence = cms.Sequence( process.nanoSequence + process.muonBPHSequence + process.muonBPHTables)
+    return process
+
+
+def nanoAOD_customizeDiMuonBPH(process):
+    process.load('PhysicsTools.BPHNano.MuMu_cff')
+    process.nanoSequence = cms.Sequence( process.nanoSequence + MuMuSequence + MuMuTables)
+    return process
+
+
+
+def nanoAOD_customizeTrackBPH(process):
+    process.load('PhysicsTools.BPHNano.tracks_cff')    
+    process.nanoSequence = cms.Sequence( process.nanoSequence + tracksBPHSequence + tracksBPHTables)
+    return process
+
+
+def nanoAOD_customizeBToKLL(process):
+    process.load('PhysicsTools.BPHNano.BToKLL_cff')
+    process.nanoSequence = cms.Sequence( process.nanoSequence + BToKMuMuSequence + BToKMuMuTables)
+    return process
+
+
+
+def nanoAOD_customizeBToTrkTrkLL(process):
+    process.load('PhysicsTools.BPHNano.DiTrack_cff')    
+    process.load('PhysicsTools.BPHNano.BToTrkTrkLL_cff')    
+    process.nanoSequence = cms.Sequence( process.nanoSequence + DiTrackSequence + DiTrackTables+ BToTrkTrkMuMuSequence + BToTrkTrkMuMuTables  )
+    return process
+
+
+
+
+def nanoAOD_customizeBToKshortLL(process):
+    process.load('PhysicsTools.BPHNano.V0_cff')
+    process.load('PhysicsTools.BPHNano.BToV0LL_cff') 
+    process.nanoSequenceMC = cms.Sequence( process.nanoSequence+ KshortToPiPiSequenceMC + KshortToPiPiTablesMC + BToKshortMuMuSequence + BToKshortMuMuTables  )
+    process.nanoSequence = cms.Sequence( process.nanoSequence+ KshortToPiPiSequence + KshortToPiPiTables + BToKshortMuMuSequence + BToKshortMuMuTables  )
+    return process
+
+def nanoAOD_customizeLambdabToLambdaLL(process):
+    process.load('PhysicsTools.BPHNano.V0_cff')
+    process.load('PhysicsTools.BPHNano.BToV0LL_cff')
+    process.nanoSequenceMC = cms.Sequence( process.nanoSequence+ LambdaToProtonPiSequenceMC + LambdaToProtonPiTablesMC + LambdabToLambdaMuMuSequence + LambdabToLambdaMuMuTables  )
+    process.nanoSequence = cms.Sequence( process.nanoSequence+ LambdaToProtonPiSequence + LambdaToProtonPiTables + LambdabToLambdaMuMuSequence + LambdabToLambdaMuMuTables  )
+    return process
+
+
+
+
+def nanoAOD_customizeBPH(process):
+    process.load('PhysicsTools.BPHNano.genparticlesBPH_cff')
+    process.load('PhysicsTools.BPHNano.muons_cff')
+    process.load('PhysicsTools.BPHNano.MuMu_cff')    
+    process.load('PhysicsTools.BPHNano.tracks_cff')
+    process.load('PhysicsTools.BPHNano.BToKLL_cff')    
+    process.load('PhysicsTools.BPHNano.DiTrack_cff')
+    process.load('PhysicsTools.BPHNano.BToTrkTrkLL_cff')
+    process.load('PhysicsTools.BPHNano.V0_cff')
+    process.load('PhysicsTools.BPHNano.BToV0LL_cff')      
+    process.nanoSequenceMC = cms.Sequence(process.nanoSequenceMC +particleLevelBPHSequence + genParticleBPHSequence+ genParticleBPHTables + muonBPHSequenceMC + muonBPHTablesMC + MuMuSequence + MuMuTables + tracksBPHSequenceMC + tracksBPHTablesMC + BToKMuMuSequence + BToKMuMuTables + DiTrackSequence + DiTrackTables + BToTrkTrkMuMuSequence + BToTrkTrkMuMuTables + KshortToPiPiSequenceMC + KshortToPiPiTablesMC + BToKshortMuMuSequence + BToKshortMuMuTables +  LambdaToProtonPiSequenceMC + LambdaToProtonPiTablesMC + LambdabToLambdaMuMuSequence + LambdabToLambdaMuMuTables)
+    process.nanoSequence = cms.Sequence(process.nanoSequence + muonBPHSequence + muonBPHTables + MuMuSequence + MuMuTables + tracksBPHSequence + tracksBPHTables + BToKMuMuSequence + BToKMuMuTables + DiTrackSequence + DiTrackTables + BToTrkTrkMuMuSequence + BToTrkTrkMuMuTables + KshortToPiPiSequence + KshortToPiPiTables + BToKshortMuMuSequence + BToKshortMuMuTables +  LambdaToProtonPiSequence + LambdaToProtonPiTables + LambdabToLambdaMuMuSequence + LambdabToLambdaMuMuTables)
+    return process
+
+