Skip to content

Commit

Permalink
Merge pull request #44911 from NJManganelli/master-fixl1trackbojectse…
Browse files Browse the repository at this point in the history 
…xtended

Phase 2 GTT L1TrackObjectNtupleMaker fixes
  • Loading branch information
@cmsbuild
cmsbuild authored May 23, 2024
2 parents 5771776 + 3e4d298 commit d9d986f
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 35 deletions.
60 changes: 30 additions & 30 deletions L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1818,15 +1818,15 @@ void L1TrackObjectNtupleMaker::analyze(const edm::Event& iEvent, const edm::Even
m_trkjetemExt_ntracks->clear();
m_trkjetemExt_nxtracks->clear();
}

m_pv_L1reco->clear();
m_pv_L1reco_sum->clear();
m_pv_L1reco_emu->clear();
m_pv_L1reco_sum_emu->clear();
m_pv_MC->clear();
m_MC_lep->clear();
}

m_pv_L1reco->clear();
m_pv_L1reco_sum->clear();
m_pv_L1reco_emu->clear();
m_pv_L1reco_sum_emu->clear();
m_pv_MC->clear();
m_MC_lep->clear();

// -----------------------------------------------------------------------------------------------
// retrieve various containers
// -----------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -2347,7 +2347,6 @@ void L1TrackObjectNtupleMaker::analyze(const edm::Event& iEvent, const edm::Even
for (iterL1Track = TTTrackExtendedHandle->begin(); iterL1Track != TTTrackExtendedHandle->end(); iterL1Track++) {
L1TrackPtr l1track_ptr(TTTrackExtendedHandle, this_l1track);
L1TrackRef l1track_ref(TTTrackExtendedGTTHandle, this_l1track);
this_l1track++;

float tmp_trk_pt = iterL1Track->momentum().perp();
float tmp_trk_eta = iterL1Track->momentum().eta();
Expand Down Expand Up @@ -2523,28 +2522,29 @@ void L1TrackObjectNtupleMaker::analyze(const edm::Event& iEvent, const edm::Even
m_trkExt_gtt_eta->push_back(l1track_ref->momentum().eta());
m_trkExt_gtt_phi->push_back(l1track_ref->momentum().phi());
m_trkExt_selected_index->push_back(getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedHandle));
m_trkExt_selected_emulation_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedEmulationHandle));
m_trkExt_selected_associated_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedHandle));
m_trkExt_selected_associated_emulation_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedEmulationHandle));
m_trkExt_selected_forjets_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedForJetsHandle));
m_trkExt_selected_emulation_forjets_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedEmulationForJetsHandle));
m_trkExt_selected_associated_forjets_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedForJetsHandle));
m_trkExt_selected_associated_emulation_forjets_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedEmulationForJetsHandle));
m_trkExt_selected_foretmiss_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedForEtMissHandle));
m_trkExt_selected_emulation_foretmiss_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedEmulationForEtMissHandle));
m_trkExt_selected_associated_foretmiss_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedForEtMissHandle));
m_trkExt_selected_associated_emulation_foretmiss_index->push_back(
getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedEmulationForEtMissHandle));
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedEmulationHandle) >= 0)
m_trkExt_selected_emulation_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedHandle) >= 0)
m_trkExt_selected_associated_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedEmulationHandle) >= 0)
m_trkExt_selected_associated_emulation_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedForJetsHandle) >= 0)
m_trkExt_selected_forjets_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedEmulationForJetsHandle) >= 0)
m_trkExt_selected_emulation_forjets_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedForJetsHandle) >= 0)
m_trkExt_selected_associated_forjets_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedEmulationForJetsHandle) >= 0)
m_trkExt_selected_associated_emulation_forjets_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedForEtMissHandle) >= 0)
m_trkExt_selected_foretmiss_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedEmulationForEtMissHandle) >= 0)
m_trkExt_selected_emulation_foretmiss_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedForEtMissHandle) >= 0)
m_trkExt_selected_associated_foretmiss_index->push_back(this_l1track);
if (getSelectedTrackIndex(l1track_ref, TTTrackExtendedSelectedAssociatedEmulationForEtMissHandle) >= 0)
m_trkExt_selected_associated_emulation_foretmiss_index->push_back(this_l1track);
this_l1track++;
} //end track loop
} //end if SaveAllTracks (displaced)

Expand Down
8 changes: 3 additions & 5 deletions L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
process = cms.Process(L1TRK_INST)

#L1TRKALGO = 'HYBRID' #baseline, 4par fit
# L1TRKALGO = 'HYBRID_DISPLACED' #extended, 5par fit
#L1TRKALGO = 'HYBRID_DISPLACED' #extended, 5par fit
L1TRKALGO = 'HYBRID_PROMPTANDDISP'

DISPLACED = ''
Expand Down Expand Up @@ -45,8 +45,7 @@
process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(20))

readFiles = cms.untracked.vstring(
'file:/eos/cms/store/cmst3/group/l1tr/gpetrucc/prod125X/WTo3Pion_pythia8_PU200/WTo3Pion_pythia8_PU200.batch3.job99.root'
# '/store/relval/CMSSW_13_0_0/RelValTTbar_14TeV/GEN-SIM-DIGI-RAW/130X_mcRun4_realistic_v2_2026D95noPU-v1/00000/16f6615d-f98c-475f-ad33-0e89934b6c7f.root'
'/store/mc/Phase2Spring23DIGIRECOMiniAOD/TT_TuneCP5_14TeV-powheg-pythia8/GEN-SIM-DIGI-RAW-MINIAOD/PU200_L1TFix_Trk1GeV_131X_mcRun4_realistic_v9-v1/50000/1cc5c14c-5bae-4e68-a369-04e230788660.root'
)
secFiles = cms.untracked.vstring()

Expand Down Expand Up @@ -127,8 +126,6 @@
VertexAssociator = process.l1tTrackVertexNNAssociationProducer
AssociationName = "l1tTrackVertexNNAssociationProducer"
else:
process.l1tVertexFinderEmulator = process.l1tVertexProducer.clone()
process.l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "FHEmulation"
VertexAssociator = process.l1tTrackVertexAssociationProducer
AssociationName = "l1tTrackVertexAssociationProducer"

Expand All @@ -152,6 +149,7 @@
process.pTkMETEmu = cms.Path(process.l1tTrackerEmuEtMiss)
process.pTkMHT = cms.Path(process.l1tTrackerHTMiss)
process.pTkMHTEmulator = cms.Path(process.l1tTrackerEmuHTMiss)
process.pL1TrackTripletEmulator = cms.Path(process.l1tTrackTripletEmulation)
DISPLACED = 'Prompt'

# HYBRID: extended tracking
Expand Down

0 comments on commit d9d986f

Please sign in to comment.