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

uGT emulation of HI towercount algorithm #425

Closed
wants to merge 15 commits into from
Closed

uGT emulation of HI towercount algorithm #425

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
0169ad4
Merged l1t-integration-v86.0 from repository cms-l1t-offline
bundocka Sep 16, 2016
6c6e4b8
Merge branch 'finaldev_towcountalgo' of https://github.com/mguilbau/c…
bundocka Sep 16, 2016
4c659a7
Merge branch 'l1t-integration-v86.0-Option22-v2' of github.com:davign…
bundocka Sep 17, 2016
f368112
Added new HI EtSum to MP and Demux unpacker, and Demux EtSum packer. …
bundocka Sep 17, 2016
a999fab
Minor bug fix to saturate at 509, 510, 511 due to sat codes
bundocka Sep 21, 2016
110062f
Minor bug fix to saturate demux jet to 0x7FF
bundocka Sep 21, 2016
743b2e6
Merged l1t-integration-v86.4 from repository cms-l1t-offline
tstreble Sep 27, 2016
812cbb4
Add v3_3 to customise settings
bundocka Sep 27, 2016
542b360
Re-enable muon emulator
bundocka Sep 27, 2016
0363052
Merge branch 'heavyIon_alg' of github.com:bundocka/cmssw into from-CM…
tstreble Sep 29, 2016
1af3d6c
Added flag in caloStage2Params_2016_v3_2 and v3_3 to disable L1EG ID …
tstreble Sep 29, 2016
e58cfbe
Merge pull request #1 from tstreble/heavyIon_EG_alg
bundocka Sep 29, 2016
143cd46
Merged l1t-integration-CMSSW_8_0_19 from repository cms-l1t-offline
apana Oct 11, 2016
04ded03
Merge branch 'heavyIon_alg' of https://github.com/bundocka/cmssw into…
apana Oct 11, 2016
d7eaa0a
Update uGT for tower count algorithm
apana Oct 11, 2016
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
6 changes: 5 additions & 1 deletion CondFormats/L1TObjects/interface/CaloParams.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,13 @@ namespace l1t {
// veto region is seed tower +/- <=egIsoVetoNrTowersPhi
unsigned isoVetoNrTowersPhi_;

// turn on/off EG ID cuts
bool egBypassEGVetos_;

EgParams() : lsb_(0), seedThreshold_(0), neighbourThreshold_(0), hcalThreshold_(0), maxHcalEt_(0), maxPtHOverE_(0),
minPtJetIsolation_(0), maxPtJetIsolation_(0), minPtHOverEIsolation_(0), maxPtHOverEIsolation_(0),
isoAreaNrTowersEta_(0), isoAreaNrTowersPhi_(0), isoVetoNrTowersPhi_(0)
isoAreaNrTowersEta_(0), isoAreaNrTowersPhi_(0), isoVetoNrTowersPhi_(0),
egBypassEGVetos_(0)
{ /* no-op */ }

COND_SERIALIZABLE;
Expand Down
1 change: 1 addition & 0 deletions DataFormats/L1TGlobal/interface/GlobalObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ enum GlobalObject
gtHTT,
gtHTM,
gtETMHF,
gtTowerCount,
gtMinBiasHFP0,
gtMinBiasHFM0,
gtMinBiasHFP1,
Expand Down
6 changes: 6 additions & 0 deletions DataFormats/L1TGlobal/src/GlobalObject.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ l1t::GlobalObject l1TGtObjectStringToEnum(const std::string& label) {
{"HTT", gtHTT},
{"HTM", gtHTM},
{"ETMHF", gtETMHF},
{"TowerCount",gtTowerCount},
{"MinBiasHFP0", gtMinBiasHFP0},
{"MinBiasHFM0", gtMinBiasHFM0},
{"MinBiasHFP1", gtMinBiasHFP1},
Expand Down Expand Up @@ -125,6 +126,11 @@ std::string l1t::l1TGtObjectEnumToString(const GlobalObject& gtObject) {
}
break;

case gtTowerCount: {
gtObjectString = "TowerCount";
}
break;

case gtMinBiasHFP0: {
gtObjectString = "MinBiasHFP0";
}
Expand Down
4 changes: 3 additions & 1 deletion EventFilter/L1TRawToDigi/src/implementations_stage2/CaloSetup.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ namespace l1t {
if (fw >= 0x10010010) {
mp_unp = UnpackerFactory::get()->make("stage2::MPUnpacker_0x10010010");
}

if (fw >= 0x10010033) {
mp_unp = UnpackerFactory::get()->make("stage2::MPUnpacker_0x10010033");
}

UnpackerMap res;
if (fed == 1366 || (fed == 1360 && board == 0x221B)) {
Expand Down
1 change: 1 addition & 0 deletions EventFilter/L1TRawToDigi/src/implementations_stage2/EtSumPacker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ namespace stage2 {
if (j->getType()==l1t::EtSum::kMinBiasHFM1) mht_word |= (word << 28);
if (j->getType()==l1t::EtSum::kMissingEtHF) methf_word |= word;
if (j->getType()==l1t::EtSum::kMissingHtHF) mhthf_word |= word;
if (j->getType()==l1t::EtSum::kTowerCount) ht_word |= (word << 12);
}

load.push_back(et_word);
Expand Down
10 changes: 10 additions & 0 deletions EventFilter/L1TRawToDigi/src/implementations_stage2/EtSumUnpacker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@ namespace stage2 {

res_->push_back(bx,ht);


//HI-SUM

l1t::EtSum towCount = l1t::EtSum();
towCount.setHwPt( (raw_data>>12) & 0x1FFF );
towCount.setType( (l1t::EtSum::kTowerCount) );

res_->push_back(bx, towCount);

//MBHFMT0

l1t::EtSum mbm0 = l1t::EtSum();
Expand All @@ -110,6 +119,7 @@ namespace stage2 {

res_->push_back(bx, mbm0);


// MET (no HF)

raw_data = block.payload()[iFrame+2];
Expand Down
Loading