From e954031958675532f566f3e9b4529e5ce5de2ee7 Mon Sep 17 00:00:00 2001
From: Edward Moyse <Edward.Moyse@cern.ch>
Date: Mon, 21 Nov 2016 15:05:59 +0100
Subject: [PATCH] 'Enabling CaloRinger by default' (RecExConfig-00-03-75)
* Enabling CaloRinger by default
* tag RecExConfig-00-03-75
2016-11-18 Edward.Moyse@cern.ch
* RecFlags.py: Adding CaloRinger
* tag RecExConfig-00-03-73
2016-11-05 James Frost <james.frost@ cern.ch>
* python/AutoConfiguration.py - Fix beam energy settigns for hipXTeV project tags
* tag RecExConfig-00-03-72
2016-11-03 James Frost <james.frost@ cern.ch>
* python/AutoConfiguration.py - Add data16_hip, data16_hip5TeV, data16_hip8TeV to known Pb-p project tag.
* tag RecExConfig-00-03-71
---
.../RecExConfig/python/AutoConfiguration.py | 13 +++++++++----
.../RecExample/RecExConfig/python/RecFlags.py | 9 ++++++++-
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
index 76d0c48837b..2cb4053a143 100644
--- a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
+++ b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
@@ -42,7 +42,7 @@ KnownCollisionsProjects=frozenset(["data08","data08_coll900","data09","data09_co
KnownHeavyIonProjects=frozenset(["data10_hi","data11_hi","data15_hi","data16_hi"])
-KnownHeavyIonProtonProjects=frozenset(["data12_hip","data13_hip"])
+KnownHeavyIonProtonProjects=frozenset(["data12_hip","data13_hip","data16_hip","data16_hip5TeV","data16_hip8TeV"])
KnownTestProjects=frozenset(["data_test"])
@@ -439,9 +439,14 @@ def ConfigureBeamEnergy():
if 'GeV' in projectName:
beamEnergy = float( (str(projectName).split('_')[1]).replace('GeV','',1))/2 * 1000.
elif 'TeV' in projectName:
- beamEnergy = float( (str(projectName).split('_')[1]).replace('TeV','',1).replace('p','.'))/2 * 1000000.
- if '5TeV' in projectName:
- beamEnergy=2510000.
+ if 'hip5TeV' in projectName:
+ beamEnergy = 1577000.
+ elif 'hip8TeV' in projectName:
+ beamEnergy = 2510000.
+ else:
+ beamEnergy = float( (str(projectName).split('_')[1]).replace('TeV','',1).replace('p','.'))/2 * 1000000.
+ if '5TeV' in projectName:
+ beamEnergy=2510000.
elif projectName.endswith("_hi") or projectName.endswith("_hip"):
#beamEnergy=1380000. # 1.38 TeV (=3.5 TeV * (Z=82/A=208))
# Pb (p) beam energy in p-Pb collisions in 2011 will be 1.38 (3.5) TeV. sqrt(s_NN)=4.4 TeV
diff --git a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
index 6488a367a95..a81409c6f36 100755
--- a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
+++ b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
@@ -982,6 +982,13 @@ class doPersistencyOptimization(JobProperty):
allowedTypes=['bool']
StoredValue=True
+class doCaloRinger(JobProperty):
+ """ Enable ring-shaped calorimeter reconstruction
+ """
+ statusOn=True
+ allowedTypes=['bool']
+ StoredValue=True
+
#
# Defines a sub-container for the algorithm switches
#class RecAlgs(JobPropertyContainer):
@@ -1012,7 +1019,7 @@ doWriteAOD, doWritexAOD, doWriteESD, doWriteBS, doWriteRDO, doWriteTAG, doWriteT
readESD, doDetStatus, AMITag, AutoConfiguration, RunNumber, triggerStream, projectName, \
doInDet,doLArg,doTile,doCalo,doMuon,doForwardDet,doLucid,doZdc,doAlfa,doAFP,doFwdRegion,doJetMissingETTag,doEgamma,doMuonCombined,doTau,doFTK,doTrigger,doBTagging, Production, doPhysValMonHists, \
doHeavyIon, doHIP, doLowPt, doMinimalRec, noESDTrigger,doFileMetaData,ScopingLevel, Commissioning, oldRecExCommissionConfig, mergingStreamName, LCGCMTVersion, \
-AtlasReleaseVersion, inputFileFromAthenaVersion, doApplyAODFix, doAODSelect, doRDOTrigger, doFastPhysMonitoring, RootFastPhysMonOutput,doWriteCalibHits, doTriggerFilter, triggerFilterList, doContainerRemapping, doPhysicsValidationAugmentation, doESDReconstruction, doExpressProcessing,doPersistencyOptimization]
+AtlasReleaseVersion, inputFileFromAthenaVersion, doApplyAODFix, doAODSelect, doRDOTrigger, doFastPhysMonitoring, RootFastPhysMonOutput,doWriteCalibHits, doTriggerFilter, triggerFilterList, doContainerRemapping, doPhysicsValidationAugmentation, doESDReconstruction, doExpressProcessing, doPersistencyOptimization, doCaloRinger]
for j in _list_Rec:
jobproperties.Rec.add_JobProperty(j)
del _list_Rec
--
GitLab