Merge branch 'mutnp' into 'master'

Run the TnP analysis also for the truth selection

See merge request atlas/athena!46495

Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-TnP.dat

+// emacs: this is -*- c++ -*-
+
+#include "TIDAdata_cuts.dat"
+
+ZmassMin = 0.0;
+ZmassMax = 110.0;
+
+doTnPHistos = 1;
+
+
+refChain = "Truth";
+//refChain = "Offline";
+//refChain = "Electrons";
+//refChain = "Muons";
+//refChain = "Taus";
+
+
+MinVertices = 0;
+
+
+// #include "TIDAdata-chains-run3.dat"
+
+testChains = {};
+
+
+InitialiseFirstEvent = 1;
+
+outputFile = "data-output.root";
+DataFiles = { "TrkNtuple-0000.root"};
+//DataSets = {"./"}
+
+
+#include "TIDAbeam.dat"
+
+TagnProbe = {
+        "HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI:HLT_IDTrack_Electron_FTF:HLT_Roi_FastElectron:0",
+        "HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI:HLT_IDTrack_Electron_FTF:HLT_Roi_FastElectron:1",
+	//"HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon:0",
+        //"HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon:1",
+
+	"HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI:HLT_IDTrack_Electron_IDTrig:HLT_Roi_FastElectron:0",
+	"HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI:HLT_IDTrack_Electron_IDTrig:HLT_Roi_FastElectron:1"
+        //"HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon:0",
+        //"HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon:1"
+}; 
+

Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3-offline-TnP.dat

 // emacs: this is -*- c++ -*-
 
-//NFiles  = 10;
-
-pT     = 10000;
-eta    = 2.5;
-// npix   = 1;
-// nsct   = 2;
-
-/// hmmm
-/// npix   = 4; /// double up, this is number of degrees of freedomw and really means 2 pixle "clusters"  
-npix   = 2; /// double up, this is number of degrees of freedomw and so 4 really means 2 pixeL "clusters"  
-nsct   = 4;
-
-nholes = 2;
-
-expectBL=1;
-
-pT_rec  = 0;
-eta_rec = 5;
-Rmatch = 0.05;
-
-
-dumpflag = 1;
-
-a0v = 10.5;
-z0v = 10.5;
+#include "TIDAdata_cuts-offline.dat"
 
 ZmassMin = 0.0;
 ZmassMax = 110.0;
 
 doTnPHistos = 1;
 
+//refChain = "Truth";
 refChain = "Offline";
 //refChain = "Electrons";
-//refChain = "Muons_Medium";
+//refChain = "Muons";
 //refChain = "Taus";
 
-/// NB: For the "Truth" chains, need to specify what 
-///     sort of particle (ie which pdgID) is needed
-/// Fixme: should add a flag to enable/disable this
-///        what if we want all final state particles
-///        independent of pdgID?
-
-//pdgId=11; // electron --entered in command line now
-
-// Nentries = 10000;
-
-// MinVertices = 0;
-
-// VertexSelection    = "0"; // possible flags: BestPT2, LeadPT, Ntracks
-// VertexSelectionRec = "0";
-
-// FilterRoi = { 2.4, 1, 2 };
+MinVertices = 0;
 
-testChains = {
-  //  "Offline",
-  //  "Muons",
-  //  "Electrons",                                                                        
-  //  "Electrons_MediumCB",
-  //  "Electrons_TightCB",
-  //  "Electrons_MediumLH",
-  //  "Electrons_TightLH",
+/// do not loadthe chains for the TnP analyses
+/// #include "TIDAdata-chains-run3.dat"
 
-//  "HLT_mu40_idperf:InDetTrigTrackingxAODCnv_Muon_FTF",
-//  "HLT_mu40_idperf:InDetTrigTrackingxAODCnv_Muon_IDTrig",
+testChains = {};
 
-//  "HLT_mu6_idperf:InDetTrigTrackingxAODCnv_Muon_FTF",
-//  "HLT_mu6_idperf:InDetTrigTrackingxAODCnv_Muon_IDTrig",
-
-//  "HLT_mu10_idperf:InDetTrigTrackingxAODCnv_Muon_FTF",
-//  "HLT_mu10_idperf:InDetTrigTrackingxAODCnv_Muon_IDTrig",
-
-//  "HLT_mu20_idperf:InDetTrigTrackingxAODCnv_Muon_FTF",
-//  "HLT_mu20_idperf:InDetTrigTrackingxAODCnv_Muon_IDTrig",
+outputFile = "data-output.root";
+DataFiles = { "TrkNtuple-0000.root"};
+//DataSets = {"/eos/atlas/atlascerngroupdisk/trig-id/data18_13TeV/muon-tnp/user.maparo.00363979.physics_Main.merge.AOD.f1002_m2037-20191004-141732_EXT0"};
+//DataSets = {"/eos/atlas/atlascerngroupdisk/trig-id/data18_13TeV/muon-tnp/user.maparo.00358395.physics_Main.merge.AOD.f961_m2015-20191004-141716_EXT0"};
 
-//  "HLT_mu24_idperf:InDetTrigTrackingxAODCnv_Muon_FTF",
-//  "HLT_mu24_idperf:InDetTrigTrackingxAODCnv_Muon_IDTrig"
+#include "TIDAbeam.dat"
 
-//	"HLT_mu13_mu13_idperf_Zmumu:L2_muon_combMuon10GeV_v15a_MU10_wOvlpRm/InDetTrigTrackingxAODCnv_Muon_FTF:L2_muon_combMuon10GeV_v15a_MU10_wOvlpRm/forID1",
-//	"HLT_mu13_mu13_idperf_Zmumu:L2_mucomb_mu10idperf_MU10/InDetTrigTrackingxAODCnv_Muon_FTF:L2_mucomb_mu10idperf_MU10/forID1"
-};
- 
 
 TagnProbe = {
         "HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI:HLT_IDTrack_Electron_FTF:HLT_Roi_FastElectron:0",
@@ -94,17 +40,3 @@ TagnProbe = {
         //"HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon:1"
 }; 
 
-
-InitialiseFirstEvent = 1;
-
-outputFile = "data-electron-tnp.root";
-
-//#include "dataset.dat"
-
-// GRL = "/afs/cern.ch/user/s/sutt/tida/data16_13TeV.periodAllYear_HEAD_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml";
-
-//#include "grl.dat"
-
-DataFiles = {"TrkNtuple-0000.root"};
-//DataSets = {"/eos/atlas/atlascerngroupdisk/trig-id/data18_13TeV/muon-tnp/user.maparo.00363979.physics_Main.merge.AOD.f1002_m2037-20191004-141732_EXT0"};
-//DataSets = {"/eos/atlas/atlascerngroupdisk/trig-id/data18_13TeV/muon-tnp/user.maparo.00358395.physics_Main.merge.AOD.f961_m2015-20191004-141716_EXT0"};

Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py

@@ -235,6 +235,7 @@ class TrigInDetRdictStep(Step):
             os.system( 'get_files -data TIDAdata-run3-larged0-el.dat &> /dev/null' )
             os.system( 'get_files -data TIDAdata-run3-lrt.dat &> /dev/null' )
             os.system( 'get_files -data TIDAdata-run3-minbias.dat &> /dev/null' )
+            os.system( 'get_files -data TIDAdata-run3-TnP.dat &> /dev/null' )
             os.system( 'get_files -data TIDAdata_cuts.dat &> /dev/null' )
             os.system( 'get_files -data TIDAdata-run3-offline.dat &> /dev/null' )
             os.system( 'get_files -data TIDAdata-run3-offline-rzMatcher.dat &> /dev/null' )

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_TnP.py

@@ -36,12 +36,12 @@ Release = "current"
 GridFiles = True
 preinclude_file = 'all:TrigInDetValidation/TIDV_cond_fix.py' #conditions fix for ATR-23982. In future find a more recent RDO 
 
-Jobs = [( "Truth",       " TIDAdata-run3.dat                        -o data-hists.root -p 11" ),
+Jobs = [( "Truth",       " TIDAdata-run3-TnP.dat                    -o data-hists.root -p 11" ),
         ( "Offline",     " TIDAdata-run3-offline-TnP.dat -r Offline -o data-hists-offline.root" )] 
  
-Comp = [( "L2ele",              "L2electron",      "data-hists.root",         " -c TIDAhisto-panel.dat      -d HLTL2-plots " ),
+Comp = [( "L2ele",              "L2electronTnP",      "data-hists.root",         " -c TIDAhisto-panel.dat      -d HLTL2-plots " ),
         ( "L2eleoffline",       "L2electronTnP",      "data-hists-offline.root", " -c TIDAhisto-panel-TnP.dat  -d HLTL2-plots-offline " ),
-        ( "EFele",              "EFelectron",      "data-hists.root",         " -c TIDAhisto-panel.dat      -d HLTEF-plots " ),
+        ( "EFele",              "EFelectronTnP",      "data-hists.root",         " -c TIDAhisto-panel.dat      -d HLTEF-plots " ),
         ( "EFeleoffline",       "EFelectronTnP",      "data-hists-offline.root", " -c TIDAhisto-panel-TnP.dat  -d HLTEF-plots-offline " ) ]