From 5c5166884a02282591ca50cae3b6e0d53064998c Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Wed, 1 Jul 2020 08:56:55 +0200
Subject: [PATCH] Overlay: python3 compatible print functions
---
.../share/ConfiguredOverlay_jobOptions.py | 2 +-
.../share/Rt_override.py | 2 +-
.../share/Rt_override_BLKPA-006-05.py | 2 +-
.../share/Rt_override_BLKPA-006-11.py | 2 +-
.../Rt_override_COMCOND-BLKPA-RUN1-08.py | 10 +++----
.../Rt_override_CONDBR2-BLKPA-2015-12.py | 26 +++++++++----------
.../share/Rt_override_OFLCOND-MC15c-SDR-11.py | 14 +++++-----
.../share/Rt_override_OFLCOND-MC16-SDR-23.py | 26 +++++++++----------
.../share/Rt_override_OFLCOND-MC16-SDR-26.py | 20 +++++++-------
...verride_OFLCOND-MC16-SDR-26_folders100M.py | 26 +++++++++----------
.../share/Rt_override_OFLCOND-MC16-SDR-27.py | 20 +++++++-------
.../share/Rt_override_old.py | 2 +-
.../share/g4runnumber.py | 12 ++++-----
.../share/g4runnumber2.py | 2 +-
.../share/g4runnumber_override.py | 10 +++----
.../share/muAlign.py | 4 +--
.../share/muAlign_HI2018Pb_reco.py | 14 +++++-----
.../share/muAlign_HI_reco.py | 14 +++++-----
.../share/muAlign_reco.py | 14 +++++-----
.../share/muAlign_reco_old.py | 10 +++----
.../share/skeleton.BSOverlayFilter_tf.py | 6 ++---
.../share/skeleton.HITARMaker_tf.py | 4 +--
.../share/skeleton.OverlayBS_tf.py | 7 +++--
.../share/skeleton.OverlayPool_tf.py | 9 +++----
.../share/skeleton.Overlay_tf.py | 4 +--
25 files changed, 130 insertions(+), 132 deletions(-)
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/ConfiguredOverlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/ConfiguredOverlay_jobOptions.py
index c29e29758c9..c948168df05 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/ConfiguredOverlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/ConfiguredOverlay_jobOptions.py
@@ -28,7 +28,7 @@ from OverlayCommonAlgs.OverlayFlags import overlayFlags
pileUpEventLoopMgr = PileUpEventLoopMgr()
pileUpEventLoopMgr.OutStreamType = "AthenaOutputStream"
-print "================ DetFlags ================ "
+printfunc ("================ DetFlags ================ ")
DetFlags.Print()
if overlayFlags.isDataOverlay():
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py
index 36d7f964ebf..d4234c37dc3 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py
@@ -42,7 +42,7 @@ conddb.addFolderWithTag("LAR_ONL","/LAR/Align","LARAlign-Repro2011-00",force=Tru
conddb.blockFolder("/TRT/Align")
conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign_Collision_2009_04",force=True,forceData=True)
-print "Haas: RT OVERRIDE 4"
+printfunc ("Haas: RT OVERRIDE 4")
#from overlay_scripts/tagin.sh :
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py
index 950b4b2a2e0..a0d8c15c74a 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py
@@ -22,7 +22,7 @@ conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True)
###################################################
-print "Haas: RT OVERRIDE, for COMCOND-BLKPA-006-05"
+printfunc ("Haas: RT OVERRIDE, for COMCOND-BLKPA-006-05")
#use data TRT T0 constants
conddb.blockFolder("/TRT/Calib/T0")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py
index d63b8f74477..8c454ea831d 100755
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py
@@ -29,7 +29,7 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions
conddb.addOverride("/LAR/ElecCalibOfl/Shape/RTM/5samples1phase","LARElecCalibOflShapeRTM5samples1phase-UPD1-04")
###################################################
-print "Haas: RT OVERRIDE, for COMCOND-BLKPA-006-11"
+printfunc ("Haas: RT OVERRIDE, for COMCOND-BLKPA-006-11")
#See https://twiki.cern.ch/twiki/pub/AtlasComputing/ConditionsTagComCondBlkpa00611/checkDB_COMCOND-BLKPA-006-11-17.2.10.6.txt
#use data TRT T0 constants
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py
index a21651d3652..22b741ce72f 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py
@@ -19,14 +19,14 @@ conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True)
###################################################
-print "RT OVERRIDE, for CONDBR2-BLKPA-2015-12"
+printfunc ("RT OVERRIDE, for CONDBR2-BLKPA-2015-12")
#See https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=CONDBR2-BLKPA-2015-15#INDET
conddb.blockFolder("/MDT/T0BLOB")
conddb.addFolderWithTag("MDT_OFL","/MDT/T0BLOB","MDTT0-UPD4-13",force=True,forceData=True)
if not "EOJT_alignMC" in globals():
- print "EOJT_alignMC not found in globals(), so aligning ID to data conditions"
+ printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
conddb.blockFolder("/TRT/Align")
conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-BLK-UPD4-08",force=True,forceData=True)
conddb.blockFolder("/LAR/Align")
@@ -34,7 +34,7 @@ if not "EOJT_alignMC" in globals():
conddb.blockFolder("/Indet/Align")
conddb.addFolderWithTag("INDET_OFL","/Indet/Align","InDetAlign-BLK-UPD4-09",force=True,forceData=True)
else:
- print "EOJT_alignMC found in globals(), so aligning ID to MC conditions"
+ printfunc ("EOJT_alignMC found in globals(), so aligning ID to MC conditions")
conddb.blockFolder("/TRT/Align")
conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign_Nominal2",force=True,forceMC=True)
conddb.blockFolder("/LAR/Align")
@@ -48,7 +48,7 @@ else:
#to run overlay chain with trigger
if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (hasattr(recAlgs,'doTrigger') and recAlgs.doTrigger() and DetFlags.LVL1_on()):
- print "running with trigger"
+ printfunc ("running with trigger" )
conddb.blockFolder("/PIXEL/HLT/DCS/HV")
conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-RUN2-UPD1-00",force=True,forceData=True)
conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
@@ -56,7 +56,7 @@ if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (has
conddb.addOverride("/GLOBAL/Onl/TrigBTagCalib/RUN12","TrigBTagCalibRUN12Onl-08-10")
conddb.addOverride("/GLOBAL/Onl/BTagCalib/RUN12","BTagCalibRUN12Onl-08-15")
else:
- print "running wint no trig "
+ printfunc ("running wint no trig ")
conddb.blockFolder("/PIXEL/DCS/HV")
conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/HV","PixDCSHV-SIM-RUN1-000-00",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/PixReco")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
index 6fccf1fddff..3291f18a6c8 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
@@ -23,7 +23,7 @@ conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True)
###################################################
-print "RT OVERRIDE, for CONDBR2-BLKPA-2015-12"
+printfunc ("RT OVERRIDE, for CONDBR2-BLKPA-2015-12")
#See https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=CONDBR2-BLKPA-2015-15#INDET
###These are not really needed anymore during overlay. Setup in muAlign_reco.py for reco.
@@ -43,7 +43,7 @@ print "RT OVERRIDE, for CONDBR2-BLKPA-2015-12"
#conddb.addFolderWithTag("MDT_OFL","/MDT/T0BLOB","MDTT0-RUN2-UPD4-15",force=True,forceData=True)
if not "EOJT_alignMC" in globals():
- print "EOJT_alignMC not found in globals(), so aligning ID to data conditions"
+ printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
#conddb.blockFolder("/TRT/Align")
#conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-10",force=True,forceData=True)
#conddb.blockFolder("/LAR/Align")
@@ -51,7 +51,7 @@ if not "EOJT_alignMC" in globals():
#conddb.blockFolder("/Indet/Align")
#conddb.addFolderWithTag("INDET_OFL","/Indet/Align","InDetAlign-RUN2-BLK-UPD4-13",force=True,forceData=True)
else:
- print "EOJT_alignMC found in globals(), so aligning ID to MC conditions"
+ printfunc ("EOJT_alignMC found in globals(), so aligning ID to MC conditions")
conddb.blockFolder("/TRT/Align")
conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign_Nominal2",force=True,forceMC=True)
conddb.blockFolder("/LAR/Align")
@@ -67,10 +67,10 @@ conddb.addOverride("/GLOBAL/Onl/BTagCalib/RUN12","BTagCalibRUN12Onl-08-18")
#to run overlay chain with trigger
if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (hasattr(recAlgs,'doTrigger') and recAlgs.doTrigger() and DetFlags.LVL1_on()):
- print "running with trigger "
+ printfunc ("running with trigger " )
conddb.addOverride("/GLOBAL/Onl/TrigBTagCalib/RUN12","TrigBTagCalibRUN12Onl-08-10")
else:
- print "running with no trigger "
+ printfunc ("running with no trigger ")
if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
@@ -79,7 +79,7 @@ conddb.blockFolder("/PIXEL/PixdEdx")
conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN1-000-02",force=True,forceMC=True)
mcIDoverlay=False
if mcIDoverlay:
- print "ACH777: Using MC overlay Lorentz DB settings"
+ printfunc ("ACH777: Using MC overlay Lorentz DB settings")
conddb.blockFolder("/PIXEL/DCS/HV")
conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/HV","PixDCSHV-SIM-RUN1-000-00",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/DCS/TEMPERATURE")
@@ -90,7 +90,7 @@ if mcIDoverlay:
conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/MODTEMP","SctDcsModtemp-Apr10-01",force=True,forceMC=True)
mcIDoverlay2=False
if mcIDoverlay2:
- print "ACH777: Using more MC overlay ID DB settings"
+ printfunc ("ACH777: Using more MC overlay ID DB settings")
conddb.blockFolder("/Indet/PixelDist")
conddb.addFolderWithTag("INDET_OFL","/Indet/PixelDist","InDetPixelDist-nominal",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/PixelClustering/PixelClusNNCalib")
@@ -128,13 +128,13 @@ conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",
dofolderoverrides = True
if dofolderoverrides:
- print "ACH - overriding folder access patterns"
+ printfunc ("ACH - overriding folder access patterns")
conddb.dumpFolderTags('myconddb.txt',True)
overlaylongfolders = []
def adjustlongfolder(name):
if conddb.folderRequested(name):
- print "setting "+name+" to 100000000s cache"
+ printfunc ("setting "+name+" to 100000000s cache")
conddb.addMarkup(name,"<cache>100000000</cache>")
global overlaylongfolders
overlaylongfolders += [name]
@@ -230,18 +230,18 @@ if dofolderoverrides:
adjustlongfolder("/RPC/TRIGGER/CM_THR_PHI")
adjustlongfolder("/TRT/AlignL2")
-print "overlaylongfolders: ", overlaylongfolders
+printfunc ("overlaylongfolders: " + str(overlaylongfolders))
def adjustshortfolder(name):
global overlaylongfolders
if name in overlaylongfolders:
- print "already made "+name+" long"
+ printfunc ("already made "+name+" long")
else:
if conddb.folderRequested(name):
- print "setting "+name+" to 10s cache"
+ printfunc ("setting "+name+" to 10s cache")
conddb.addMarkup(name,"<cache>10</cache>")
else:
- print "folder "+name+" was not requested?!"
+ printfunc ("folder "+name+" was not requested?!")
if dofolderoverrides:
with open("myconddb.txt") as f:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py
index c22bc410e3c..6c4d4cf047e 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py
@@ -23,7 +23,7 @@ conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True)
###################################################
-print "RT OVERRIDE, for CONDBR2-BLKPA-2015-12"
+printfunc ("RT OVERRIDE, for CONDBR2-BLKPA-2015-12")
#See https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=CONDBR2-BLKPA-2015-15#INDET
###These are not really needed anymore during overlay. Setup in muAlign_reco.py for reco.
@@ -43,7 +43,7 @@ print "RT OVERRIDE, for CONDBR2-BLKPA-2015-12"
#conddb.addFolderWithTag("MDT_OFL","/MDT/T0BLOB","MDTT0-RUN2-UPD4-15",force=True,forceData=True)
if not "EOJT_alignMC" in globals():
- print "EOJT_alignMC not found in globals(), so aligning ID to data conditions"
+ printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
#conddb.blockFolder("/TRT/Align")
#conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-10",force=True,forceData=True)
#conddb.blockFolder("/LAR/Align")
@@ -51,7 +51,7 @@ if not "EOJT_alignMC" in globals():
#conddb.blockFolder("/Indet/Align")
#conddb.addFolderWithTag("INDET_OFL","/Indet/Align","InDetAlign-RUN2-BLK-UPD4-13",force=True,forceData=True)
else:
- print "EOJT_alignMC found in globals(), so aligning ID to MC conditions"
+ printfunc ("EOJT_alignMC found in globals(), so aligning ID to MC conditions")
conddb.blockFolder("/TRT/Align")
conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign_Nominal2",force=True,forceMC=True)
conddb.blockFolder("/LAR/Align")
@@ -65,7 +65,7 @@ else:
#to run overlay chain with trigger
if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (hasattr(recAlgs,'doTrigger') and recAlgs.doTrigger() and DetFlags.LVL1_on()):
- print "running with trigger "
+ printfunc ("running with trigger " )
conddb.blockFolder("/PIXEL/HLT/DCS/HV")
conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-RUN2-UPD1-00",force=True,forceData=True)
conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
@@ -73,7 +73,7 @@ if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (has
conddb.addOverride("/GLOBAL/Onl/TrigBTagCalib/RUN12","TrigBTagCalibRUN12Onl-08-10")
conddb.addOverride("/GLOBAL/Onl/BTagCalib/RUN12","BTagCalibRUN12Onl-08-15")
else:
- print "running with no trigger "
+ printfunc ("running with no trigger ")
if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
@@ -82,7 +82,7 @@ conddb.blockFolder("/PIXEL/PixdEdx")
conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
mcIDoverlay=False
if mcIDoverlay:
- print "ACH777: Using MC overlay Lorentz DB settings"
+ printfunc ("ACH777: Using MC overlay Lorentz DB settings")
conddb.blockFolder("/PIXEL/DCS/HV")
conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/HV","PixDCSHV-SIM-RUN1-000-00",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/DCS/TEMPERATURE")
@@ -93,7 +93,7 @@ if mcIDoverlay:
conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/MODTEMP","SctDcsModtemp-Apr10-01",force=True,forceMC=True)
mcIDoverlay2=False
if mcIDoverlay2:
- print "ACH777: Using more MC overlay ID DB settings"
+ printfunc ("ACH777: Using more MC overlay ID DB settings")
conddb.blockFolder("/Indet/PixelDist")
conddb.addFolderWithTag("INDET_OFL","/Indet/PixelDist","InDetPixelDist-nominal",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/PixelClustering/PixelClusNNCalib")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
index a1973217dfb..c6571cc2ed0 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
@@ -24,7 +24,7 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions
###################################################
-print "RT OVERRIDE, for OFLCOND-MC16-SDR-23 "
+printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-23 ")
#See https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=OFLCOND-MC16-SDR-23
# https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=CONDBR2-BLKPA-2017-14
@@ -36,7 +36,7 @@ conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
if not "EOJT_alignMC" in globals():
- print "EOJT_alignMC not found in globals(), so aligning ID to data conditions"
+ printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
#conddb.blockFolder("/TRT/Align")
#conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-10",force=True,forceData=True)
#conddb.blockFolder("/LAR/Align")
@@ -44,7 +44,7 @@ if not "EOJT_alignMC" in globals():
#conddb.blockFolder("/Indet/Align")
#conddb.addFolderWithTag("INDET_OFL","/Indet/Align","InDetAlign-RUN2-BLK-UPD4-13",force=True,forceData=True)
else:
- print "EOJT_alignMC found in globals(), so aligning ID to MC conditions"
+ printfunc ("EOJT_alignMC found in globals(), so aligning ID to MC conditions")
conddb.blockFolder("/TRT/Align")
conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-13",force=True,forceMC=True)
conddb.blockFolder("/LAR/Align")
@@ -58,10 +58,10 @@ else:
#to run overlay chain with trigger
if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (hasattr(recAlgs,'doTrigger') and recAlgs.doTrigger() and DetFlags.LVL1_on()):
- print "running with trigger "
+ printfunc ("running with trigger " )
conddb.addOverride("/GLOBAL/Onl/BTagCalib/RUN12","BTagCalibRUN12Onl-08-40")
else:
- print "running with no trigger "
+ printfunc ("running with no trigger ")
if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
@@ -70,7 +70,7 @@ conddb.blockFolder("/PIXEL/PixdEdx")
conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
mcIDoverlay=False
if mcIDoverlay:
- print "ACH777: Using MC overlay Lorentz DB settings"
+ printfunc ("ACH777: Using MC overlay Lorentz DB settings")
conddb.blockFolder("/PIXEL/DCS/HV")
conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/HV","PixDCSHV-SIM-MC16a-000-04",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/DCS/TEMPERATURE")
@@ -81,7 +81,7 @@ if mcIDoverlay:
conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/MODTEMP","SctDcsModtemp-MC16",force=True,forceMC=True)
mcIDoverlay2=False
if mcIDoverlay2:
- print "ACH777: Using more MC overlay ID DB settings"
+ printfunc ("ACH777: Using more MC overlay ID DB settings")
conddb.blockFolder("/Indet/PixelDist")
conddb.addFolderWithTag("INDET_OFL","/Indet/PixelDist","InDetPixelDist-nominal",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/PixelClustering/PixelClusNNCalib")
@@ -119,13 +119,13 @@ conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",
dofolderoverrides = True
if dofolderoverrides:
- print "ACH - overriding folder access patterns"
+ printfunc ("ACH - overriding folder access patterns")
conddb.dumpFolderTags('myconddb.txt',True)
overlaylongfolders = []
def adjustlongfolder(name):
if conddb.folderRequested(name):
- print "setting "+name+" to 100000000s cache"
+ printfunc ("setting "+name+" to 100000000s cache")
conddb.addMarkup(name,"<cache>100000000</cache>")
global overlaylongfolders
overlaylongfolders += [name]
@@ -221,18 +221,18 @@ if dofolderoverrides:
adjustlongfolder("/RPC/TRIGGER/CM_THR_PHI")
adjustlongfolder("/TRT/AlignL2")
-print "overlaylongfolders: ", overlaylongfolders
+printfunc ("overlaylongfolders: " + str(overlaylongfolders))
def adjustshortfolder(name):
global overlaylongfolders
if name in overlaylongfolders:
- print "already made "+name+" long"
+ printfunc ("already made "+name+" long")
else:
if conddb.folderRequested(name):
- print "setting "+name+" to 10s cache"
+ printfunc ("setting "+name+" to 10s cache")
conddb.addMarkup(name,"<cache>10</cache>")
else:
- print "folder "+name+" was not requested?!"
+ printfunc ("folder "+name+" was not requested?!")
if dofolderoverrides:
with open("myconddb.txt") as f:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py
index cd16b80b4eb..6d5f585a29f 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py
@@ -24,7 +24,7 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions
###################################################
-print "RT OVERRIDE, for OFLCOND-MC16-SDR-26 MC condition tag "
+printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-26 MC condition tag ")
#See https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=OFLCOND-MC16-SDR-26
# https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=CONDBR2-BLKPA-2018-12
@@ -36,7 +36,7 @@ conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
if not "EOJT_alignMC" in globals():
- print "EOJT_alignMC not found in globals(), so aligning ID to data conditions"
+ printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
#conddb.blockFolder("/TRT/Align")
#conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-10",force=True,forceData=True)
#conddb.blockFolder("/LAR/Align")
@@ -44,7 +44,7 @@ if not "EOJT_alignMC" in globals():
#conddb.blockFolder("/Indet/Align")
#conddb.addFolderWithTag("INDET_OFL","/Indet/Align","InDetAlign-RUN2-BLK-UPD4-13",force=True,forceData=True)
else:
- print "EOJT_alignMC found in globals(), so aligning ID to MC conditions"
+ printfunc ("EOJT_alignMC found in globals(), so aligning ID to MC conditions")
conddb.blockFolder("/TRT/Align")
conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-13",force=True,forceMC=True)
conddb.blockFolder("/LAR/Align")
@@ -58,10 +58,10 @@ else:
#to run overlay chain with trigger
if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (hasattr(recAlgs,'doTrigger') and recAlgs.doTrigger() and DetFlags.LVL1_on()):
- print "running with trigger "
+ printfunc ("running with trigger " )
conddb.addOverride("/GLOBAL/Onl/BTagCalib/RUN12","BTagCalibRUN12Onl-08-40")
else:
- print "running with no trigger "
+ printfunc ("running with no trigger ")
if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
@@ -70,7 +70,7 @@ conddb.blockFolder("/PIXEL/PixdEdx")
conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
mcIDoverlay=False
if mcIDoverlay:
- print "ACH777: Using MC overlay Lorentz DB settings"
+ printfunc ("ACH777: Using MC overlay Lorentz DB settings")
conddb.blockFolder("/PIXEL/DCS/HV")
conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/HV","PixDCSHV-SIM-MC16-000-07",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/DCS/TEMPERATURE")
@@ -81,7 +81,7 @@ if mcIDoverlay:
conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/MODTEMP","SctDcsModtemp-MC16",force=True,forceMC=True)
mcIDoverlay2=False
if mcIDoverlay2:
- print "ACH777: Using more MC overlay ID DB settings"
+ printfunc ("ACH777: Using more MC overlay ID DB settings")
conddb.blockFolder("/Indet/PixelDist")
conddb.addFolderWithTag("INDET_OFL","/Indet/PixelDist","InDetPixelDist-nominal",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/PixelClustering/PixelClusNNCalib")
@@ -113,13 +113,13 @@ dofolderoverrides = True
runN=365681
lumiBlock=500
if dofolderoverrides:
- print "ACH - overriding folder access patterns"
+ printfunc ("ACH - overriding folder access patterns")
conddb.dumpFolderTags('myconddb.txt',True)
overlaylongfolders = []
def setrunforfolder(name):
if conddb.folderRequested(name):
- print "setting run to "+str(runN)+" and lumiblock "+str(lumiBlock)
+ printfunc ("setting run to "+str(runN)+" and lumiblock "+str(lumiBlock))
frnTag="<forceRunNumber>"+str(runN)+"</forceRunNumber>"
flbTag="<forceLumiblockNumber>"+str(lumiBlock)+"</forceLumiblockNumber>"
conddb.addMarkup(name,frnTag)
@@ -218,7 +218,7 @@ if dofolderoverrides:
setrunforfolder("/RPC/TRIGGER/CM_THR_PHI")
setrunforfolder("/TRT/AlignL2")
-print "set run "+str(runN)+" and lumiblock "+str(lumiBlock)+" for folders: ", overlaylongfolders
+printfunc ("set run "+str(runN)+" and lumiblock "+str(lumiBlock)+" for folders: "+str(overlaylongfolders))
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py
index 7e3e95d177e..2528e1be931 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py
@@ -24,7 +24,7 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions
###################################################
-print "RT OVERRIDE, for OFLCOND-MC16-SDR-26 "
+printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-26 ")
#See https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=OFLCOND-MC16-SDR-26
# https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=CONDBR2-BLKPA-2018-12
@@ -36,7 +36,7 @@ conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
if not "EOJT_alignMC" in globals():
- print "EOJT_alignMC not found in globals(), so aligning ID to data conditions"
+ printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
#conddb.blockFolder("/TRT/Align")
#conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-10",force=True,forceData=True)
#conddb.blockFolder("/LAR/Align")
@@ -44,7 +44,7 @@ if not "EOJT_alignMC" in globals():
#conddb.blockFolder("/Indet/Align")
#conddb.addFolderWithTag("INDET_OFL","/Indet/Align","InDetAlign-RUN2-BLK-UPD4-13",force=True,forceData=True)
else:
- print "EOJT_alignMC found in globals(), so aligning ID to MC conditions"
+ printfunc ("EOJT_alignMC found in globals(), so aligning ID to MC conditions")
conddb.blockFolder("/TRT/Align")
conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-13",force=True,forceMC=True)
conddb.blockFolder("/LAR/Align")
@@ -58,10 +58,10 @@ else:
#to run overlay chain with trigger
if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (hasattr(recAlgs,'doTrigger') and recAlgs.doTrigger() and DetFlags.LVL1_on()):
- print "running with trigger "
+ printfunc ("running with trigger " )
conddb.addOverride("/GLOBAL/Onl/BTagCalib/RUN12","BTagCalibRUN12Onl-08-40")
else:
- print "running with no trigger "
+ printfunc ("running with no trigger ")
if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
@@ -70,7 +70,7 @@ conddb.blockFolder("/PIXEL/PixdEdx")
conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
mcIDoverlay=False
if mcIDoverlay:
- print "ACH777: Using MC overlay Lorentz DB settings"
+ printfunc ("ACH777: Using MC overlay Lorentz DB settings")
conddb.blockFolder("/PIXEL/DCS/HV")
conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/HV","PixDCSHV-SIM-MC16a-000-07",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/DCS/TEMPERATURE")
@@ -81,7 +81,7 @@ if mcIDoverlay:
conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/MODTEMP","SctDcsModtemp-MC16",force=True,forceMC=True)
mcIDoverlay2=False
if mcIDoverlay2:
- print "ACH777: Using more MC overlay ID DB settings"
+ printfunc ("ACH777: Using more MC overlay ID DB settings")
conddb.blockFolder("/Indet/PixelDist")
conddb.addFolderWithTag("INDET_OFL","/Indet/PixelDist","InDetPixelDist-nominal",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/PixelClustering/PixelClusNNCalib")
@@ -109,13 +109,13 @@ conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",
dofolderoverrides = True
if dofolderoverrides:
- print "ACH - overriding folder access patterns"
+ printfunc ("ACH - overriding folder access patterns")
conddb.dumpFolderTags('myconddb.txt',True)
overlaylongfolders = []
def adjustlongfolder(name):
if conddb.folderRequested(name):
- print "setting "+name+" to 100000000s cache"
+ printfunc ("setting "+name+" to 100000000s cache")
conddb.addMarkup(name,"<cache>100000000</cache>")
global overlaylongfolders
overlaylongfolders += [name]
@@ -211,18 +211,18 @@ if dofolderoverrides:
adjustlongfolder("/RPC/TRIGGER/CM_THR_PHI")
adjustlongfolder("/TRT/AlignL2")
-print "overlaylongfolders: ", overlaylongfolders
+printfunc ("overlaylongfolders: " + str(overlaylongfolders))
def adjustshortfolder(name):
global overlaylongfolders
if name in overlaylongfolders:
- print "already made "+name+" long"
+ printfunc ("already made "+name+" long")
else:
if conddb.folderRequested(name):
- print "setting "+name+" to 10s cache"
+ printfunc ("setting "+name+" to 10s cache")
conddb.addMarkup(name,"<cache>10</cache>")
else:
- print "folder "+name+" was not requested?!"
+ printfunc ("folder "+name+" was not requested?!")
if dofolderoverrides:
with open("myconddb.txt") as f:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py
index 02c0049a63a..0d98f7c41cf 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py
@@ -24,7 +24,7 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions
###################################################
-print "RT OVERRIDE, for OFLCOND-MC16-SDR-27 MC condition tag "
+printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-27 MC condition tag ")
#See https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/ConditionsTagOflCondMc16Sdr27
# https://atlas-tagservices.cern.ch/tagservices/RunBrowser/runBrowserReport/rBR_CB_Report.php?CBAction=GlobalTagReport&cbgt=CONDBR2-BLKPA-2018-12
@@ -36,9 +36,9 @@ conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
if not "EOJT_alignMC" in globals():
- print "EOJT_alignMC not found in globals(), so aligning ID to data conditions"
+ printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
else:
- print "EOJT_alignMC found in globals(), so aligning ID to MC conditions"
+ printfunc ("EOJT_alignMC found in globals(), so aligning ID to MC conditions")
conddb.blockFolder("/TRT/Align")
conddb.addFolderWithTag("TRT_OFL","/TRT/Align","TRTAlign-RUN2-BLK-UPD4-13",force=True,forceMC=True)
conddb.blockFolder("/LAR/Align")
@@ -52,10 +52,10 @@ else:
#to run overlay chain with trigger
if (hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE") or (hasattr(recAlgs,'doTrigger') and recAlgs.doTrigger() and DetFlags.LVL1_on()):
- print "running with trigger "
+ printfunc ("running with trigger " )
conddb.addOverride("/GLOBAL/Onl/BTagCalib/RUN12","BTagCalibRUN12Onl-08-40")
else:
- print "running with no trigger "
+ printfunc ("running with no trigger ")
if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
@@ -64,7 +64,7 @@ conddb.blockFolder("/PIXEL/PixdEdx")
conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
mcIDoverlay=True
if mcIDoverlay:
- print "ACH777: Using MC overlay Lorentz DB settings"
+ printfunc ("ACH777: Using MC overlay Lorentz DB settings")
conddb.blockFolder("/PIXEL/DCS/HV")
conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/HV","PixDCSHV-SIM-MC16-000-07",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/DCS/TEMPERATURE")
@@ -75,7 +75,7 @@ if mcIDoverlay:
conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/MODTEMP","SctDcsModtemp-MC16-02",force=True,forceMC=True)
mcIDoverlay2=True
if mcIDoverlay2:
- print "ACH777: Using more MC overlay ID DB settings"
+ printfunc ("ACH777: Using more MC overlay ID DB settings")
conddb.blockFolder("/Indet/PixelDist")
conddb.addFolderWithTag("INDET_OFL","/Indet/PixelDist","InDetPixelDist-nominal",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/PixelClustering/PixelClusNNCalib")
@@ -109,13 +109,13 @@ dofolderoverrides = True
runN=365681
lumiBlock=500
if dofolderoverrides:
- print "ACH - overriding folder access patterns"
+ printfunc ("ACH - overriding folder access patterns")
conddb.dumpFolderTags('myconddb.txt',True)
overlaylongfolders = []
def setrunforfolder(name):
if conddb.folderRequested(name):
- print "setting run to "+str(runN)+" and lumiblock "+str(lumiBlock)
+ printfunc ("setting run to "+str(runN)+" and lumiblock "+str(lumiBlock))
frnTag="<forceRunNumber>"+str(runN)+"</forceRunNumber>"
flbTag="<forceLumiblockNumber>"+str(lumiBlock)+"</forceLumiblockNumber>"
conddb.addMarkup(name,frnTag)
@@ -214,4 +214,4 @@ if dofolderoverrides:
setrunforfolder("/RPC/TRIGGER/CM_THR_PHI")
setrunforfolder("/TRT/AlignL2")
-print "set run "+str(runN)+" and lumiblock "+str(lumiBlock)+" for folders: ", overlaylongfolders
+printfunc ("set run "+str(runN)+" and lumiblock "+str(lumiBlock)+" for folders: "+str(overlaylongfolders))
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py
index 7dcffcd2a23..f33089ffb70 100755
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py
@@ -25,7 +25,7 @@ conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True)
###################################################
-print "Haas: RT OVERRIDE, old conditions (from Rt_override.py)"
+printfunc ("Haas: RT OVERRIDE, old conditions (from Rt_override.py)")
#See https://twiki.cern.ch/twiki/pub/AtlasComputing/ConditionsTagComCondBlkpa00611/checkDB_COMCOND-BLKPA-006-11-17.2.10.6.txt
#use data TRT T0 constants
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber.py b/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber.py
index 5e4b1177e03..81b3ce7be9c 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber.py
@@ -6,7 +6,7 @@ if not hasattr(svcMgr,'EvtIdModifierSvc'):
from AthenaCommon.AppMgr import theApp
theApp.CreateSvc += ["EvtIdModifierSvc"]
else:
- print 'g4runnumber.py: Will override the settings of the EvtIdModifierSvc that was previously set up!'
+ printfunc ('g4runnumber.py: Will override the settings of the EvtIdModifierSvc that was previously set up!')
## remove any existing settings
svcMgr.EvtIdModifierSvc.Modifiers = []
svcMgr.EvtIdModifierSvc.OutputLevel=DEBUG
@@ -20,10 +20,10 @@ fname=overlayFlags.EventIDTextFile()
#fname=runArgs.inputTXT_EVENTIDFile[0]
if fname == None:
- print 'g4runnumber.py: No eventID file provided!'
+ printfunc ('g4runnumber.py: No eventID file provided!')
raise RuntimeError
-print "fname ", fname
+printfunc ("fname " + fname)
include(fname)
@@ -32,8 +32,8 @@ num_lines = 0
with open(fname, 'r') as f:
for line in f:
num_lines += 1
- print line,
-print "Number of lines in TXT_EVENTID is "+str(num_lines)
+ printfunc (line, end = '')
+printfunc ("Number of lines in TXT_EVENTID is "+str(num_lines))
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
athenaCommonFlags.EvtMax.unlock()
athenaCommonFlags.EvtMax.set_Value_and_Lock(num_lines)
@@ -49,6 +49,6 @@ if not hasattr(ServiceMgr.ToolSvc, 'IOVDbMetaDataTool'):
svcMgr.EventSelector.RunNumber = svcMgr.EvtIdModifierSvc.Modifiers[0]
svcMgr.EventSelector.OverrideRunNumber = True
svcMgr.EventSelector.InitialTimeStamp = svcMgr.EvtIdModifierSvc.Modifiers[2]
-print svcMgr.EventSelector
+printfunc (svcMgr.EventSelector)
svcMgr.TagInfoMgr.OutputLevel=DEBUG
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber2.py b/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber2.py
index 6aef66f38c9..eb86683b822 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber2.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber2.py
@@ -6,7 +6,7 @@ num_lines = 0
with open(fname, 'r') as f:
for line in f:
num_lines += 1
-print "Number of lines in events.txt is "+str(num_lines)
+printfunc ("Number of lines in events.txt is "+str(num_lines))
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
athenaCommonFlags.EvtMax.unlock()
athenaCommonFlags.EvtMax.set_Value_and_Lock(num_lines)
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber_override.py b/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber_override.py
index fe155af16e2..293c2471a25 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber_override.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/g4runnumber_override.py
@@ -8,7 +8,7 @@ myCommand = 'dumpRunNumber.py EVNT.*'
import commands, re
sc,out = commands.getstatusoutput(myCommand)
if sc != 0:
- print 'ERR: problem:\n%s',str(out)
+ printfunc ('ERR: problem:\n' + str(out))
raise SystemExit(sc)
myOutput = '0'
for l in out.splitlines():
@@ -22,8 +22,8 @@ for l in out.splitlines():
ServiceMgr.EventSelector.RunNumber=digitizationFlags.simRunNumber.get_Value()
# pileUpEventLoopMgr.mcRunNumber=digitizationFlags.simRunNumber.get_Value()
else :
- print "Failed to find Run Number in hits file metadata."
+ printfunc ("Failed to find Run Number in hits file metadata.")
-print "simRunNumber: "
-print ServiceMgr.EventSelector
-print pileUpEventLoopMgr
+printfunc ("simRunNumber: ")
+printfunc (ServiceMgr.EventSelector)
+printfunc (pileUpEventLoopMgr)
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign.py b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign.py
index f9f8b67e79a..d740757bf58 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign.py
@@ -2,7 +2,7 @@
haas_mualign2=True
if haas_mualign2:
#use muon alignments
- print "Haas: Reading muon alignment constants from DB"
+ printfunc ("Haas: Reading muon alignment constants from DB")
from AthenaCommon.AlgSequence import AthSequencer
@@ -19,7 +19,7 @@ if haas_mualign2:
MuonDetectorTool.OutputLevel=DEBUG
MuonDetectorTool.EnableFineClashFixing = 1 #this should be on for g4?
- print MuonDetectorTool
+ printfunc (MuonDetectorTool)
#register callbacks for alignments, to get IOVs?
#GeoModelSvc.AlignCallbacks = True
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI2018Pb_reco.py b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI2018Pb_reco.py
index 186ded4dc27..d5d6354dadc 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI2018Pb_reco.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI2018Pb_reco.py
@@ -1,21 +1,21 @@
#use muon alignments
-print "Haas: Reading muon alignment constants from DB for reco"
+printfunc ("Haas: Reading muon alignment constants from DB for reco")
from IOVDbSvc.CondDB import conddb
#MGM_AlignmentDbTool = ToolSvc.MGM_AlignmentDbTool
#MGM_AlignmentDbTool.OutputLevel=DEBUG
-#print MGM_AlignmentDbTool
+#printfunc (MGM_AlignmentDbTool)
from AtlasGeoModel.MuonGM import GeoModelSvc
MuonDetectorTool = GeoModelSvc.DetectorTools[ "MuonDetectorTool" ]
MuonDetectorTool.UseConditionDb = 1
#MuonDetectorTool.OutputLevel=DEBUG
MuonDetectorTool.EnableFineClashFixing = 0 #this should be on for g4?
-#print MuonDetectorTool
-#print GeoModelSvc
-#print ToolSvc
+#printfunc (MuonDetectorTool)
+#printfunc (GeoModelSvc)
+#printfunc (ToolSvc)
#Now use MC T0 for TRT during overlay digi, but MC or data T0/Rt during reco, depending on where digit came from... so this stuff is just for reco
conddb.blockFolder("/TRT/Calib/MC/RT")
@@ -33,11 +33,11 @@ ToolSvc.InDetTRT_DriftFunctionTool.IsOverlay=True
ToolSvc.InDetTRT_DriftFunctionTool.TRTCalDbTool2=TRTMCCalibDBTool
if "EOJT_noLorentz" in globals():
- print "EOJT_noLorentz found in globals(), so not doing Lorentz corrections"
+ printfunc ("EOJT_noLorentz found in globals(), so not doing Lorentz corrections")
svcMgr.PixelSiliconConditionsSvc.ForceUseGeoModel=True
svcMgr.PixelSiliconConditionsSvc.CheckGeoModel=True
svcMgr.PixelSiliconConditionsSvc.UseDBForHV=False
svcMgr.PixelLorentzAngleSvc.usePixelDefaults=True
else:
- print "EOJT_noLorentz not found in globals(), so doing standard Lorentz corrections"
+ printfunc ("EOJT_noLorentz not found in globals(), so doing standard Lorentz corrections")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI_reco.py b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI_reco.py
index 5950e92ead5..5aadae526e6 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI_reco.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_HI_reco.py
@@ -1,6 +1,6 @@
#use muon alignments
-print "Haas: Reading muon alignment constants from DB for reco"
+printfunc ("Haas: Reading muon alignment constants from DB for reco")
from IOVDbSvc.CondDB import conddb
#conddb.addFolderSplitOnline('MUONALIGN','/MUONALIGN/Onl/MDT/BARREL','/MUONALIGN/MDT/BARREL')
@@ -20,16 +20,16 @@ from IOVDbSvc.CondDB import conddb
#ToolSvc += MuonAlignmentDbTool
MGM_AlignmentDbTool = ToolSvc.MGM_AlignmentDbTool
#MGM_AlignmentDbTool.OutputLevel=DEBUG
-#print MGM_AlignmentDbTool
+#printfunc (MGM_AlignmentDbTool)
from AtlasGeoModel.MuonGM import GeoModelSvc
MuonDetectorTool = GeoModelSvc.DetectorTools[ "MuonDetectorTool" ]
MuonDetectorTool.UseConditionDb = 1
#MuonDetectorTool.OutputLevel=DEBUG
MuonDetectorTool.EnableFineClashFixing = 0 #this should be on for g4?
-#print MuonDetectorTool
-#print GeoModelSvc
-#print ToolSvc
+#printfunc (MuonDetectorTool)
+#printfunc (GeoModelSvc)
+#printfunc (ToolSvc)
#Now use MC T0 for TRT during overlay digi, but MC or data T0/Rt during reco, depending on where digit came from... so this stuff is just for reco:
#conddb.blockFolder("/TRT/Calib/MCRT")
@@ -64,11 +64,11 @@ ToolSvc.InDetTRT_DriftFunctionTool.IsOverlay=True
ToolSvc.InDetTRT_DriftFunctionTool.TRTCalDbTool2=TRTMCCalibDBTool
if "EOJT_noLorentz" in globals():
- print "EOJT_noLorentz found in globals(), so not doing Lorentz corrections"
+ printfunc ("EOJT_noLorentz found in globals(), so not doing Lorentz corrections")
svcMgr.PixelSiliconConditionsSvc.ForceUseGeoModel=True
svcMgr.PixelSiliconConditionsSvc.CheckGeoModel=True
svcMgr.PixelSiliconConditionsSvc.UseDBForHV=False
svcMgr.PixelLorentzAngleSvc.usePixelDefaults=True
else:
- print "EOJT_noLorentz not found in globals(), so doing standard Lorentz corrections"
+ printfunc ("EOJT_noLorentz not found in globals(), so doing standard Lorentz corrections")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_reco.py b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_reco.py
index f28c5efe53e..62046a320a5 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_reco.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_reco.py
@@ -1,6 +1,6 @@
#use muon alignments
-print "Haas: Reading muon alignment constants from DB for reco"
+printfunc ("Haas: Reading muon alignment constants from DB for reco")
from IOVDbSvc.CondDB import conddb
#conddb.addFolderSplitOnline('MUONALIGN','/MUONALIGN/Onl/MDT/BARREL','/MUONALIGN/MDT/BARREL')
@@ -20,16 +20,16 @@ from IOVDbSvc.CondDB import conddb
#ToolSvc += MuonAlignmentDbTool
#MGM_AlignmentDbTool = ToolSvc.MGM_AlignmentDbTool
#MGM_AlignmentDbTool.OutputLevel=DEBUG
-#print MGM_AlignmentDbTool
+#printfunc (MGM_AlignmentDbTool)
from AtlasGeoModel.MuonGM import GeoModelSvc
MuonDetectorTool = GeoModelSvc.DetectorTools[ "MuonDetectorTool" ]
MuonDetectorTool.UseConditionDb = 1
#MuonDetectorTool.OutputLevel=DEBUG
MuonDetectorTool.EnableFineClashFixing = 0 #this should be on for g4?
-#print MuonDetectorTool
-#print GeoModelSvc
-#print ToolSvc
+#printfunc (MuonDetectorTool)
+#printfunc (GeoModelSvc)
+#printfunc (ToolSvc)
#Now use MC T0 for TRT during overlay digi, but MC or data T0/Rt during reco, depending on where digit came from... so this stuff is just for reco:
#conddb.blockFolder("/TRT/Calib/MCRT")
@@ -61,11 +61,11 @@ ToolSvc.InDetTRT_DriftFunctionTool.IsOverlay=True
ToolSvc.InDetTRT_DriftFunctionTool.TRTCalDbTool2=TRTMCCalibDBTool
if "EOJT_noLorentz" in globals():
- print "EOJT_noLorentz found in globals(), so not doing Lorentz corrections"
+ printfunc ("EOJT_noLorentz found in globals(), so not doing Lorentz corrections")
svcMgr.PixelSiliconConditionsSvc.ForceUseGeoModel=True
svcMgr.PixelSiliconConditionsSvc.CheckGeoModel=True
svcMgr.PixelSiliconConditionsSvc.UseDBForHV=False
svcMgr.PixelLorentzAngleSvc.usePixelDefaults=True
else:
- print "EOJT_noLorentz not found in globals(), so doing standard Lorentz corrections"
+ printfunc ("EOJT_noLorentz not found in globals(), so doing standard Lorentz corrections")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_reco_old.py b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_reco_old.py
index 2581be54896..58b6ee28584 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_reco_old.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/muAlign_reco_old.py
@@ -1,6 +1,6 @@
#use muon alignments
-print "Haas: Reading muon alignment constants from DB for reco"
+printfunc ("Haas: Reading muon alignment constants from DB for reco")
#from IOVDbSvc.CondDB import conddb
#conddb.addFolderSplitOnline('MUONALIGN','/MUONALIGN/Onl/MDT/BARREL','/MUONALIGN/MDT/BARREL')
@@ -20,15 +20,15 @@ print "Haas: Reading muon alignment constants from DB for reco"
#ToolSvc += MuonAlignmentDbTool
#MGM_AlignmentDbTool = ToolSvc.MGM_AlignmentDbTool
#MGM_AlignmentDbTool.OutputLevel=DEBUG
-#print MGM_AlignmentDbTool
+#printfunc (MGM_AlignmentDbTool)
from AtlasGeoModel.MuonGM import GeoModelSvc
MuonDetectorTool = GeoModelSvc.DetectorTools[ "MuonDetectorTool" ]
MuonDetectorTool.UseConditionDb = 1
MuonDetectorTool.OutputLevel=DEBUG
MuonDetectorTool.EnableFineClashFixing = 0 #this should be on for g4?
-print MuonDetectorTool
-print GeoModelSvc
-print ToolSvc
+printfunc (MuonDetectorTool)
+printfunc (GeoModelSvc)
+printfunc (ToolSvc)
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
index 36e11a18f86..d3bca8642c6 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
@@ -42,7 +42,7 @@ if hasattr( runArgs, 'inputZeroBiasBSFile'):
svcMgr.EventSelector.Input=runArgs.inputZeroBiasBSFile
else:
svcMgr.EventSelector.Input=runArgs.inputBS_SKIMFile
-print ByteStreamInputSvc
+printfunc (ByteStreamInputSvc)
# ---------------------------
# Service to write out BS events
@@ -56,7 +56,7 @@ for n in range(0,runArgs.noutputs):
else: myn=str(n)
bsOutputSvc=ByteStreamEventStorageOutputSvc("BSESOutputSvc"+myn,OutputDirectory='./',SimpleFileName=getattr(runArgs,"outputBS_TRIGSKIM"+myn+"File"))
svcMgr += bsOutputSvc
- print bsOutputSvc
+ printfunc (bsOutputSvc)
# ---------------------------
BSFilterLog.info( '**** ByteStreamFilter configuration' )
@@ -130,7 +130,7 @@ topSequence += OutputStreamBSCopy
OutputStreamBSCopy.AcceptAlgs =["BSFilter"]
-print topSequence
+printfunc (topSequence)
# ---------------------------
# Post-include/exec
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.HITARMaker_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.HITARMaker_tf.py
index a197f98ea79..b79d27b4f83 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.HITARMaker_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.HITARMaker_tf.py
@@ -30,11 +30,11 @@ with open(runArgs.InputLbnMapFile) as f:
for line in f:
if line=='': break
filenm=line.rstrip()
- print filenm
+ printfunc (filenm)
finfo=filenm.split(" ")
run=finfo[3].replace(",","")
lbn=finfo[5].replace(",","").zfill(4) #pad 44->0044
- print run+"_"+lbn
+ printfunc (run+"_"+lbn)
#copy the corresponding filter/vtx_run_lbn.data.txt files from EOS to here
#runArgs.HIfiltervtxdirectory=/eos/atlas/atlascerngroupdisk/phys-hi/DataOverlay2015
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayBS_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayBS_tf.py
index 66db657a8af..4ec68792b02 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayBS_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayBS_tf.py
@@ -122,7 +122,7 @@ if hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE":
cfg = TriggerConfigGetter("HIT2RDO")
-print "================ DetFlags ================ "
+printfunc ("================ DetFlags ================ ")
if 'DetFlags' in dir():
overlaylog.warning("DetFlags already defined! This means DetFlags should have been fully configured already..")
else:
@@ -207,7 +207,7 @@ if hasattr(runArgs,"WriteRDOFileMetaData"):
writeDigitizationMetadata()
#================================================================
-print "overlay_trf: final outStream = ", outStream
+printfunc ("overlay_trf: final outStream = " + str(outStream))
#================================================================
# Logging
@@ -232,5 +232,4 @@ if hasattr(runArgs, "postExec") and runArgs.postExec != 'NONE':
for cmd in runArgs.postExec:
exec(cmd)
-#print "OverlayBS_tf.py: at the end. job=\n", job
-print "\nOverlayBS_tf.py: at the end. ServiceMgr=\n", ServiceMgr
+printfunc ("\nOverlayBS_tf.py: at the end. ServiceMgr=\n" + str(ServiceMgr))
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py
index dd10af929b6..adc45fed413 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py
@@ -61,7 +61,7 @@ rec.projectName = 'IS_SIMULATION'
DataInputCollections=runArgs.inputRDO_BKGFile
athenaCommonFlags.PoolRDOInput=runArgs.inputRDO_BKGFile
-print "================ DetFlags ================ "
+printfunc ("================ DetFlags ================ ")
if 'DetFlags' in dir():
overlaylog.warning("DetFlags already defined! This means DetFlags should have been fully configured already..")
else:
@@ -135,7 +135,7 @@ if hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE":
cfg = TriggerConfigGetter("HIT2RDO")
-print "================ Start ================= "
+printfunc ("================ Start ================= ")
from AthenaCommon.AlgSequence import AlgSequence
topSeq = AlgSequence()
## Set Overall per-Algorithm time-limit on the AlgSequence
@@ -189,7 +189,7 @@ digitizationFlags.rndmSeedList.printSeeds()
#================================================================
-print "overlay_trf: final outStream = ", outStream
+printfunc ("overlay_trf: final outStream = " + str(outStream))
#================================================================
# Logging
@@ -217,5 +217,4 @@ if hasattr(runArgs, 'AMITag'):
if runArgs.AMITag != "NONE":
ServiceMgr.TagInfoMgr.ExtraTagValuePairs.update({"AMITag" : runArgs.AMITag})
-#print "OverlayPool_tf.py: at the end. job=\n", job
-print "\nOverlayPool_tf.py: at the end. ServiceMgr=\n", ServiceMgr
+printfunc ("\nOverlayPool_tf.py: at the end. ServiceMgr=\n" + str(ServiceMgr))
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py
index 6f15fd2bf6a..5900f11b765 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py
@@ -239,5 +239,5 @@ if hasattr(runArgs, 'AMITag'):
ServiceMgr.TagInfoMgr.ExtraTagValuePairs.update({"AMITag" : runArgs.AMITag})
#================================================================
-print "\nOverlay: OutputStream = \n", outStream
-print "\nOverlay: ServiceMgr = \n", ServiceMgr
+OverlayLog.info("\nOverlay: OutputStream = \n" + str(outStream))
+OverlayLog.info("\nOverlay: ServiceMgr = \n" + str(ServiceMgr))
--
GitLab