diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h index 6ef323a4b7e9832860e0b593fc5ec0ccc60cb117..ff9b4cb303a045dca6282c041cf134f96d4f3018 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h @@ -57,7 +57,11 @@ public: while( !infile.fail() ) { std::string file; infile >> file; - if ( !infile.fail() && file.find(".root")!=std::string::npos && file.find(".part")==std::string::npos ) push_back( s+"/"+file ); + if ( !infile.fail() && + file.find(".root")!=std::string::npos && + file.find(".part")==std::string::npos && + file.find(".bak")==std::string::npos && + file.find(".skimmed")==std::string::npos ) push_back( s+"/"+file ); } // for ( unsigned i=size() ; i-- ; ) std::cout << at(i) << std::endl; diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt index 9fd5e63a89fec886480ffdcc13485d048d8ea5b9..677447d7b1c834cc44c7654d4b8abfdc5eda510e 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt @@ -4,7 +4,9 @@ atlas_subdir( TrigInDetAnalysisUser ) # External dependencies: -find_package( ROOT COMPONENTS Core Hist MathCore Graf Gpad RIO Tree ) +find_package( ROOT COMPONENTS Core Hist MathCore Graf Graf3d Gpad RIO Tree ) + +atlas_disable_as_needed() # Libraries in the package: atlas_add_root_dictionary( Resplot diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Offline2017.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Offline2017.h index 793be3f4648c93575bf4f7158ef9f17b0f5afe40..33cea25d9ce839186e77c7d690809b54e48d17c8 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Offline2017.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Offline2017.h @@ -59,7 +59,7 @@ public: } - else if ( m_type=="tight" ) { + else if ( m_type=="tight" || m_type=="vtight" ) { if ( std::fabs(t->eta())>2.5 || std::fabs(t->pT())<m_pTMin ) selected = false; // Select track silicon hit content @@ -70,6 +70,8 @@ public: /// require a blayer (ibl in run2) hit only if one is expected if ( ( t->expectBL() || t->hasTruth() ) && t->bLayerHits()<1 ) selected = false; + + if ( m_type=="vtight" && t->pixelHits()==0 ) selected = false; } else if ( m_type=="tight-tau" ) { if ( std::fabs(t->eta())>2.5 || std::fabs(t->pT())<m_pTMin ) selected = false;