Merge branch '21.1-dev-newftk' into '21.1-dev'

Add analyses for FTK full scan chains to the Tier 0 analysis

See merge request atlas/athena!10854

(cherry picked from commit 0eb92fc2 [formerly 4130763dce5da6e000eed96e88b0ce649f015ad1])

eaa38891 Add analyses for FTK full scan chains to the Tier 0 analysis
ba8870d6 Add the FTK refitted fullscan collections to the Tier 0 analysis

Former-commit-id: 7125d0a23ad16740b6f14e6884b24ef4c551f73a

Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx

@@ -235,12 +235,13 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
 
 
       while ( chainitr!=m_ntupleChainNames.end() ) {
-  
+	
 	/// get chain
         ChainString chainName = (*chainitr);
 
 	msg(MSG::DEBUG) << "configuring chain: " << chainName.head() << "\t: " << chainName.tail() << endmsg;
 
+
 	if ( chainName.roi()!="" ) { 
 	  msg(MSG::DEBUG) << "trying chain: " << chainName.head() 
 			  << "\ttracks: " << chainName.tail()
@@ -253,24 +254,49 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
 			  << endmsg;
 	}
 	
-	/// check for configured chains only ...
+	/// do offline type analyses first ...
 
-	if ( chainName.head().find("HLT_")==std::string::npos && 
-	     chainName.head().find("EF_")==std::string::npos  && 
-	     chainName.head().find("L2_")==std::string::npos ) { 
-	  chainitr++;
-	  continue;
-	}
 
-	/// get matching chains
-	std::vector<std::string> selectChains  = m_tdt->getListOfTriggers( chainName.head() );
+	if ( chainName.head() == "" ) { 
+	  
+	  std::string selectChain = "";
 
-	if ( selectChains.size()==0 ) { 
-	  msg(MSG::DEBUG) << "^[[91;1m" << "No chains matched\tchain input " << chainName.head() << "  :  " << chainName.tail() << "^[[m"<< endmsg;
-	}
+            if ( chainName.tail()!="" )    selectChain += ":key="+chainName.tail();
+	    if ( chainName.vtx()!="" )     selectChain += ":vtx="+chainName.vtx();
+	    if ( chainName.postcount() )   selectChain += ":post:"+chainName.post();
+
+            if ( chainName.extra()!="" )   continue;
+            if ( chainName.element()!="" ) continue;
+	    if ( chainName.roi()!="" )     continue;
+	    //            if ( !chainName.passed() )     continue;
 
-	for ( unsigned iselected=0 ; iselected<selectChains.size() ; iselected++ ) {
+            chains.push_back( selectChain );
 
+	}
+	else { 
+
+	  /// check for configured chains only ...
+
+	  if ( chainName.head().find("HLT_")==std::string::npos && 
+	       chainName.head().find("EF_")==std::string::npos  && 
+	       chainName.head().find("L2_")==std::string::npos ) { 
+	    chainitr++;
+	    continue;
+	  }
+	  
+	  /// get matching chains
+
+	  std::vector<std::string> selectChains;
+	  selectChains.clear();
+
+	  if ( chainName.head()!="" ) selectChains = m_tdt->getListOfTriggers( chainName.head() );
+	  
+	  if ( selectChains.size()==0 ) { 
+	    msg(MSG::DEBUG) << "^[[91;1m" << "No chains matched\tchain input " << chainName.head() << "  :  " << chainName.tail() << "^[[m"<< endmsg;
+	  }
+	  
+	  for ( unsigned iselected=0 ; iselected<selectChains.size() ; iselected++ ) {
+	    
             if ( chainName.tail()!="" )    selectChains[iselected] += ":key="+chainName.tail();
             if ( chainName.extra()!="" )   selectChains[iselected] += ":index="+chainName.extra();
             if ( chainName.element()!="" ) selectChains[iselected] += ":te="+chainName.element();
@@ -280,7 +306,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
 	    //            if ( !chainName.passed() )     selectChains[iselected] += ";DTE";
 
 	    if ( chainName.postcount() )     selectChains[iselected] += ":post:"+chainName.post();
-
+	    
 #if 0
 	    std::cout << "\nTrigTestBase::chain specification: " << chainName << "\t" << chainName.raw() << std::endl;
 	    std::cout << "\tchain: " << chainName.head()    << std::endl;
@@ -289,6 +315,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
 	    std::cout << "\tvtx:   " << chainName.vtx()     << std::endl;
 	    std::cout << "\tte:    " << chainName.element() << std::endl;
 #endif
+
 	    int shifterChains = m_shifterChains;
 	    if ( chainName.vtx()=="" ) shifterChains = ( m_shifterChains>1 ? 1 : m_shifterChains );
 	    
@@ -336,15 +363,16 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
 
             msg(MSG::DEBUG) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << "^[[m" << endmsg;
 
-	}
-        
-        ++chainitr;
+	  }
+	}	 
+ 
+	++chainitr;
       }
-
+	
       m_chainNames = chains;
-
+      
       for (unsigned i=0; i<m_chainNames.size(); ++i) {
-
+	
 	//     	std::cout << "\tcreating analysis : " << m_chainNames[i] << std::endl;
 
 	AnalysisConfig_Tier0* analysis =  new AnalysisConfig_Tier0( m_sliceTag, // m_chainNames[i],

Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py

@@ -468,7 +468,10 @@ def TrigIDtrkMonitoringTool():
 		# tidabase.OutputLevel = DEBUG
 		tidaftk.ntupleChainNames += [
 			"Offline",
-			#jets
+			# full scan analysis
+                       ":key=FTK_TrackParticleContainer",
+                       ":key=FTK_TrackParticleContainerRefit",
+			#jets			
 			"HLT_j.*perf_.*FTKRefit:key=InDetTrigTrackingxAODCnv_Bjet_FTKRefit",
 			"HLT_j.*perf_.*FTKRefit:key=InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig",
 			"HLT_j.*perf_.*FTK:key=InDetTrigTrackingxAODCnv_Bjet_FTK",