From 6fb36e0c0869ed364bf625db0f973f28a90744d8 Mon Sep 17 00:00:00 2001 From: Ming-Yan Lee Date: Wed, 3 Apr 2024 12:24:01 +0200 Subject: [PATCH] fix: btagPNetCvNotB score definition --- .../PyReleaseValidation/python/relval_nano.py | 32 +++---------------- PhysicsTools/NanoAOD/python/autoNANO.py | 1 - .../NanoAOD/python/jetsAK4_Puppi_cff.py | 2 +- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_nano.py b/Configuration/PyReleaseValidation/python/relval_nano.py index 0312490aae3c7..a31c7fe3131ec 100644 --- a/Configuration/PyReleaseValidation/python/relval_nano.py +++ b/Configuration/PyReleaseValidation/python/relval_nano.py @@ -152,7 +152,6 @@ def subnext(self): steps['NANO_data13.0_prompt']=merge([{'--customise' : 'PhysicsTools/NanoAOD/nano_cff.nanoL1TrigObjCustomize', '-n' : '1000'}, steps['NANO_data13.0']]) - steps['muDPGNANO_data13.0']=merge([{'-s' : 'RAW2DIGI,NANO:@MUDPG', '--conditions':'auto:run3_data', '-n' : '100', @@ -187,10 +186,6 @@ def subnext(self): '-n' : '1000'}, steps['NANO_data13.0']]) -steps['BTVNANO_data13.0']=merge([{'-s' : 'NANO:@PHYS+@BTV', - '-n' : '1000'}, - steps['NANO_data13.0']]) - ###current release cycle workflows : 13.2 steps['TTBarMINIAOD13.2'] = {'INPUT':InputInfo(location='STD', dataSet='/RelValTTbar_14TeV/CMSSW_13_2_0-PU_131X_mcRun3_2023_realistic_v9-v1/MINIAODSIM')} @@ -199,34 +194,22 @@ def subnext(self): '--conditions':'auto:phase1_2022_realistic'}, _NANO_mc]) - steps['muPOGNANO_mc13.2']=merge([{'-s' : 'NANO:@MUPOG,DQM:@nanoAODDQM', '-n' : '1000'}, + steps['NANO_mc13.2']]) steps['EGMNano_mc13.2'] = merge([{'-s':'NANO:@EGM,DQM:@nanoAODDQM', '-n' : '1000'}, steps['NANO_mc13.2']]) - - -steps['jmeNANO_mc13.2']=merge([{'-s' : 'NANO:@JME ', '-n' : '1000'}, - steps['NANO_mc13.2']]) - -steps['lepTimeLifeNANO_mc13.2']=merge([{'-s' : 'NANO:@LepTimeLife,DQM:@nanoAODDQM', - '-n' : '1000'}, - steps['NANO_mc13.2']]) - steps['BTVNANO_mc13.2']=merge([{'-s' : 'NANO:@BTV', '-n' : '1000'}, steps['NANO_mc13.2']]) -steps['lepTimeLifeNANO_mc13.2']=merge([{'-s' : 'NANO:@LepTimeLife,DQM:@nanoAODDQM', '-n' : '1000'}, - steps['NANO_mc13.2']]) - steps['jmeNANO_mc13.2']=merge([{'-s' : 'NANO:@JME ', '-n' : '1000'}, - steps['NANO_mc13.2']]) + steps['NANO_mc13.2']]) steps['lepTimeLifeNANO_mc13.2']=merge([{'-s' : 'NANO:@LepTimeLife,DQM:@nanoAODDQM', '-n' : '1000'}, - steps['NANO_mc13.2']]) + steps['NANO_mc13.2']]) ##13.X INPUT steps['ScoutingPFRun32022DRAW13.X']={'INPUT':InputInfo(dataSet='/ScoutingPFRun3/Run2022D-v1/RAW',label='2022D',events=100000,location='STD', ls=Run2022D)} @@ -278,15 +261,11 @@ def subnext(self): workflows[_wfn()] = ['NANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'NANO_data13.0_prompt', 'HRV_NANO_data']] workflows[_wfn()] = ['muDPGNANO130Xrun3', ['ZMuSkim2023DRAWRECO13.0', 'muDPGNANO_data13.0']] workflows[_wfn()] = ['muDPGNANOBkg130Xrun3', ['ZeroBias2023DRAW13.0', 'muDPGNANOBkg_data13.0']] - - workflows[_wfn()] = ['muPOGNANO130Xrun3', ['MuonEG2023MINIAOD13.0', 'muPOGNANO_data13.0']] workflows[_wfn()] = ['EGMNANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'EGMNano_data13.0']] workflows[_wfn()] = ['jmeNANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'jmeNano_data13.0']] workflows[_wfn()] = ['lepTimeLifeNANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'lepTimeLifeNANO_data13.0']] -workflows[_wfn()] = ['EGMNANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'EGMNano_data13.0']] - -workflows[_wfn()] = ['BTVNANO_data13.0', ['MuonEG2023MINIAOD13.0', 'BTVNANO_data13.0']] +workflows[_wfn()] = ['BTVNANO_data130Xrun3', ['MuonEG2023MINIAOD13.0', 'BTVNANO_data13.0']] _wfn.next() ################ @@ -296,8 +275,7 @@ def subnext(self): workflows[_wfn()] = ['EGMNANOmc132X', ['TTBarMINIAOD13.2', 'EGMNano_mc13.2']] workflows[_wfn()] = ['jmeNANOmc132X', ['TTBarMINIAOD13.2', 'jmeNANO_mc13.2']] workflows[_wfn()] = ['lepTimeLifeNANOmc132X', ['TTBarMINIAOD13.2', 'lepTimeLifeNANO_mc13.2']] -workflows[_wfn()] = ['EGMNANOmc132X', ['TTBarMINIAOD13.2', 'EGMNano_mc13.2']] -workflows[_wfn()] = ['BTVNANO_mc13.2', ['TTBarMINIAOD13.2', 'BTVNANO_mc13.2']] +workflows[_wfn()] = ['BTVNANO_mc132X', ['TTBarMINIAOD13.2', 'BTVNANO_mc13.2']] _wfn.next() ################ diff --git a/PhysicsTools/NanoAOD/python/autoNANO.py b/PhysicsTools/NanoAOD/python/autoNANO.py index 0ed68007ab840..d995aff2b1fd9 100644 --- a/PhysicsTools/NanoAOD/python/autoNANO.py +++ b/PhysicsTools/NanoAOD/python/autoNANO.py @@ -36,7 +36,6 @@ def expandNanoMapping(seqList, mapping, key): # Muon POG flavours : add tables through customize, supposed to be combined with PHYS 'MUPOG' : { 'sequence': '@PHYS', 'customize' : '@PHYS+PhysicsTools/NanoAOD/custom_muon_cff.PrepMuonCustomNanoAOD'}, - # MUDPG flavours: use their own sequence 'MUDPG' : {'sequence': 'DPGAnalysis/MuonTools/muNtupleProducer_cff.muDPGNanoProducer', 'customize': 'DPGAnalysis/MuonTools/muNtupleProducer_cff.muDPGNanoCustomize'}, diff --git a/PhysicsTools/NanoAOD/python/jetsAK4_Puppi_cff.py b/PhysicsTools/NanoAOD/python/jetsAK4_Puppi_cff.py index adc5e37011c0c..9ca15abe8b816 100644 --- a/PhysicsTools/NanoAOD/python/jetsAK4_Puppi_cff.py +++ b/PhysicsTools/NanoAOD/python/jetsAK4_Puppi_cff.py @@ -108,7 +108,7 @@ btagRobustParTAK4CvB = Var("?(bDiscriminator('pfParticleTransformerAK4JetTags:probc')+bDiscriminator('pfParticleTransformerAK4JetTags:probb')+bDiscriminator('pfParticleTransformerAK4JetTags:probbb')+bDiscriminator('pfParticleTransformerAK4JetTags:problepb'))>0?bDiscriminator('pfParticleTransformerAK4JetTags:probc')/(bDiscriminator('pfParticleTransformerAK4JetTags:probc')+bDiscriminator('pfParticleTransformerAK4JetTags:probb')+bDiscriminator('pfParticleTransformerAK4JetTags:probbb')+bDiscriminator('pfParticleTransformerAK4JetTags:problepb')):-1",float,doc="RobustParTAK4 c vs b+bb+lepb discriminator",precision=10), btagRobustParTAK4QG = Var("?(bDiscriminator('pfParticleTransformerAK4JetTags:probg')+bDiscriminator('pfParticleTransformerAK4JetTags:probuds'))>0?bDiscriminator('pfParticleTransformerAK4JetTags:probg')/(bDiscriminator('pfParticleTransformerAK4JetTags:probg')+bDiscriminator('pfParticleTransformerAK4JetTags:probuds')):-1",float,doc="RobustParTAK4 g vs uds discriminator",precision=10), btagPNetB = Var("?bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralDiscriminatorsJetTags:BvsAll')>0?bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralDiscriminatorsJetTags:BvsAll'):-1",float,precision=10,doc="ParticleNet b vs. udscg"), - btagPNetCvNotB = Var("?(bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probuds')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probg')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probmu')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probele')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h2p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup3h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup3h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum1h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum1h2p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum3h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum3h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probq')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probg'))>0?(bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probc'))/(bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probuds')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probg')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probmu')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probele')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h2p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup3h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup3h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum1h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum1h2p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum3h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum3h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probq')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probg')):-1",float,precision=10,doc="ParticleNet C vs notB"), + btagPNetCvNotB = Var("?(bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probc')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probuds')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probg')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probmu')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probele')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h2p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup3h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup3h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum1h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum1h2p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum3h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum3h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probq')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probg'))>0?(bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probc'))/(bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probc')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probuds')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probg')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probmu')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probele')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup1h2p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup3h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaup3h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum1h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum1h2p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum3h0p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probtaum3h1p')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probq')+bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralJetTags:probg')):-1",float,precision=10,doc="ParticleNet C vs notB"), btagPNetCvL = Var("?bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralDiscriminatorsJetTags:CvsL')>0?bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralDiscriminatorsJetTags:CvsL'):-1",float,precision=10,doc="ParticleNet c vs. udsg"), btagPNetCvB = Var("?bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralDiscriminatorsJetTags:CvsB')>0?bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralDiscriminatorsJetTags:CvsB'):-1",float,precision=10,doc="ParticleNet c vs. b"), btagPNetQvG = Var("?abs(eta())<2.5?bDiscriminator('pfParticleNetFromMiniAODAK4PuppiCentralDiscriminatorsJetTags:QvsG'):bDiscriminator('pfParticleNetFromMiniAODAK4PuppiForwardDiscriminatorsJetTags:QvsG')",float,precision=10,doc="ParticleNet q (udsbc) vs. g"),