Skip to content
Snippets Groups Projects
Commit d16a39fd authored by James Beacham's avatar James Beacham Committed by Atlas Nightlybuild
Browse files

Merge branch 'referenceCoherentNoise' into '21.0'

LArMonTools modified to be able to set the output file name from JO

See merge request atlas/athena!16010

(cherry picked from commit 40178cfc [formerly 72230d76aa83d198c7c50c2906c33b0dd58770f6])

50ef29f1 LArMonTools modified to be able to set the output file name from JO

Former-commit-id: fa7fe8b8781d8c8870b4096c4c958da74a420b1c
parent 2fa8ae3e
No related branches found
No related tags found
No related merge requests found
rootHisto="RootHistos"
if 'OutName' in dir():
rootHisto='RootHistos_%(stuff)s' % {"stuff" : OutName}
if not online:
if not runAccumulator:
if not 'RootHistOutputFileName' in dir():
if Type == 'Delay':
RootHistOutputFileName='%(dir)s/RootHistos_%(No)d_Wave_avg_%(partition)s.root' % {"dir" : OutputDir, "No" : RunNumber, "partition" : Partition}
RootHistOutputFileName='%(dir)s/%(rootHisto)s_%(No)d_Wave_avg_%(partition)s.root' % {"dir" : OutputDir, "rootHisto" : rootHisto, "No" : RunNumber, "partition" : Partition}
elif Type == 'Pedestal':
RootHistOutputFileName='%(dir)s/RootHistos_%(No)d_%(Type)s_%(partition)s.root' % {"dir" : OutputDir, "No" : RunNumber, "Type" : Type, "partition" : Partition}
RootHistOutputFileName='%(dir)s/%(rootHisto)s_%(No)d_%(Type)s_%(partition)s.root' % {"dir" : OutputDir, "rootHisto" : rootHisto, "No" : RunNumber, "Type" : Type, "partition" : Partition}
elif Type == 'Cosmic':
RootHistOutputFileName='%(dir)s/RootHistos_%(No)d_%(Type)s.root' % {"dir" : OutputDir, "No" : RunNumber, "Type" : Type}
RootHistOutputFileName='%(dir)s/%(rootHisto)s_%(No)d_%(Type)s.root' % {"dir" : OutputDir, "rootHisto" : rootHisto, "No" : RunNumber, "Type" : Type}
else:
RootHistOutputFileName='%(dir)s/RootHistos_%(No)d_%(Type)s_avg_%(partition)s.root' % {"dir" : OutputDir, "No" : RunNumber, "Type" : Type, "partition" : Partition}
RootHistOutputFileName='%(dir)s/%(rootHisto)s_%(No)d_%(Type)s_avg_%(partition)s.root' % {"dir" : OutputDir, "rootHisto" : rootHisto, "No" : RunNumber, "Type" : Type, "partition" : Partition}
if Type == "Pedestal":
if not 'RootHistReferenceFileName' in dir():
RootHistReferenceFileName='%(dir)s/RootHistos_%(No)d_%(Type)s_%(partition)s.root' % {"dir" : OutputDir, "No" : RefRunNumber, "Type" : Type, "partition" : Partition}
......@@ -21,19 +27,19 @@ if not online:
else:
if Type == 'Delay':
if not 'RootHistOutputFileName' in dir():
RootHistOutputFileName = '%(dir)s/RootHistos_%(No)d_%Wave_trans_%(partition)s.root' % {"dir" : OutputDir, "No" : RunNumber, "Type" : Type, "partition" : Partition}
RootHistOutputFileName = '%(dir)s/%(rootHisto)s_%(No)d_%Wave_trans_%(partition)s.root' % {"dir" : OutputDir, "rootHisto" : rootHisto, "No" : RunNumber, "Type" : Type, "partition" : Partition}
if not 'DelayOutputFile' in dir():
DelayOutputFile = '%(dir)s/RootHistos_%(No)d_%(Type)s_trans_%(partition)s.root' % {"dir" : OutputNtupleDir, "No" : RunNumber, "Type" : Type, "partition" : Partition}
elif Type == 'Pedestal':
if not 'RootHistOutputFileName' in dir():
RootHistOutputFileName='%(dir)s/RootHistos_%(No)d_%(Type)s_%(partition)s.root' % {"dir" : OutputDir, "No" : RunNumber, "Type" : Type, "partition" : Partition}
RootHistOutputFileName='%(dir)s/%(rootHisto)s_%(No)d_%(Type)s_%(partition)s.root' % {"dir" : OutputDir, "rootHisto" : rootHisto, "No" : RunNumber, "Type" : Type, "partition" : Partition}
if not 'RootHistReferenceFileName' in dir():
RootHistReferenceFileName='%(dir)s/RootHistos_%(No)d_%(Type)s_%(partition)s.root' % {"dir" : OutputDir, "No" : RefRunNumber, "Type" : Type, "partition" : Partition}
elif Type == 'Cosmic':
if not 'RootHistOutputFileName' in dir():
RootHistOutputFileName='%(dir)s/RootHistos_%(No)d_%(Type)s.root' % {"dir" : OutputDir, "No" : RunNumber, "Type" : Type}
RootHistOutputFileName='%(dir)s/%(rootHisto)s_%(No)d_%(Type)s.root' % {"dir" : OutputDir, "rootHisto" : rootHisto, "No" : RunNumber, "Type" : Type}
if not 'RootHistReferenceFileName' in dir():
RootHistReferenceFileName='%(dir)s/RootHistos_%(No)d_%(Type)s.root' % {"dir" : OutputDir, "No" : RefRunNumber, "Type" : Type}
else:
if not 'RootHistOutputFileName' in dir():
RootHistOutputFileName='%(dir)s/RootHistos_%(No)d_%(Type)s_trans_%(partition)s.root' % {"dir" : OutputDir, "No" : RunNumber, "Type" : Type, "partition" : Partition}
RootHistOutputFileName='%(dir)s/%(rootHisto)s_%(No)d_%(Type)s_trans_%(partition)s.root' % {"dir" : OutputDir, "rootHisto" : rootHisto, "No" : RunNumber, "Type" : Type, "partition" : Partition}
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