diff --git a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/scripts/mergePhysValFiles.py b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/scripts/mergePhysValFiles.py index e2f85a19aadd8eab36112abf57071cef98867ac8..f145147ef7c01342343fd176f0cff58549be11c1 100644 --- a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/scripts/mergePhysValFiles.py +++ b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/scripts/mergePhysValFiles.py @@ -12,7 +12,7 @@ from __future__ import print_function import getopt,os,sys,glob,argparse,ROOT,time from ROOT import gDirectory -start = time.clock() +start = time.process_time() # define the categories (= sub-folders) categories = ['jet', @@ -271,5 +271,5 @@ if len(errors)>0: for phrase in errors: print(phrase) -end = time.clock() +end = time.process_time() print("Wall time used: %s sec" % (end - start)) diff --git a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/BTaggingValidationPlots.cxx b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/BTaggingValidationPlots.cxx index 4c365de471882af84fb69c4005819302019d988f..9f29e26bfdb7632aae3a72180f4e194f6fdb156c 100644 --- a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/BTaggingValidationPlots.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/BTaggingValidationPlots.cxx @@ -873,6 +873,8 @@ namespace JetTagDQA{ // check if there is a muon and store the relative muon pT bool has_muon = false; + //temporary fix to avoid the validation code to crash (SoftMu is turned off in FTAG code at the moment) + /* ElementLink<xAOD::MuonContainer> muonLink; // muon link doesn't work on the VR track jets atm (it will be structured differently in r22 anyways. Properly update it later for all collections.) if(m_sParticleType != "antiKtVR30Rmax4Rmin02PV0TrackJets"){ @@ -886,6 +888,7 @@ namespace JetTagDQA{ m_muon_pT_frac->Fill(muon_pT_frac, event->beamSpotWeight()); } } + */ // fill contains_muon for the caller of this function contains_muon = has_muon; }