diff --git a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
index 890b55ebf82ff5232d58a15b8b34853c2be3e5f6..e003e70f5c3171758a92302547dc88b93a6a62b2 100644
--- a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
+++ b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
@@ -442,20 +442,29 @@ def ConfigureBeamEnergy():
                     beamEnergy = float( (str(projectName).split('_')[1]).replace('GeV','',1))/2 * 1000.
                 elif 'TeV' in projectName:
                     if 'hip5TeV' in projectName:
+                        # Approximate 'beam energy' here as sqrt(sNN)/2.
                         beamEnergy = 1577000.
                     elif 'hip8TeV' in projectName:
+                        # Approximate 'beam energy' here as sqrt(sNN)/2.
                         beamEnergy = 2510000.
                     else:
                         beamEnergy = float( (str(projectName).split('_')[1]).replace('TeV','',1).replace('p','.'))/2 * 1000000.
                         if '5TeV' in projectName:
+                            # these are actually sqrt(s) = 5.02 TeV
                             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  
-                    #beamEnergy=1577000. # 1.577 TeV (=4 TeV * (Z=82/A=208))
-                    # Pb (p) Beam energy in p-Pb collisions in 2012 will be 1.577 (4) TeV.
-                    #beamEnergy=2510000. # 2.51 TeV (=6.37 TeV * (Z=82/A=208)) - lowered to 6.37 to match s_NN = 5.02 for earlier Pb-p runs.
-                    beamEnergy=2721000. # 2.72 TeV for Xe-Xe (=6.5 TeV * (Z=54/A=129))
+                    if projectName in ('data10_hi', 'data11_hi'):
+                        beamEnergy=1380000. # 1.38 TeV (=3.5 TeV * (Z=82/A=208))
+                    elif projectName == 'data12_hi':
+                        beamEnergy=1577000. # 1.577 TeV (=4 TeV * (Z=82/A=208))
+                    elif projectName in ('data12_hip', 'data13_hip'):
+                        # Pb (p) Beam energy in p-Pb collisions in 2012/3 was 1.577 (4) TeV.
+                        # Approximate 'beam energy' here as sqrt(sNN)/2.
+                        beamEnergy=2510000.
+                    elif projectName in ('data15_hi', 'data18_hi'):
+                        beamEnergy=2510000. # 2.51 TeV (=6.37 TeV * (Z=82/A=208)) - lowered to 6.37 to match s_NN = 5.02 in Pb-p runs.
+                    elif projectName == 'data17_hi':
+                        beamEnergy=2721000. # 2.72 TeV for Xe-Xe (=6.5 TeV * (Z=54/A=129))
                 else:
                     logAutoConfiguration.warning("Could not auto-configure beam energy based on project name: %s" , projectName)
                     return