Skip to content
Snippets Groups Projects
Commit cde55f12 authored by Julie Kirk's avatar Julie Kirk Committed by Graeme Stewart
Browse files

add tau FTF collection (TrigInDetAnalysisUser-00-03-90)

	* share/TIDAdata11-rtt.dat : add tau FTF chain for tau55_idperf_track
	* TrigInDetAnalysisUser-00-03-90

2015-06-05 sutt < sutt @ cern.ch >
	* TrigInDetAnalysisUser-00-03-89
	* fix SuperRoi Filter

2015-06-02 sutt < sutt @ cern.ch >
	* TrigInDetAnalysisUser-00-03-88
	* fix RoiDescriptor filtering

2015-06-02 sutt < sutt @ cern.ch >
	* TrigInDetAnalysisUser-00-03-87
	* add composite RoiDescriptor filtering

2015-05-28  Julie Hart Kirk  <hartj@lxplus0084.cern.ch>

	* share/TIDAdata11-rtt.dat (testChains): add Bjet FTF chain for j55_bperf
	* TrigInDetAnalysisUser-00-03-86

...
(Long ChangeLog diff - truncated)
parent 63541c6e
No related branches found
No related tags found
No related merge requests found
......@@ -7,7 +7,7 @@
//
// Copyright (C) 2012 M.Sutton (sutt@cern.ch)
//
// $Id: Filters.h 655939 2015-03-21 10:18:36Z sutt $
// $Id: Filters.h 672664 2015-06-05 10:27:54Z sutt $
#ifndef FILTERS_H
......@@ -198,6 +198,38 @@ public:
void setRoi( TIDARoiDescriptor* r ) { m_roi = r; }
bool contains( const TrigInDetAnalysis::Track* t, const TIDARoiDescriptor* r ) const {
if ( r==0 ) {
std::cerr << "Filter_Combined::contains() called with null roidescriptor" << std::endl;
return true;
}
if ( r->composite() ) {
for ( unsigned i=r->size() ; i-- ; ) if ( contains( t, r->at(i) ) ) return true;
}
else {
if ( r->isFullscan() ) return true;
bool contained_phi = false;
if ( r->phiMinus()<r->phiPlus() ) contained_phi = ( t->phi()>r->phiMinus() && t->phi()<r->phiPlus() );
else contained_phi = ( t->phi()>r->phiMinus() || t->phi()<r->phiPlus() );
if ( ( t->eta()>r->etaMinus() && t->eta()<r->etaPlus() ) &&
( contained_phi ) &&
( t->z0()>r->zedMinus() && t->z0()<r->zedPlus() ) ) {
if ( m_debugPrintout ) std::cout << "\tFilter::inside roi" << std::endl;
return true;
}
}
return false;
}
bool select( const TrigInDetAnalysis::Track* t, const TIDARoiDescriptor* r=0 ) {
if ( r!=0 ) m_roi = r;
......@@ -214,41 +246,7 @@ public:
std::cout << "\tFilter::filter1 " << mf1->select(t,m_roi) << "\tfilter2 " << mf2->select(t,m_roi) << "\troi " << *m_roi << std::endl;
}
#if 0
double deta = t->eta() - m_roi->eta();
double dphi = t->phi() - m_roi->phi();
while ( dphi<-M_PI ) dphi += 2*M_PI;
while ( dphi>M_PI ) dphi -= 2*M_PI;
if ( m_debugPrintout ) {
std::cout << "\tFilter::deta : " << std::fabs(deta) << " (" << m_roi->etaHalfWidth() << ")"
<< "\tFilter::dphi : " << std::fabs(dphi) << " (" << m_roi->phiHalfWidth() << ") \t" << *t << std::endl;
}
if ( std::fabs(deta)<m_roi->etaHalfWidth() &&
std::fabs(dphi)<m_roi->phiHalfWidth() ) {
if ( m_debugPrintout ) std::cout << "\tFilter::inside roi" << std::endl;
return ( mf1->select(t,m_roi) && mf2->select(t,m_roi) );
}
else return false;
#endif
if ( m_roi->isFullscan() ) return ( mf1->select(t,m_roi) && mf2->select(t,m_roi) );
bool contained_phi = false;
if ( m_roi->phiMinus()<m_roi->phiPlus() ) contained_phi = ( t->phi()>m_roi->phiMinus() && t->phi()<m_roi->phiPlus() );
else contained_phi = ( t->phi()>m_roi->phiMinus() || t->phi()<m_roi->phiPlus() );
if ( ( t->eta()>m_roi->etaMinus() && t->eta()<m_roi->etaPlus() ) &&
( contained_phi ) &&
( t->z0()>m_roi->zedMinus() && t->z0()<m_roi->zedPlus() ) ) {
if ( m_debugPrintout ) std::cout << "\tFilter::inside roi" << std::endl;
return ( mf1->select(t,m_roi) && mf2->select(t,m_roi) );
}
if ( contains( t, m_roi ) ) return ( mf1->select(t,m_roi) && mf2->select(t,m_roi) );
else return false;
}
......
......@@ -46,7 +46,7 @@ void CopyDir(TDirectory *source, bool mkdirFlag) {
if ( (std::string(dirname).find("Fast") !=std::string::npos)) printf ("Found Fast");
if ( (std::string(dirname).find("vs") !=std::string::npos)) printf ("Found vs");
if ( (std::string(dirname).find("EF") !=std::string::npos) || (std::string(dirname).find("L2")!=std::string::npos) || (std::string(dirname).find("Fast")!=std::string::npos) || (std::string(dirname).find("vs")!=std::string::npos) ) {
if ( (std::string(dirname).find("EF") !=std::string::npos) || (std::string(dirname).find("L2")!=std::string::npos) || (std::string(dirname).find("HLT")!=std::string::npos) || (std::string(dirname).find("Fast")!=std::string::npos) || (std::string(dirname).find("vs")!=std::string::npos) ) {
// if ( std::string(dirname).find("slices") !=std::string::npos || std::string(dirname).find("roi")!=std::string::npos ) {
printf("Directory OK will be copied: %s\n",dirname);
source->cd(key->GetName());
......
......@@ -117,25 +117,27 @@ testChains = {
"HLT_mu6_idperf:InDetTrigParticleCreation_Muon_EFID",
"HLT_mu6_idperf:InDetTrigTrackingxAODCnv_Muon_EFID",
"HLT_tau29_idperf_track:TrigFastTrackFinder_Tau",
"HLT_tau29_idperf_track:TrigFastTrackFinder_Tau_IDTrig",
"HLT_tau29_idperf_track:InDetTrigParticleCreation_Tau_EFID",
"HLT_tau29_idperf_track:InDetTrigTrackingxAODCnv_Tau_EFID",
"HLT_tau29_idperf_track:InDetTrigTrackingxAODCnv_Tau_IDTrig",
"HLT_tau29_idperf_tracktwo:TrigFastTrackFinder_Tau",
"HLT_tau29_idperf_tracktwo:TrigFastTrackFinder_Tau_IDTrig",
"HLT_tau29_idperf_tracktwo:InDetTrigParticleCreation_Tau_EFID",
"HLT_tau29_idperf_tracktwo:InDetTrigTrackingxAODCnv_Tau_EFID",
"HLT_tau29_idperf_tracktwo:InDetTrigTrackingxAODCnv_Tau_IDTrig",
"HLT_tau29_idperf_tracktwo:InDetTrigTrackingxAODCnv_TauCore_FTF:forID1",
"HLT_tau29_idperf_tracktwo:InDetTrigTrackingxAODCnv_TauIso_FTF:forID3",
"HLT_tau29_idperf_tracktwo:InDetTrigTrackingxAODCnv_Tau_IDTrig:forID3",
"HLT_tau25_idperf_track:TrigFastTrackFinder_Tau",
"HLT_tau25_idperf_track:TrigFastTrackFinder_Tau_IDTrig",
"HLT_tau25_idperf_track:InDetTrigParticleCreation_Tau_EFID",
"HLT_tau25_idperf_track:InDetTrigTrackingxAODCnv_Tau_EFID",
"HLT_tau25_idperf_track:InDetTrigTrackingxAODCnv_Tau_FTF",
"HLT_tau25_idperf_track:InDetTrigTrackingxAODCnv_Tau_IDTrig",
"HLT_tau25_idperf_tracktwo:TrigFastTrackFinder_Tau",
"HLT_tau25_idperf_tracktwo:TrigFastTrackFinder_Tau_IDTrig",
"HLT_tau25_idperf_tracktwo:InDetTrigParticleCreation_Tau_EFID",
"HLT_tau25_idperf_tracktwo:InDetTrigTrackingxAODCnv_Tau_EFID",
"HLT_tau25_idperf_tracktwo:InDetTrigTrackingxAODCnv_Tau_IDTrig",
"HLT_tau25_idperf_tracktwo:InDetTrigTrackingxAODCnv_TauCore_FTF:forID1",
"HLT_tau25_idperf_tracktwo:InDetTrigTrackingxAODCnv_TauIso_FTF:forID3",
"HLT_tau25_idperf_tracktwo:InDetTrigTrackingxAODCnv_Tau_IDTrig:forID3",
"HLT_tau29_track:TrigFastTrackFinder_Tau",
"HLT_tau29_track:TrigFastTrackFinder_Tau_IDTrig",
"HLT_tau29_track:InDetTrigParticleCreation_Tau_EFID",
"HLT_tau29_track:InDetTrigTrackingxAODCnv_Tau_EFID",
"HLT_tau29_track:InDetTrigTrackingxAODCnv_Tau_IDTrig",
"HLT_tau29_track:InDetTrigTrackingxAODCnv_Tau_FTF",
"HLT_tau29_tracktwo:TrigFastTrackFinder_Tau",
"HLT_tau29_tracktwo:TrigFastTrackFinder_Tau_IDTrig",
"HLT_tau29_tracktwo:InDetTrigParticleCreation_Tau_EFID",
......@@ -151,6 +153,7 @@ testChains = {
"HLT_j55_bperf:TrigFastTrackFinder_Jet",
"HLT_j55_bperf:InDetTrigParticleCreation_Bjet_EFID",
"HLT_j55_bperf:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
"HLT_j55_bperf:InDetTrigTrackingxAODCnv_Bjet_FTF:forID",
"HLT_j55_bperf:InDetTrigTrackingxAODCnv_Bjet_EFID",
"HLT_j55_bperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig:forID",
......
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