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

More L1T bug fixes [11.1.x] #30610

Merged
merged 4 commits into from
Jul 9, 2020
+42 −39
Merged

More L1T bug fixes [11.1.x] #30610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6421f95
fix event content
kpedro88 Jul 8, 2020
022ba5d
missing dict
kpedro88 Jul 8, 2020
a02a839
fix produce label
kpedro88 Jul 8, 2020
5816a46
format
kpedro88 Jul 8, 2020
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
1 change: 1 addition & 0 deletions DataFormats/L1Trigger/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
<version ClassVersion="11" checksum="2449295419"/>
<version ClassVersion="10" checksum="1956355507"/>
</class>
<class name="edm::Ptr<l1t::Muon>"/>
<class name="l1t::MuonBxCollection"/>
<class name="std::vector<l1t::Muon>"/>
<class name="edm::Wrapper<l1t::MuonBxCollection>"/>
Expand Down
78 changes: 40 additions & 38 deletions L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,44 +158,46 @@ def _appendME0Digis(obj):
def _appendPhase2Digis(obj):
l1Phase2Digis = [
"keep *_simKBmtfDigis_*_*",
'keep *_hgcalVFEProducerhgcalConcentratorProducer__*',
'keep *_hgcalBackEndLayer1Producer__*',
'keep *_hgcalBackEndLayer2Producer__*',
'keep *_hgcalTowerMapProducer__*',
'keep *_hgcalTowerProducer__*',
'keep *_L1EGammaClusterEmuProducer__*',
'keep *_l1EGammaEEProducer__*',
'keep *_L1TkPrimaryVertex__*',
'keep *_L1TkElectronsCrystal__*',
'keep *_L1TkElectronsLooseCrystal__*',
'keep *_L1TkElectronsEllipticMatchCrystal__*',
'keep *_L1TkIsoElectronsCrystal__*',
'keep *_L1TkPhotonsCrystal__*',
'keep *_L1TkElectronsHGC__*',
'keep *_L1TkElectronsEllipticMatchHGC__*',
'keep *_L1TkIsoElectronsHGC__*',
'keep *_L1TkPhotonsHGC__*',
'keep *_L1TkMuons__*',
'keep *_pfClustersFromL1EGClusters__*',
'keep *_pfClustersFromCombinedCaloHCal__*',
'keep *_pfClustersFromCombinedCaloHF__*',
'keep *_pfClustersFromHGC3DClusters__*',
'keep *_pfTracksFromL1TracksBarrel__*',
'keep *_l1pfProducerBarrel__*',
'keep *_pfTracksFromL1TracksHGCal__*',
'keep *_l1pfProducerHGCal__*',
'keep *_l1pfProducerHGCalNoTK__*',
'keep *_l1pfProducerHF__*',
'keep *_l1pfCandidates__*',
'keep *_ak4PFL1Calo__*',
'keep *_ak4PFL1PF__*',
'keep *_ak4PFL1Puppi__*',
'keep *_ak4PFL1CaloCorrected__*',
'keep *_ak4PFL1PFCorrected__*',
'keep *_ak4PFL1PuppiCorrected__*',
'keep *_l1PFMetCalo__*',
'keep *_l1PFMetPF__*',
'keep *_l1PFMetPuppi__*',
'keep *_hgcalVFEProducerhgcalConcentratorProducer_*_*',
'keep *_hgcalBackEndLayer1Producer_*_*',
'keep *_hgcalBackEndLayer2Producer_*_*',
'keep *_hgcalTowerMapProducer_*_*',
'keep *_hgcalTowerProducer_*_*',
'keep *_L1EGammaClusterEmuProducer_*_*',
'keep *_l1EGammaEEProducer_*_*',
'keep *_L1TkPrimaryVertex_*_*',
'keep *_L1TkElectronsCrystal_*_*',
'keep *_L1TkElectronsLooseCrystal_*_*',
'keep *_L1TkElectronsEllipticMatchCrystal_*_*',
'keep *_L1TkIsoElectronsCrystal_*_*',
'keep *_L1TkPhotonsCrystal_*_*',
'keep *_L1TkElectronsHGC_*_*',
'keep *_L1TkElectronsEllipticMatchHGC_*_*',
'keep *_L1TkIsoElectronsHGC_*_*',
'keep *_L1TkPhotonsHGC_*_*',
'keep *_L1TkMuons_*_*',
'keep *_pfClustersFromL1EGClusters_*_*',
'keep *_pfClustersFromCombinedCaloHCal_*_*',
'keep *_pfClustersFromCombinedCaloHF_*_*',
'keep *_pfClustersFromHGC3DClusters_*_*',
'keep *_pfTracksFromL1TracksBarrel_*_*',
'keep *_l1pfProducerBarrel_*_*',
'keep *_pfTracksFromL1TracksHGCal_*_*',
'keep *_l1pfProducerHGCal_*_*',
'keep *_l1pfProducerHGCalNoTK_*_*',
'keep *_l1pfProducerHF_*_*',
'keep *_l1pfCandidates_*_*',
'keep *_ak4PFL1Calo_*_*',
'keep *_ak4PFL1PF_*_*',
'keep *_ak4PFL1Puppi_*_*',
'keep *_ak4PFL1CaloCorrected_*_*',
'keep *_ak4PFL1PFCorrected_*_*',
'keep *_ak4PFL1PuppiCorrected_*_*',
'keep *_l1PFMetCalo_*_*',
'keep *_l1PFMetPF_*_*',
'keep *_l1PFMetPuppi_*_*',
'keep *_TTTracksFromExtendedTrackletEmulation_*_*',
'keep *_TTTracksFromTrackletEmulation_*_*',
]
obj.outputCommands += l1Phase2Digis

Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1CaloTrigger/plugins/L1EGammaEEProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void L1EGammaEEProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSet
}
}

iEvent.put(std::move(l1EgammaBxCollection));
iEvent.put(std::move(l1EgammaBxCollection), "L1EGammaCollectionBXVWithCuts");
}

DEFINE_FWK_MODULE(L1EGammaEEProducer);