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

Update L1T Ntuples for l1t-tsg-v6-cand #14495

Merged
merged 15 commits into from May 17, 2016
Merged

Update L1T Ntuples for l1t-tsg-v6-cand #14495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fd13ab2
add gen tree
jimbrooke Apr 12, 2016
d07beee
add generator info tree
jimbrooke Apr 15, 2016
702e5fc
change HCAL TP scale to CaloTPGTranscoder
jimbrooke Apr 15, 2016
151d418
remove legacy L1Tree and L1MenuTree, fix naming of l1uGTTrees
jimbrooke Apr 15, 2016
13722ae
pfMet Type-1 correction applied and the addition of caloMet in the su…
Apr 4, 2016
79f0499
add missing files for MC
jimbrooke Apr 18, 2016
926b32a
bugfixes and naming corrections for gen info in ntuples
jimbrooke Apr 18, 2016
99f27f8
Added charge for offline electrons in L1TNtuples
tstreble Apr 22, 2016
ee72c2b
Added caloMetBE, caloMetPhiBE and caloSumEtBE to the ntuples
Apr 22, 2016
ce5cefa
Fixed syntax error
Apr 22, 2016
f3a6c22
Bugfix so that caloMetBE /= caloMet
Apr 24, 2016
d78d0dc
bugfixes for ntupling 2016 RAW data, and add integration test of same
mulhearn Apr 26, 2016
83f3a90
L1Ntuple: add l1UpgradeTfMuonTree to EMU and RAW workflows.
rekovic Apr 27, 2016
bc9579c
Keep call to HCALTP configuration in L1Ntuple CaloTowerTree configura…
rekovic Apr 29, 2016
18ec472
Pick up simEcalTriggerPrimitives to be filled in CaloTowerEmuTree
rekovic Apr 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 0 additions & 31 deletions L1Trigger/L1TNtuples/interface/L1AnalysisGenerator.h
View file
Open in desktop

This file was deleted.

50 changes: 35 additions & 15 deletions L1Trigger/L1TNtuples/interface/L1AnalysisGeneratorDataFormat.h
View file
Open in desktop
Expand Up @@ -24,13 +24,23 @@ namespace L1Analysis
{
weight = -999.;
pthat = -999.;
id.resize(0);
status.resize(0);
parent_id.resize(0);
px.resize(0);
py.resize(0);
pz.resize(0);
e.resize(0);
nVtx = 0;
nPUPoissonMean = 0;

nPart = 0;
partId.resize(0);
partStat.resize(0);
partParent.resize(0);
partPt.resize(0);
partEta.resize(0);
partPhi.resize(0);
partE.resize(0);

nJet = 0;
jetPt.resize(0);
jetEta.resize(0);
jetPhi.resize(0);
jetM.resize(0);

}

Expand All @@ -39,14 +49,24 @@ namespace L1Analysis

float weight;
float pthat;
std::vector<int> id;
std::vector<int> status;
std::vector<int> parent_id;
std::vector<float> px;
std::vector<float> py;
std::vector<float> pz;
std::vector<float> e;

int nVtx;
int nPUPoissonMean;

int nPart;
std::vector<int> partId;
std::vector<int> partStat;
std::vector<int> partParent;
std::vector<float> partPt;
std::vector<float> partEta;
std::vector<float> partPhi;
std::vector<float> partE;

int nJet;
std::vector<float> jetPt;
std::vector<float> jetEta;
std::vector<float> jetPhi;
std::vector<float> jetM;

};
}
#endif
Expand Down
2 changes: 2 additions & 0 deletions L1Trigger/L1TNtuples/interface/L1AnalysisRecoElectronDataFormat.h
View file
Open in desktop
Expand Up @@ -35,6 +35,7 @@ namespace L1Analysis
isLooseElectron.clear();
isMediumElectron.clear();
isTightElectron.clear();
charge.clear();
}

unsigned nElectrons;
Expand All @@ -52,6 +53,7 @@ namespace L1Analysis
std::vector<short> isLooseElectron;
std::vector<short> isMediumElectron;
std::vector<short> isTightElectron;
std::vector<int> charge;

};
}
Expand Down
12 changes: 12 additions & 0 deletions L1Trigger/L1TNtuples/interface/L1AnalysisRecoMetDataFormat.h
View file
Open in desktop
Expand Up @@ -21,6 +21,12 @@ namespace L1Analysis
{
met = -999.;
metPhi = -999.;
caloMet = -999.;
caloMetPhi = -999.;
caloSumEt = -999.;
caloMetBE = -999.;
caloMetPhiBE = -999.;
caloSumEtBE = -999.;
Ht = -999.;
mHt = -999.;
mHtPhi = -999.;
Expand All @@ -31,6 +37,12 @@ namespace L1Analysis

float met;
float metPhi;
float caloMet;
float caloMetPhi;
float caloSumEt;
float caloMetBE;
float caloMetPhiBE;
float caloSumEtBE;
float Ht;
float mHt;
float mHtPhi;
Expand Down
237 changes: 0 additions & 237 deletions L1Trigger/L1TNtuples/interface/L1NtupleProducer.h
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions L1Trigger/L1TNtuples/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/EcalObjects"/>
<use name="CondFormats/L1TObjects"/>
<use name="CalibFormats/CaloTPG"/>
<use name="DataFormats/L1Trigger"/>
<use name="DataFormats/L1TMuon"/>
<use name="DataFormats/L1GlobalTrigger"/>
Expand Down