Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mu pog nano aod v2 backport #44043

Merged
merged 17 commits into from
Feb 26, 2024
Merged

Mu pog nano aod v2 backport #44043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7222b20
Adding latest variables
rbhattacharya04 Nov 6, 2023
0568e79
Small change
rbhattacharya04 Nov 9, 2023
754e813
Some minor fixes
rbhattacharya04 Nov 9, 2023
cfef40c
TrigObj_filterBits for the Muon POG
rbhattacharya04 Dec 11, 2023
051ad93
Clean up of the code
rbhattacharya04 Dec 13, 2023
49e2414
Inclusion of the Muon POG Nano in autoNano
rbhattacharya04 Jan 23, 2024
09b3d39
Fix in autoNano for the Muon POG custom Nano sequence
rbhattacharya04 Jan 24, 2024
420cbb5
Inclusion of the Muon POG Nano in autoNano
rbhattacharya04 Jan 23, 2024
0620a50
use recHit thresshold for ecal iso
swagata87 Dec 9, 2023
99f94a0
Add tests for (py3-)torch
iarspider Mar 23, 2023
ee304f4
Update BuildFile.xml
iarspider Apr 20, 2023
1de73b9
Update BuildFile.xml
iarspider Nov 14, 2023
76de759
Working version with autoNano
rbhattacharya04 Jan 26, 2024
1f0ba2d
Fixing some git mismatch
rbhattacharya04 Jan 26, 2024
baa924e
Remove PhysicsTools/PythonAnalysis/test/test_torch.py form the pull
rbhattacharya04 Jan 31, 2024
791c202
Implementation of the comment to simplify the autoNano with MUPOG Nano
rbhattacharya04 Feb 2, 2024
3a3cf3e
Increase of the precision of pt, eta, phi of the GenParticles
rbhattacharya04 Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_nano.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ def subnext(self):
'--datatier':'NANOAOD',
'--eventcontent':'NANOAOD'}])

steps['muPOGNANO_data13.0']=merge([{'-s' : 'NANO:@PHYS+@MUPOG',
'-n' : '1000'},
steps['NANO_data13.0']])

###current release cycle workflows : 13.2
steps['TTBarMINIAOD13.2'] = {'INPUT':InputInfo(location='STD',
## dataset below to be replaced with a 13.2 relval sample when available
Expand All @@ -175,6 +179,9 @@ def subnext(self):
'--conditions':'auto:phase1_2022_realistic'},
_NANO_mc])

steps['muPOGNANO_mc13.2']=merge([{'-s' : 'NANO:@PHYS+@MUPOG ', '-n' : '1000'},
steps['NANO_mc13.2']])

##13.X INPUT
steps['RunScoutingPFRun32022D13.X']={'INPUT':InputInfo(dataSet='/ScoutingPFRun3/Run2022D-v1/RAW',label='2022D',events=100000,location='STD', ls=Run2022D)}

Expand Down Expand Up @@ -231,11 +238,13 @@ 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()] = ['muPOGNANO_data13.0', ['MuonEG2023MINIAOD13.0', 'muPOGNANO_data13.0']]

_wfn.next()
################
#13.2 workflows
workflows[_wfn()] = ['NANOmc132X', ['TTBarMINIAOD13.2', 'NANO_mc13.2', 'HRV_NANO_mc']]
workflows[_wfn()] = ['muPOGNANO_mc13.2', ['TTBarMINIAOD13.2', 'muPOGNANO_mc13.2']]

_wfn.next()
################
Expand Down
20 changes: 17 additions & 3 deletions PhysicsTools/NanoAOD/plugins/MuonSpecialVariables.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class MuonSpecialVariables : public edm::stream::EDProducer<> {
void setArbitratedTracker(pat::Muon &mu) const;
void setInnerTrackDxyz(pat::Muon &mu, const reco::Vertex &vtx) const;
void setTrkiso04(pat::Muon &mu, const std::vector<reco::Track> tracks) const;
void setTrkiso03(pat::Muon &mu, const std::vector<reco::Track> tracks) const;
void setNSegements(pat::Muon &mu) const;

private:
Expand Down Expand Up @@ -63,9 +64,21 @@ void MuonSpecialVariables::setTrkiso04(pat::Muon &mu, const std::vector<reco::Tr
continue;
energy += trk.pt();
}
float Trkiso04 = (energy - mu.pt()) / mu.pt();
float relTrkiso4 = (Trkiso04 > 0) ? Trkiso04 : 0;
mu.addUserFloat("relTrkiso4", relTrkiso4);
float Trkiso04 = (energy - mu.pt());
float absTrkiso04 = (Trkiso04 > 0) ? Trkiso04 : 0;
mu.addUserFloat("absTrkiso04", absTrkiso04);
}

void MuonSpecialVariables::setTrkiso03(pat::Muon &mu, const std::vector<reco::Track> tracks) const {
float energy = 0;
for (const auto &trk : tracks) {
if (deltaR(mu.eta(), mu.phi(), trk.eta(), trk.phi()) > 0.3)
continue;
energy += trk.pt();
}
float Trkiso03 = (energy - mu.pt());
float absTrkiso03 = (Trkiso03 > 0) ? Trkiso03 : 0;
mu.addUserFloat("absTrkiso03", absTrkiso03);
}

void MuonSpecialVariables::setNSegements(pat::Muon &mu) const {
Expand Down Expand Up @@ -109,6 +122,7 @@ void MuonSpecialVariables::produce(edm::Event &iEvent, const edm::EventSetup &iS
}
mu.addUserInt("isGoodVertex", good_vertex);
setTrkiso04(mu, *trkCollection);
setTrkiso03(mu, *trkCollection);
setNSegements(mu);
out->push_back(mu);
}
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/NanoAOD/python/autoNANO.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ def expandNanoMapping(seqList, mapping, key):
# L1 flavours: add tables through customize, supposed to be combined with PHYS
'L1' : {'customize': 'nanoL1TrigObjCustomize'},
'L1FULL' : {'customize': 'nanoL1TrigObjCustomizeFull'},
# Muon POG flavours : add tables through customize, supposed to be combined with PHYS
'MUPOG' : {'customize' : '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'},
Expand Down
Loading