Skip to content
Snippets Groups Projects
Commit 41d51a7f authored by Katharine Leney's avatar Katharine Leney Committed by Graeme Stewart
Browse files

Update with correct track collection names (TrigBjetHypo-02-00-35)

	* Update with correct track collection name
	* This (and -33 and -34) fix ATR-10751
	* Tagging as TrigBjetHypo-02-00-35

2015-04-07   Katharine Leney <Katharine.Leney@cern.ch>
	* Was a little too hasty before...
	* Tagging as TrigBjetHypo-02-00-34

2015-04-07   Katharine Leney <Katharine.Leney@cern.ch>
	* Retrieve split chain tracks by name in Fex
	* Don't attach operational info for superRoi jets
	* Tagging as TrigBjetHypo-02-00-33
parent 70c8b48d
No related branches found
No related tags found
No related merge requests found
......@@ -80,6 +80,7 @@ class TrigBjetFex: public HLT::FexAlgo {
std::string m_jetKey;
std::string m_priVtxKey;
std::string m_trackKey;
/** @brief To retrieve track collections reconstructed at EF and stored in TrackParticleContainer. */
HLT::ErrorCode getCollection(const xAOD::TrackParticleContainer*&, const HLT::TriggerElement*);
......
......@@ -197,6 +197,7 @@ class BjetFexSplit (TrigBjetFex):
self.JetKey = "SplitJet"
self.PriVtxKey = "xPrimVx" #"EFHistoPrmVtx"
self.TrackKey = "InDetTrigTrackingxAODCnv_Bjet_IDTrig"
self.par_0_MC = getTuning_par_0_MC(calibInstance)
self.par_1_MC = getTuning_par_1_MC(calibInstance)
......
......@@ -80,6 +80,7 @@ TrigBjetFex::TrigBjetFex(const std::string& name, ISvcLocator* pSvcLocator) :
declareProperty ("Taggers", m_taggers);
declareProperty ("JetKey", m_jetKey = ""); //"" needed for default config, SplitJet for new config
declareProperty ("PriVtxKey", m_priVtxKey = "EFHistoPrmVtx");
declareProperty ("TrackKey", m_trackKey = ""); //"" needed for default config, Bjet_IDTrig for new config?
declareProperty ("par_0_MC", m_par_0_MC);
declareProperty ("par_1_MC", m_par_1_MC);
......@@ -367,11 +368,12 @@ HLT::ErrorCode TrigBjetFex::getCollection(const xAOD::TrackParticleContainer*& p
std::vector<const xAOD::TrackParticleContainer*> vectorOfEFTrackCollections;
HLT::ErrorCode status = getFeatures(outputTE, vectorOfEFTrackCollections, "");
HLT::ErrorCode status = getFeatures(outputTE, vectorOfEFTrackCollections, m_trackKey);
if (status != HLT::OK) {
msg() << MSG::ERROR << "Failed to get TrackParticleContainer from the trigger element" << endreq;
} else if (msgLvl() <= MSG::DEBUG)
}
else if (msgLvl() <= MSG::DEBUG)
msg() << MSG::DEBUG << "Got " << vectorOfEFTrackCollections.size() << " TrackParticleContainer" << endreq;
std::vector<const xAOD::TrackParticleContainer*>::iterator pTrackColl = vectorOfEFTrackCollections.begin();
......@@ -380,7 +382,8 @@ HLT::ErrorCode TrigBjetFex::getCollection(const xAOD::TrackParticleContainer*& p
if (pTrackColl == lastTrackColl) {
pointerToEFTrackCollections = 0;
return HLT::ERROR;
} else {
}
else {
pointerToEFTrackCollections = *pTrackColl;
return HLT::OK;
}
......@@ -994,14 +997,14 @@ HLT::ErrorCode TrigBjetFex::hltExecute(const HLT::TriggerElement* /*inputTE*/, H
// -----------------------------------
// Get EF track collection
// -----------------------------------
//HLT::ErrorCode status = getFeature(outputTE, pointerToEFTrackCollections, "");
HLT::ErrorCode status = getFeature(outputTE, pointerToEFTrackCollections);
HLT::ErrorCode status = getFeature(outputTE, pointerToEFTrackCollections, m_trackKey);
if (status != HLT::OK) {
msg() << MSG::DEBUG << "No HLT track collection retrieved" << endreq;
}
else if (msgLvl() <= MSG::DEBUG)
msg() << MSG::DEBUG << "HLT track collection retrieved" << endreq;
else if (msgLvl() <= MSG::DEBUG) {
msg() << MSG::DEBUG << "HLT track collection retrieved with size = " << pointerToEFTrackCollections->size() << endreq;
}
// -----------------------------------
// Get secondary vertex collection
......@@ -1107,7 +1110,7 @@ HLT::ErrorCode TrigBjetFex::hltExecute(const HLT::TriggerElement* /*inputTE*/, H
for (unsigned int j = 0; j < m_totTracks; j++) {
const xAOD::TrackParticle* track = (*pointerToEFTrackCollections)[j];
m_mon_trk_a0.push_back(track->d0());
m_mon_trk_z0.push_back(track->z0() + m_trigBjetPrmVtxInfo->zBeamSpot());
......
......@@ -170,22 +170,22 @@ HLT::ErrorCode TrigSuperRoiBuilderAllTE::hltExecute(std::vector<std::vector<HLT:
msg() << MSG::DEBUG << "Adding ROI descriptor to superROI!" << endreq;
superRoi->push_back( roi );
// for checking Et and eta of jets in hypos later
TrigOperationalInfo* trigInfoJetEt = new TrigOperationalInfo();
trigInfoJetEt->set("EFJetEt", jetEt);
HLT::ErrorCode hltEtStatus = attachFeature(outputTE, trigInfoJetEt, "EFJetInfo");
if (hltEtStatus != HLT::OK) {
msg() << MSG::ERROR << "Failed to attach TrigOperationalInfo (jet Et) as feature" << endreq;
return hltEtStatus;
}
TrigOperationalInfo* trigInfoJetEta = new TrigOperationalInfo();
trigInfoJetEta->set("EFJetEta", jetEta);
HLT::ErrorCode hltEtaStatus = attachFeature(outputTE, trigInfoJetEta, "EFJetInfo");
if (hltEtaStatus != HLT::OK) {
msg() << MSG::ERROR << "Failed to attach TrigOperationalInfo (jet eta) as feature" << endreq;
return hltEtaStatus;
}
// // for checking Et and eta of jets in hypos later
// TrigOperationalInfo* trigInfoJetEt = new TrigOperationalInfo();
// trigInfoJetEt->set("EFJetEt", jetEt);
// HLT::ErrorCode hltEtStatus = attachFeature(outputTE, trigInfoJetEt, "EFJetInfo");
// if (hltEtStatus != HLT::OK) {
// msg() << MSG::ERROR << "Failed to attach TrigOperationalInfo (jet Et) as feature" << endreq;
// return hltEtStatus;
// }
// TrigOperationalInfo* trigInfoJetEta = new TrigOperationalInfo();
// trigInfoJetEta->set("EFJetEta", jetEta);
// HLT::ErrorCode hltEtaStatus = attachFeature(outputTE, trigInfoJetEta, "EFJetInfo");
// if (hltEtaStatus != HLT::OK) {
// msg() << MSG::ERROR << "Failed to attach TrigOperationalInfo (jet eta) as feature" << endreq;
// return hltEtaStatus;
// }
// Ideally would have liked to attach a view container
// but these cannot be persistified at the moment...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment