'CMakeLists.txt' (TrigIDTPMonitor-00-01-02)

2015-10-19  Johnny Raine <johnny.raine@cern.ch>
	* fixed compilation warning of unused parameter
	* tagged as TrigIDTPMonitor-00-01-02

2015-10-19  Johnny Raine <johnny.raine@cern.ch>
	* reduced number of histograms produced
	* tagged as TrigIDTPMonitor-00-01-01

2015-10-19  Johnny Raine <johnny.raine@cern.ch>
	* added TProfile efficiency histograms
	* modifed axes and fixed some plots
	* tagged as TrigIDTPMonitor-00-01-00

2015-10-19  Johnny Raine <johnny.raine@cern.ch>
	* consistently using probeTrack for filling 2D efficiency histograms

2015-10-15  Johnny Raine <johnny.raine@cern.ch>
	* fixed online running

2015-08-03  Johnny Raine <johnny.raine@cern.ch>
...
(Long ChangeLog diff - truncated)

Trigger/TrigMonitoring/TrigIDTPMonitor/CMakeLists.txt

+################################################################################
+# Package: TrigIDTPMonitor
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TrigIDTPMonitor )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+                          Control/DataModel
+                          Control/StoreGate
+                          Event/EventInfo
+                          Event/xAOD/xAODEventInfo
+                          Event/xAOD/xAODMuon
+                          Event/xAOD/xAODTracking
+                          Event/xAOD/xAODTrigBphys
+                          GaudiKernel
+                          Trigger/TrigConfiguration/TrigConfHLTData
+                          Trigger/TrigEvent/TrigBphysicsEvent
+                          Trigger/TrigEvent/TrigSteeringEvent
+                          Trigger/TrigSteer/TrigInterfaces )
+
+# Component(s) in the package:
+atlas_add_component( TrigIDTPMonitor
+                     src/*.cxx
+                     src/components/*.cxx
+                     LINK_LIBRARIES DataModel StoreGateLib SGtests EventInfo xAODEventInfo xAODMuon xAODTracking xAODTrigBphys GaudiKernel TrigConfHLTData TrigBphysicsEvent TrigSteeringEvent TrigInterfacesLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+

Trigger/TrigMonitoring/TrigIDTPMonitor/cmt/requirements

@@ -12,7 +12,7 @@ use DataModel		DataModel-*		Control
 
 use TrigSteeringEvent	TrigSteeringEvent-*	Trigger/TrigEvent
 use TrigBphysicsEvent	TrigBphysicsEvent-*	Trigger/TrigEvent
-use TrigNavigation	TrigNavigation-*	Trigger/TrigEvent
+#use TrigNavigation	TrigNavigation-*	Trigger/TrigEvent
 use TrigInterfaces	TrigInterfaces-*	Trigger/TrigSteer
 use TrigConfHLTData	TrigConfHLTData-*	Trigger/TrigConfiguration
 

Trigger/TrigMonitoring/TrigIDTPMonitor/python/TrigIDTPMonitorMonitoring.py

@@ -11,43 +11,45 @@ class TrigIDTPMonitorMonitorBase(TrigGenericMonitoringToolConfig):
         self.Histograms = [ defineHistogram('InvMassD', type='TH1F', title="TrigIDTPMonitor InvMass of TrigBphys object; invMass [MeV]",
                                             xbins=30, xmin=65000, xmax=115000) ]
 
-        self.Histograms += [ defineHistogram('InvMassN', type='TH1F', title="TrigIDTPMonitor InvMass of TrigBphys (if ID Track found); calcinvMass [MeV]",
-                                             xbins=30, xmin=65000, xmax=115000) ]
+        #self.Histograms += [ defineHistogram('InvMassN', type='TH1F', title="TrigIDTPMonitor InvMass of TrigBphys (if ID Track found); calcinvMass [MeV]",
+        #                                     xbins=30, xmin=65000, xmax=115000) ]
         
-        self.Histograms += [ defineHistogram('InvMass , LinesIM ', type='TH2F', title="TrigIDTPMonitor InvMass of TrigBphys object; invMass [MeV]",
-                                             xbins=30, xmin=65000, xmax=115000,
-                                             ybins = 3 ,  ymin=0, ymax=3) ]
+        #self.Histograms += [ defineHistogram('InvMass , LinesIM ', type='TH2F', title="TrigIDTPMonitor InvMass of TrigBphys object; invMass [MeV]",
+        #                                     xbins=30, xmin=65000, xmax=115000,
+        #                                     ybins = 3 ,  ymin=0, ymax=3) ]
         
+        self.Histograms += [ defineHistogram('InvMassBeforeSelection', type='TH1F', title="TrigIDTPMonitor InvMass of TrigBphys object; invMass [MeV]",
+                                             xbins=30, xmin=0, xmax=150000) ]
         
         self.Histograms += [ defineHistogram('InvMassTPD',type='TH1F', title="TrigIDTPMonitor CalculatedInvMass of Tag and Probe; CinvMassTP [MeV]",
                                              xbins=30, xmin=65000, xmax=115000) ]
 
-        self.Histograms += [ defineHistogram('InvMassTPN',type='TH1F', title="TrigIDTPMonitor CalculatedInvMass of Tag and Probe (if ID Track found); CinvMass [MeV]",
-                                             xbins=30, xmin=65000, xmax=115000) ]
+        #self.Histograms += [ defineHistogram('InvMassTPN',type='TH1F', title="TrigIDTPMonitor CalculatedInvMass of Tag and Probe (if ID Track found); CinvMass [MeV]",
+        #                                     xbins=30, xmin=65000, xmax=115000) ]
          
-        self.Histograms += [ defineHistogram('InvMassTP , LinesTP ', type='TH2F', title="TrigIDTPMonitor InvMass of Tag & Probe; invMass [MeV]",
-                                             xbins=30, xmin=65000, xmax=115000,
-                                             ybins = 3 ,  ymin=0, ymax=3) ] 
+        #self.Histograms += [ defineHistogram('InvMassTP , LinesTP ', type='TH2F', title="TrigIDTPMonitor InvMass of Tag & Probe; invMass [MeV]",
+        #                                     xbins=30, xmin=65000, xmax=115000,
+        #                                     ybins = 3 ,  ymin=0, ymax=3) ] 
                 
         self.Histograms += [ defineHistogram('ProbePTD',type='TH1F', title="TrigIDTPMonitor ProbePT; pt [MeV]",
                                              xbins=20, xmin=0, xmax=100000) ]
         
-        self.Histograms += [ defineHistogram('ProbePTN',type='TH1F', title="TrigIDTPMonitor ProbePT (if ID Track found); pt [MeV]",
-                                             xbins=20, xmin=0, xmax=100000) ]
+        #self.Histograms += [ defineHistogram('ProbePTN',type='TH1F', title="TrigIDTPMonitor ProbePT (if ID Track found); pt [MeV]",
+        #                                     xbins=20, xmin=0, xmax=100000) ]
      
-        self.Histograms += [ defineHistogram('ProbePt , LinesPt ', type='TH2F', title="TrigIDTPMonitor Probe pt; pt [MeV]",
-                                             xbins=20, xmin=0, xmax=100000,
-                                             ybins = 3,  ymin=0, ymax=3) ] 
+        #self.Histograms += [ defineHistogram('ProbePt , LinesPt ', type='TH2F', title="TrigIDTPMonitor Probe pt; pt [MeV]",
+        #                                     xbins=20, xmin=0, xmax=100000,
+        #                                     ybins = 3,  ymin=0, ymax=3) ] 
      
         self.Histograms += [ defineHistogram('ProbeEtaD',type='TH1F', title="TrigIDTPMonitor ProbeEta; eta ",
                                              xbins=15, xmin=-3, xmax=3) ]
         
-        self.Histograms += [ defineHistogram('ProbeEtaN',type='TH1F', title="TrigIDTPMonitor ProbeEta if (ID Track found); eta ",
-                                             xbins=15, xmin=-3, xmax=3) ]
+        #self.Histograms += [ defineHistogram('ProbeEtaN',type='TH1F', title="TrigIDTPMonitor ProbeEta if (ID Track found); eta ",
+        #                                     xbins=15, xmin=-3, xmax=3) ]
         
-        self.Histograms += [ defineHistogram('ProbeEta , LinesEta ', type='TH2F', title="TrigIDTPMonitor Probe eta; eta",
-                                             xbins=15, xmin=-3, xmax=3, 
-                                             ybins = 3,  ymin=0, ymax=3) ]
+        #self.Histograms += [ defineHistogram('ProbeEta , LinesEta ', type='TH2F', title="TrigIDTPMonitor Probe eta; eta",
+        #                                     xbins=15, xmin=-3, xmax=3, 
+        #                                     ybins = 3,  ymin=0, ymax=3) ]
         
         #self.Histograms += [ defineHistogram('ProbeD0D',type='TH1F', title="TrigIDTPMonitor Probe d0; d0 [m]",                                                         xbins=20, xmin=-0.002, xmax=0.002) ]
         
@@ -55,29 +57,29 @@ class TrigIDTPMonitorMonitorBase(TrigGenericMonitoringToolConfig):
         
         #self.Histograms += [ defineHistogram('ProbeD0 , LinesD0 ', type='TH2F', title="TrigIDTPMonitor Probe d0[m]; d0", xbins=10, xmin=-0.002, xmax=0.002,  ybins = 6 ,  ymin=0, ymax=6) ] 
         
-        self.Histograms += [ defineHistogram('ProbeD0D',type='TH1F', title="TrigIDTPMonitor Probe d0; d0 [m]",
-                                             xbins=15, xmin=-30, xmax=30) ]
+
+        self.Histograms += [ defineHistogram('ProbeD0D',type='TH1F', title="TrigIDTPMonitor Probe d0; d0 [mm]",
+                                             xbins=5, xmin=-10, xmax=10) ]
         
-        self.Histograms += [ defineHistogram('ProbeD0N',type='TH1F', title="TrigIDTPMonitor Probe d0 (if ID Track found); d0 [mm]",
-                                             xbins=15, xmin=-30, xmax=30) ]
- 
+        #self.Histograms += [ defineHistogram('ProbeD0N',type='TH1F', title="TrigIDTPMonitor Probe d0 (if ID Track found); d0 [mm]",
+        #                                     xbins=5, xmin=-10, xmax=10) ]
 
-        self.Histograms += [ defineHistogram('ProbeD0 , LinesD0 ', type='TH2F', title="TrigIDTPMonitor Probe d0; d0 [m]",
-                                             xbins=15, xmin=-30, xmax=30,
-                                             ybins = 3,  ymin=0, ymax=3) ] 
+        #self.Histograms += [ defineHistogram('ProbeD0 , LinesD0 ', type='TH2F', title="TrigIDTPMonitor Probe d0; d0 [mm]",
+        #                                     xbins=25, xmin=-100, xmax=100,
+        #                                     ybins = 3,  ymin=0, ymax=3) ] 
         
         self.Histograms += [ defineHistogram('ProbePhiD',type='TH1F', title="TrigIDTPMonitor Probe Phi; phi [rad]",
                                              xbins=15, xmin=-3.2, xmax=3.2) ]
         
-        self.Histograms += [ defineHistogram('ProbePhiN',type='TH1F', title="TrigIDTPMonitor Probe Phi (if ID Track found); phi [rad]",
-                                             xbins=15, xmin=-3.2, xmax=3.2) ]
+        #self.Histograms += [ defineHistogram('ProbePhiN',type='TH1F', title="TrigIDTPMonitor Probe Phi (if ID Track found); phi [rad]",
+        #                                     xbins=15, xmin=-3.2, xmax=3.2) ]
         
-        self.Histograms += [ defineHistogram('ProbePhi , LinesPhi ', type='TH2F', title="TrigIDTPMonitor Probe phi; phi[rad]",
-                                             xbins=15, xmin=-3.2, xmax=3.2,
-                                             ybins = 3,  ymin=0, ymax=3) ]
+        #self.Histograms += [ defineHistogram('ProbePhi , LinesPhi ', type='TH2F', title="TrigIDTPMonitor Probe phi; phi[rad]",
+        #                                     xbins=15, xmin=-3.2, xmax=3.2,
+        #                                     ybins = 3,  ymin=0, ymax=3) ]
         
         self.Histograms += [ defineHistogram('deltaMass', type='TH1F', title="TrigIDTPMonitor mass difference of t&p to Z mass; deltaM [MeV]",
-                                             xbins=25, xmin=-10000, xmax=10000) ]
+                                             xbins=50, xmin=-20000, xmax=20000) ]
         
         self.Histograms += [ defineHistogram('ID-TagMass', type='TH1F', title="TrigIDTPMonitor InvMass PT ID and Tag; calcinvMass [MeV]",
                                              xbins=20, xmin=60000, xmax=130000) ]
@@ -85,7 +87,42 @@ class TrigIDTPMonitorMonitorBase(TrigGenericMonitoringToolConfig):
         self.Histograms += [ defineHistogram('Efficiencies',type='TH1F', title="TrigIDTPMonitor Overall Eff; strat",
                                              xbins=3, xmin=0, xmax=3) ]
         
-        #self.Histograms += [ defineHistogram('TPcounts',type='TH1F', title="TrigIDTPMonitor Used Tags and Probes during the analysis; strat",                                                         xbins=3, xmin=0, xmax=3) ]
+        ######Profile Histograms######
+        self.Histograms += [ defineHistogram('InvMassD, PTfound', type='TProfile', title="TrigIDTPMonitor InvMass of BPhysObject PT Efficiency; InvMass [MeV]",
+                                             xbins=30, xmin=65000, xmax=115000) ]
+
+        self.Histograms += [ defineHistogram('InvMassTPD, PTfound', type='TProfile', title="TrigIDTPMonitor CalculatedInvMass of Tag and Probe PT Efficiency; CInvMass [MeV]",
+                                             xbins=30, xmin=65000, xmax=115000) ]
+
+        self.Histograms += [ defineHistogram('ProbePTD, PTfound', type="TProfile", title="TrigIDTPMonitor Probe pT PT Efficiency; pT [MeV]",
+                                             xbins=20, xmin=0, xmax=100000) ]
+
+        self.Histograms += [ defineHistogram('ProbeEtaD, PTfound', type="TProfile", title="TrigIDTPMonitor Probe eta PT Efficiency; eta",
+                                             xbins=15, xmin=-3, xmax=3) ]
+
+        self.Histograms += [ defineHistogram('ProbeD0D, PTfound', type="TProfile", title="TrigIDTPMonitor Probe d0 PT Efficiency; d0 [mm]",
+                                             xbins=5, xmin=-10, xmax=10) ]
+        
+        self.Histograms += [ defineHistogram('ProbePhiD, PTfound', type="TProfile", title="TrigIDTPMonitor Probe Phi PT Efficiency; phi [rad]",
+                                             xbins=15, xmin=-3.2, xmax=3.2) ]
+
+        self.Histograms += [ defineHistogram('InvMassD, FTFfound', type='TProfile', title="TrigIDTPMonitor InvMass of BPhysObject FTF Efficiency; InvMass [MeV]",
+                                             xbins=30, xmin=65000, xmax=115000) ]
+
+        self.Histograms += [ defineHistogram('InvMassTPD, FTFfound', type="TProfile", title="TrigIDTPMonitor CalculatedInvMass of Tag and Probe FTF Efficiency; CInvMass [MeV]",
+                                             xbins=30, xmin=65000, xmax=115000) ]
+
+        self.Histograms += [ defineHistogram('ProbePTD, FTFfound', type="TProfile", title="TrigIDTPMonitor Probe pT FTF Efficiency; pT [MeV]",
+                                             xbins=20, xmin=0, xmax=100000) ]
+
+        self.Histograms += [ defineHistogram('ProbeEtaD, FTFfound', type="TProfile", title="TrigIDTPMonitor Probe eta FTF Efficiency; eta",
+                                             xbins=15, xmin=-3, xmax=3) ]
+
+        self.Histograms += [ defineHistogram('ProbeD0D, FTFfound', type="TProfile", title="TrigIDTPMonitor Probe d0 FTF Efficiency; d0 [mm]",
+                                             xbins=5, xmin=-10, xmax=10) ]
+        
+        self.Histograms += [ defineHistogram('ProbePhiD, FTFfound', type="TProfile", title="TrigIDTPMonitor Probe Phi FTF Efficiency; phi [rad]",
+                                             xbins=15, xmin=-3.2, xmax=3.2) ]
 
 
 class TrigIDTPMonitorOnlineMonitor(TrigIDTPMonitorMonitorBase):

Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.cxx

@@ -57,6 +57,7 @@ TrigIDTPMonitor::TrigIDTPMonitor(const std::string& name, ISvcLocator* pSvcLocat
   declareMonitoredStdContainer("LinesPhi", m_linesphi, AutoClear);
 
   //verification of 2D histograms
+  declareMonitoredVariable("InvMassBeforeSelection",   m_invBS,        -1);
   declareMonitoredVariable("InvMassD",   m_invD,        -1);
   declareMonitoredVariable("InvMassN",   m_invN,        -1);
   declareMonitoredVariable("InvMassTPD", m_invTPD,      -1);
@@ -71,6 +72,8 @@ TrigIDTPMonitor::TrigIDTPMonitor(const std::string& name, ISvcLocator* pSvcLocat
   declareMonitoredVariable("ProbePhiN",  m_phiN,       -10);
   declareMonitoredVariable("deltaMass",  m_massDiff,-99999);
   declareMonitoredVariable("ID-TagMass", m_IDTmass,     -1);
+  declareMonitoredVariable("PTfound",    m_PTfound,      0);
+  declareMonitoredVariable("FTFfound",   m_FTFfound,     0);
 
 
   declareMonitoredStdContainer("Efficiencies", m_eff,  AutoClear);
@@ -94,7 +97,7 @@ HLT::ErrorCode TrigIDTPMonitor::hltBeginRun() {
   return HLT::OK;
 }
 
-HLT::ErrorCode TrigIDTPMonitor::acceptInput(const HLT::TriggerElement* inputTE, bool& pass){
+HLT::ErrorCode TrigIDTPMonitor::acceptInput(const HLT::TriggerElement* /*inputTE*/, bool& pass){
   ATH_MSG_DEBUG( "Running TrigIDTPMonitor::acceptInputs" );
   pass = true;
   return HLT::OK;
@@ -188,6 +191,8 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
       }
   }
 
+  m_invBS = invMass;
+
   if(abs(invMass-m_mumuMass)>m_massAcceptanceTP)
     {
       ATH_MSG_DEBUG( "Invalid Candidate from TrigEFBPhys mass" );
@@ -217,90 +222,6 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
   TrigConf::HLTTriggerElement::getLabel( tes.back()->getId(), teInLabel2 );
   ATH_MSG_DEBUG( "Name2: " << teInLabel2 );
 
-
-  //Is this section necessary
-
-  //Muon ID Tracks
-
-  const xAOD::TrackParticleContainer *muon1TrkContainer(NULL);
-  const xAOD::TrackParticleContainer *muon2TrkContainer(NULL);
-
-  ATH_MSG_DEBUG( "FTF get" );
-
-  if ( getFeature(tes.front(), muon1TrkContainer, "InDetTrigTrackingxAODCnv_Muon_FTF") != HLT::OK){//,"InDetTrigParticleCreation_Muon_EFID") != HLT::OK ) {
-    ATH_MSG_WARNING( "Navigation error while getting TrackParticleContainer 1 - FTF" );
-    return HLT::OK;
-  }
-
-  if (muon1TrkContainer == NULL ){
-    ATH_MSG_DEBUG( "Navigation error whilst getting TrackParticleContainer 1. Received null pointer" );
-    return HLT::OK;
-  }
-
-  ATH_MSG_DEBUG( "Got Particle collection 1 with " << muon1TrkContainer->size() << " particles" );
-
-  if ( getFeature(tes.back(), muon2TrkContainer, "InDetTrigTrackingxAODCnv_Muon_FTF") != HLT::OK){//,"InDetTrigParticleCreation_Muon_EFID") != HLT::OK ) {
-    ATH_MSG_WARNING( "Navigation error while getting TrackParticleContainer 2 - FTF" );
-    return HLT::OK;
-  }
-
-  if (muon1TrkContainer == NULL ){
-    ATH_MSG_DEBUG( "Navigation error whilst getting TrackParticleContainer 2. Received null pointer" );
-    return HLT::OK;
-  }
-
-  ATH_MSG_DEBUG( "Got Particle collection 2 with " << muon2TrkContainer->size() << " particles" );
-  
-  for(auto p1 : *muon1TrkContainer){
-    for(auto p2 : *muon2TrkContainer){
-      double invm = TrackInvMass(p1,p2);
-      ATH_MSG_DEBUG( "FTF Inv Mass = " << invm );
-      if(abs(invm-m_mumuMass) > m_massAcceptanceTID)
-	ATH_MSG_DEBUG( "Inefficient event from EF" );
-    }
-  }
-
-  ATH_MSG_DEBUG( "PT get" );
-
-  if ( getFeature(tes.front(), muon1TrkContainer, "InDetTrigTrackingxAODCnv_Muon_EFID") != HLT::OK){//,"InDetTrigParticleCreation_Muon_EFID") != HLT::OK ) {
-    //if( getFeature(tes.front(), muon1TrkContainer, "InDetTrigTrackingxAODCnv_Bphysics_IDTrig") != HLT::OK){
-    ATH_MSG_WARNING( "Navigation error while getting TrackParticleContainer 1 - PT" );
-    return HLT::OK;
-    // }
-  }
-
-  if (muon1TrkContainer == NULL ){
-    ATH_MSG_DEBUG( "Navigation error whilst getting TrackParticleContainer 1. Received null pointer" );
-    return HLT::OK;
-  }
-
-  ATH_MSG_DEBUG( "Got Particle collection 1 with " << muon1TrkContainer->size() << " particles" );
-
-  if ( getFeature(tes.back(), muon2TrkContainer, "InDetTrigTrackingxAODCnv_Muon_EFID") != HLT::OK){//,"InDetTrigParticleCreation_Muon_EFID") != HLT::OK ) {
-    //if( getFeature(tes.front(), muon1TrkContainer, "InDetTrigTrackingxAODCnv_Bphysics_IDTrig") != HLT::OK){
-    ATH_MSG_WARNING( "Navigation error while getting TrackParticleContainer 2 - PT" );
-    return HLT::OK;
-    //}
-  }
-
-  if (muon1TrkContainer == NULL ){
-    ATH_MSG_DEBUG( "Navigation error whilst getting TrackParticleContainer 2. Received null pointer" );
-    return HLT::OK;
-  }
-
-  ATH_MSG_DEBUG( "Got Particle collection 2 with " << muon2TrkContainer->size() << " particles" );
-  
-  for(auto p1 : *muon1TrkContainer){
-    for(auto p2 : *muon2TrkContainer){
-      double invm = TrackInvMass(p1,p2);
-      ATH_MSG_DEBUG( "PT Inv Mass = " << invm );
-      if(abs(invm-m_mumuMass) > m_massAcceptanceTID)
-	ATH_MSG_DEBUG( "Inefficient event from EF" );
-    }
-  }
-
-  //endis
-
   const TrigRoiDescriptor *roi1(0);
   const TrigRoiDescriptor *roi2(0);
 
@@ -484,6 +405,10 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
 	  ATH_MSG_DEBUG( "Muon outside corresponding region" );
 	}
       }
+      else{
+	ATH_MSG_WARNING( "No primaryTrackParticle for muon container 2");
+	return HLT::OK;
+      }
     }
   }
   else if(tag2probe1){
@@ -559,6 +484,10 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
 	  ATH_MSG_DEBUG( "Muon outside corresponding region" );
 	}
       }
+      else{
+	ATH_MSG_WARNING( "No primaryTrackParticle for muon container 1" );
+	return HLT::OK;
+      }
     }   
   }
   else{
@@ -593,29 +522,27 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
   const xAOD::TrackParticleContainer* PTTrkContainer(NULL);
 
   if(tag1probe2){
-    if(getFeature(tes.back(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Muon_EFID") != HLT::OK){
-      if(getFeature(tes.back(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Muon_IDTrig") != HLT::OK){
-        if(getFeature(tes.back(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Bphysics_IDTrig") != HLT::OK){
-	  ATH_MSG_WARNING( "There was an error retrieving Probe's ID TrackParticleContainer" );
-	  return HLT::OK;
-	}
-      }
+    if(getFeature(tes.back(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Muon_IDTrig") != HLT::OK){
+      //if(getFeature(tes.back(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Bphysics_IDTrig") != HLT::OK){
+      ATH_MSG_WARNING( "There was an error retrieving Probe's ID TrackParticleContainer" );
+      //return HLT::OK;
     }
   }
   else if(tag2probe1){
-    if(getFeature(tes.front(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Muon_EFID") != HLT::OK){
-      if(getFeature(tes.front(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Muon_IDTrig") != HLT::OK){
-        if(getFeature(tes.front(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Bphysics_IDTrig") != HLT::OK){
-	  ATH_MSG_WARNING( "There was an error retrieving Probe's ID TrackParticleContainer" );
-	  return HLT::OK;
-	}
-      }
-    } 
+    if(getFeature(tes.front(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Muon_IDTrig") != HLT::OK){
+      //if(getFeature(tes.front(), PTTrkContainer, "InDetTrigTrackingxAODCnv_Bphysics_IDTrig") != HLT::OK){
+      ATH_MSG_WARNING( "There was an error retrieving Probe's ID TrackParticleContainer" );
+      //return HLT::OK;
+    }
+  }
+  else{
+    ATH_MSG_WARNING( "Tag and probe muons not set" );
+    return HLT::OK;
   }
 
   if( PTTrkContainer == NULL ){
     ATH_MSG_DEBUG( "Navigation error whilst getting Probe ID TrackParticleContainer (retrieved null pointer)" );
-    return HLT::OK;
+    //return HLT::OK;
   }
 
   ATH_MSG_DEBUG( "Retrieved ID track collection with " << PTTrkContainer->size() << " particles" );
@@ -709,20 +636,20 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
 	    m_invTP.push_back(TrackInvMass(tagTrack,probeTrack));
 	    m_linesTP.push_back(1.5);
 
-	    //m_pt.push_back(probeTrack->pt());
-	    m_pt.push_back(particle->pt());
+	    m_pt.push_back(probeTrack->pt());
+	    //m_pt.push_back(particle->pt());
 	    m_linespt.push_back(1.5);
 
-	    //m_eta.push_back(probeTrack->eta());
-	    m_eta.push_back(particle->eta());
+	    m_eta.push_back(probeTrack->eta());
+	    //m_eta.push_back(particle->eta());
 	    m_lineseta.push_back(1.5);
 
-	    //m_d0.push_back(probeTrack->d0());
-	    m_d0.push_back(particle->d0());
+	    m_d0.push_back(probeTrack->d0());
+	    //m_d0.push_back(particle->d0());
 	    m_linesd0.push_back(1.5);
 
-	    //m_phi.push_back(probeTrack->phi());
-	    m_phi.push_back(particle->phi());
+	    m_phi.push_back(probeTrack->phi());
+	    //m_phi.push_back(particle->phi());
 	    m_linesphi.push_back(1.5);
 
 	    m_eff.push_back(1.5);
@@ -735,6 +662,7 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
 	    m_phiN=probeTrack->phi();
 	    m_invTPN=TrackInvMass(tagTrack,probeTrack);
 	    m_IDTmass=compatibleIDTrack(tagTrack, probeTrack, particle);
+	    m_PTfound = 1;
 
 	    ATH_MSG_INFO( "Found probe ID candidate from Precision Tracking" );
 	    found = true;
@@ -774,20 +702,25 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
 	      m_invTP.push_back(TrackInvMass(tagTrack, probeTrack));
 	      m_linesTP.push_back(2.5);
 	      
-	      m_pt.push_back(FTFTrack->pt());
+	      //m_pt.push_back(FTFTrack->pt());
+	      m_pt.push_back(probeTrack->pt());
 	      m_linespt.push_back(2.5);
 	      
-	      m_eta.push_back(FTFTrack->eta());
+	      //m_eta.push_back(FTFTrack->eta());
+	      m_eta.push_back(probeTrack->eta());
 	      m_lineseta.push_back(2.5);
 	      
-	      m_d0.push_back(FTFTrack->d0());
+	      //m_d0.push_back(FTFTrack->d0());
+	      m_d0.push_back(probeTrack->d0());
 	      m_linesd0.push_back(2.5);
 	      
-	      m_phi.push_back(FTFTrack->phi());
+	      //m_phi.push_back(FTFTrack->phi());
+	      m_phi.push_back(probeTrack->phi());
 	      m_linesphi.push_back(2.5);
 	      
 	      m_eff.push_back(2.5);
-	  
+	      m_FTFfound = 1;
+
 	      FTFfound = true;
 	      ATH_MSG_INFO( "Found probe ID candidate from FTF" );
 	    }

Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.h

@@ -83,6 +83,7 @@ class TrigIDTPMonitor: public HLT::FexAlgo{
 
   //monitored values
     
+  double m_invBS; //Invariant mass from TrigEFBPhys object before selection
   double m_invD; //Invariant mass from TrigEFBPhys object
   double m_invN; //Invariant mass from TrigEFBPhys object (if ID Track)
   double m_invTPD; //Invariant mass calculated from Tag and Probe Tracks
@@ -97,7 +98,8 @@ class TrigIDTPMonitor: public HLT::FexAlgo{
   double m_phiN;//phi of the Probe Muon(if ID Track)
   double m_IDTmass; //Inveriant mass calculated from ID track and CombMuon
   double m_massDiff;//Difference between invariant masses
-  
+  double m_PTfound; //found probe PT track
+  double m_FTFfound; //found probe FTF tack
 
 };