diff --git a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py index 76d0c48837be2368cbc543cb07063015408306fb..2cb4053a1433fae2bc39219620d6f57d39af12e9 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 6488a367a95a841fefa93887304338ad9bd34e1b..a81409c6f36d89852ae70e48cde3a13c1e1f19a8 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