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 HLT and GT packer for new HI L1 objects #25064

Merged
merged 5 commits into from Nov 1, 2018
Merged

Update HLT and GT packer for new HI L1 objects #25064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0243a26
Update config to pack new HI centrality variables
apana Oct 30, 2018
85c9cf4
Update helper functions to include new HI variables
apana Oct 30, 2018
0c780ed
Update for new L1 HI variables
apana Oct 30, 2018
7ac62b3
Remove unnecessary cout
apana Oct 30, 2018
bbace76
Apply fix for code style issue found by code-checks
apana Oct 31, 2018
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
12 changes: 12 additions & 0 deletions DataFormats/HLTReco/interface/TriggerTypeDefs.h
View file
Open in desktop
Expand Up @@ -49,6 +49,18 @@ namespace trigger
TriggerL1Jet = -99, // stage2
TriggerL1Tau =-100, // stage2
TriggerL1ETMHF =-101,
TriggerL1Centrality =-102,
TriggerL1MinBiasHFP0 =-103,
TriggerL1MinBiasHFM0 =-104,
TriggerL1MinBiasHFP1 =-105,
TriggerL1MinBiasHFM1 =-106,
TriggerL1TotalEtEm =-107,
TriggerL1MissingHtHF =-108,
TriggerL1TowerCount =-109,
TriggerL1AsymEt =-110,
TriggerL1AsymHt =-111,
TriggerL1AsymEtHF =-112,
TriggerL1AsymHtHF =-113,

/// HLT

Expand Down
72 changes: 72 additions & 0 deletions DataFormats/L1TGlobal/src/GlobalObject.cc
View file
Open in desktop
Expand Up @@ -44,6 +44,18 @@ l1t::GlobalObject l1TGtObjectStringToEnum(const std::string& label) {
{"MinBiasHFP1", gtMinBiasHFP1},
{"MinBiasHFM1", gtMinBiasHFM1},
{"ETTem", gtETTem},
{"AsymEt", gtAsymmetryEt},
{"AsymHt", gtAsymmetryHt},
{"AsymEtHF", gtAsymmetryEtHF},
{"AsymEtHF", gtAsymmetryHtHF},
{"CENT0", gtCentrality0},
{"CENT1", gtCentrality1},
{"CENT2", gtCentrality2},
{"CENT3", gtCentrality3},
{"CENT4", gtCentrality4},
{"CENT5", gtCentrality5},
{"CENT6", gtCentrality6},
{"CENT7", gtCentrality7},
{"External", gtExternal},
{"ObjNull", ObjNull},
{nullptr, (GlobalObject) - 1}
Expand Down Expand Up @@ -156,6 +168,66 @@ std::string l1t::l1TGtObjectEnumToString(const GlobalObject& gtObject) {
}
break;

case gtAsymmetryEt: {
gtObjectString = "AsymEt";
}
break;

case gtAsymmetryHt: {
gtObjectString = "AsymHt";
}
break;

case gtAsymmetryEtHF: {
gtObjectString = "AsymEtHF";
}
break;

case gtAsymmetryHtHF: {
gtObjectString = "AsymHtHF";
}
break;

case gtCentrality0: {
gtObjectString = "CENT0";
}
break;

case gtCentrality1: {
gtObjectString = "CENT1";
}
break;

case gtCentrality2: {
gtObjectString = "CENT2";
}
break;

case gtCentrality3: {
gtObjectString = "CENT3";
}
break;

case gtCentrality4: {
gtObjectString = "CENT4";
}
break;

case gtCentrality5: {
gtObjectString = "CENT5";
}
break;

case gtCentrality6: {
gtObjectString = "CENT6";
}
break;

case gtCentrality7: {
gtObjectString = "CENT7";
}
break;

case gtExternal: {
gtObjectString = "External";
}
Expand Down
3 changes: 2 additions & 1 deletion EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py
View file
Open in desktop
Expand Up @@ -12,7 +12,8 @@
JetInputTag = cms.InputTag("simCaloStage2Digis"),
EtSumInputTag = cms.InputTag("simCaloStage2Digis"),
FedId = cms.int32(1404),
FWId = cms.uint32(0x10A6), # FW version in GMT with vtx-etrapolation
## FWId = cms.uint32(0x10A6), # FW version in GMT with vtx-etrapolation
FWId = cms.uint32(0x10F2), # FW version for packing new HI centrality variables
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@apana @rekovic sorry but is this change backward compatible? This fragment is used by top level configurations for many purposes, not just HI. In all the other updates in this PR I see just addition of pieces, which I would assume is backward compatible.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FwId has increased, and the new version only adds records to pack, not remove any existing records, so should be backward compatible.

lenSlinkHeader = cms.untracked.int32(8),
lenSlinkTrailer = cms.untracked.int32(8)
)