Skip to content
Snippets Groups Projects
Commit 93202c64 authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (JetEDM-00-00-23)

	* JetEDM-00-00-23
	* ATLJETMET-381
	* Root/JetConstituentFiller.cxx: Remove code that was skipping fill of
	  ghost counts when there were no ghosts.

2015-01-12  Miles Wu <mileswu@uchicago.edu>
	* JetEDM-00-00-22
	* JetConstituentFiller: Add backwards compatible function for code that
	  uses the rel 19.1 function call that doesn't have ghost labels (see
	  ATLJETMET-24 for more details)
parent d45e4c12
No related branches found
No related tags found
No related merge requests found
################################################################################
# Package: JetEDM
################################################################################
# Declare the package name:
atlas_subdir( JetEDM )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthToolSupport/AsgTools
Event/xAOD/xAODBase
Event/xAOD/xAODJet
Event/xAOD/xAODTracking
PRIVATE
Event/xAOD/xAODMuon )
# External dependencies:
find_package( FastJet )
# Component(s) in the package:
atlas_add_library( JetEDM
Root/*.cxx
PUBLIC_HEADERS JetEDM
PRIVATE_INCLUDE_DIRS ${FASTJET_INCLUDE_DIRS}
LINK_LIBRARIES AsgTools xAODBase xAODJet xAODTracking
PRIVATE_LINK_LIBRARIES ${FASTJET_LIBRARIES} xAODMuon )
......@@ -39,6 +39,14 @@ public :
int extractConstituents(xAOD::Jet& jet, const NameList* pghostlabs,
const fastjet::PseudoJet* ppj =0);
/// Build and fill constituents of jet from its PseudoJet (or from ppj)
/// Returns the number of pseudojet constituents without user info
/// or < 0 for error.
/// If the jet does not have an associated pseudojet, then the
/// last argument is used in its place.
/// This is for backwards compatability with code that targets release 19.1
int extractConstituents(xAOD::Jet& jet, const fastjet::PseudoJet* ppj =0);
/// Returns the jet's constituents as a vector of PseudoJet
/// if ignoreGhosts==true, ghost constituents are removed from the output.
static PseudoJetVector constituentPseudoJets(const xAOD::Jet& jet, bool ignoreGhosts=true);
......
......@@ -119,10 +119,6 @@ extractConstituents(xAOD::Jet& jet, const NameList* pghostlabs,
nbad += out[i].size();
continue;
}
} else {
if ( out[i].size()==0 && outms[i].size()==0 ) {
continue;
}
}
ParType& partype = partypes[i];
std::string cname = pli->label(i) + "Count";
......@@ -145,6 +141,10 @@ extractConstituents(xAOD::Jet& jet, const NameList* pghostlabs,
return nbad;
}
int JetConstituentFiller::extractConstituents(xAOD::Jet& jet, const fastjet::PseudoJet* ppj2) {
return extractConstituents(jet, 0, ppj2);
}
//**********************************************************************
PseudoJetVector JetConstituentFiller::constituentPseudoJets(const xAOD::Jet& jet, bool ignoreGhosts){
......
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