Skip to content
Snippets Groups Projects
Commit 33eea3a8 authored by Edward Moyse's avatar Edward Moyse Committed by Atlas Nightlybuild
Browse files

Merge branch 'py3.MuonEfficiencyCorrections-20200312' into 'master'

MuonEfficiencyCorrections: Python 3 fixes

See merge request atlas/athena!31095

(cherry picked from commit 5f365d59)

a7f8bf05 MuonEfficiencyCorrections: Python 3 fixes
parent 0ff9af10
No related branches found
No related tags found
28 merge requests!76035Updated rel21 number,!63304adding missing electron iso WPs (Tight_VarRad, Loose_VarRad, TightTrackOnly_VarRad),!62053Merge branch 'sh_xrd_warning' into 'master',!61521fix maxPVrefit,!59663fixed a typo in HIGG8D1 format (followup of https://gitlab.cern.ch/atlas/athena/-/merge_requests/59575),!50754Return TruthTaus from truth matching tool in SUSY tools,!48850Added new HDBS derivation (HDBS3),!46643Draft:Adding MET Significance in AT,!46320Draft: Adding support for Leading3SignalJets strategy,!45689Bug fix: Use wrong vector to calculate largest bin number in findBin(),!45211Update in the FFJetSmearingTool,!44864Draft: WIP- MuonUncorrelateSystematics,!43718Modification of EXOT17.py for fractionally charged particle search,!40581Fix crash in egamma topocluster decorator,!37848Add TrigRingerRings to EGAM3, EGAM4 and EGAM9,!36766Truth class fallback max dr,!35816Add HardScatterParticles into the EXOT8 Derivation,!35273Fix JETM1: add back TruthEvents,!34244WIP: 21.2 topq1 add rc jets 2020 06 27,!34182Merge new MCTruthClassifier developments into master,!34164Use allMuons instead oc combinedOnly for BPHY15,!33109Add delta-R to nearest VR track jet decoration,!33012Adding Prompt Lepton Improved Veto to TOPQ,!32637WIP: Add tracks in R=0.4 jets to STDM11,!32353WIP: Fix rare bug in jet smearing RNG seed,!32051Fix of compilation warnings in CPAnalysisExamples,!31361WIP: AnalysisTop Update - New Muon Isolation WPs included,!31148Sweeping !31095 from master to 21.2. MuonEfficiencyCorrections: Python 3 fixes
Pipeline #1483757 passed
......@@ -8,7 +8,7 @@ def AssembleIO(stream="TRIGGERSFTESTER"):
# Reduce the event loop spam a bit
#--------------------------------------------------------------
if os.path.exists("%s/athfile-cache.ascii.gz" % (os.getcwd())):
print "INFO: Old athfile-cache found. Will delete it otherwise athena just freaks out. This little boy"
print ("INFO: Old athfile-cache found. Will delete it otherwise athena just freaks out. This little boy")
os.system("rm %s/athfile-cache.ascii.gz" % (os.getcwd()))
from GaudiSvc.GaudiSvcConf import THistSvc
from AthenaCommon.JobProperties import jobproperties
......@@ -25,12 +25,12 @@ def AssembleIO(stream="TRIGGERSFTESTER"):
ROOTFiles = []
if "inputFile" in globals():
print "Use the following %s as input" % (inputFile)
print ("Use the following %s as input" % (inputFile))
ROOTFiles = []
ResolvedInFile = PathResolver.FindCalibFile(inputFile)
ReolvedInDir = PathResolver.FindCalibDirectory(inputFile)
if os.path.isfile(ResolvedInFile):
print "INFO: Found file %s"%(inputFile)
print ("INFO: Found file %s"%(inputFile))
ROOTFiles.append(ResolvedInFile)
elif os.path.isdir(ReolvedInDir):
......@@ -44,10 +44,10 @@ def AssembleIO(stream="TRIGGERSFTESTER"):
acf.FilesInput = ROOTFiles
if "nevents" in globals():
print "Only run on %i events" % (int(nevents))
print ("Only run on %i events" % (int(nevents)))
theApp.EvtMax = int (nevents)
if "nskip" in globals():
print "Skip the first %i events" % (int(nskip))
print ("Skip the first %i events" % (int(nskip)))
ServiceMgr.EventSelector.SkipEvents = int(nksip)
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#!/usr/bin/env python
import os
......@@ -15,7 +15,7 @@ elif os.path.isdir('input'):
inputFiles += ['input/%s' %(f)]
else:
print 'Missing input files - OK for pathena'
printfunc ('Missing input files - OK for pathena')
#------------------------------------------------------------------------------
def getMuonTriggers():
......@@ -70,7 +70,7 @@ from AthenaCommon.AppMgr import ServiceMgr
import AthenaPoolCnvSvc.ReadAthenaPool
ServiceMgr.EventSelector.InputCollections = inputFiles
print ServiceMgr.EventSelector.InputCollections
printfunc (ServiceMgr.EventSelector.InputCollections)
if 'EvtMax' in dir():
theApp.EvtMax = EvtMax
......
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