From 423cdf7c095d0cadab4ae2f5f8b5e55135441897 Mon Sep 17 00:00:00 2001
From: Herbert Greenlee <greenlee@fnal.gov>
Date: Tue, 24 Oct 2017 20:19:44 -0500
Subject: [PATCH 1/3] Update root version.

---
 ups/larlite.table | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ups/larlite.table b/ups/larlite.table
index 57bbb2ec9..066fdc199 100644
--- a/ups/larlite.table
+++ b/ups/larlite.table
@@ -15,7 +15,7 @@ Qualifiers = "e14:prof"
     fileTest( ${${UPS_PROD_NAME_UC}_FQ_DIR}, -d, "${${UPS_PROD_NAME_UC}_FQ_DIR} directory not found: SETUP ABORTED")
 
   Action = GetProducts
-    setupRequired( root v6_08_06g -q +e14:+nu:+prof )
+    setupRequired( root v6_10_04d -q +e14:+nu:+prof )
 
 Flavor     = ANY
 Qualifiers = "e14:debug"
@@ -29,7 +29,7 @@ Qualifiers = "e14:debug"
     fileTest( ${${UPS_PROD_NAME_UC}_FQ_DIR}, -d, "${${UPS_PROD_NAME_UC}_FQ_DIR} directory not found: SETUP ABORTED")
 
   Action = GetProducts
-    setupRequired( root v6_08_06g -q +e14:+nu:+debug )
+    setupRequired( root v6_10_04d -q +e14:+nu:+debug )
 
 Flavor     = ANY
 Qualifiers = "e14:opt"
@@ -43,7 +43,7 @@ Qualifiers = "e14:opt"
     fileTest( ${${UPS_PROD_NAME_UC}_FQ_DIR}, -d, "${${UPS_PROD_NAME_UC}_FQ_DIR} directory not found: SETUP ABORTED")
 
   Action = GetProducts
-    setupRequired( root v6_08_06g -q +e14:+nu:+opt )
+    setupRequired( root v6_10_04d -q +e14:+nu:+opt )
 
 Flavor     = ANY
 Qualifiers = "e10:prof"

From bdd34e5587cd9a2850be9bd2b38c7868ca479c8f Mon Sep 17 00:00:00 2001
From: Herbert Greenlee <greenlee@fnal.gov>
Date: Fri, 2 Feb 2018 10:24:21 -0600
Subject: [PATCH 2/3] Add support for e15 qualifier.

---
 ups/larlite.table | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/ups/larlite.table b/ups/larlite.table
index 066fdc199..a0b6bfc5c 100644
--- a/ups/larlite.table
+++ b/ups/larlite.table
@@ -3,6 +3,48 @@ Product=larlite
  
 Group:
 
+Flavor     = ANY
+Qualifiers = "e15:prof"
+
+  Action = GetFQDir
+    if ( printenv CET_SUBDIR > /dev/null )
+      envSet( ${UPS_PROD_NAME_UC}_FQ_DIR, ${${UPS_PROD_NAME_UC}_DIR}/${CET_SUBDIR}.e15.prof )
+    else()
+      envSet( ${UPS_PROD_NAME_UC}_FQ_DIR, ${${UPS_PROD_NAME_UC}_DIR}/`get-directory-name subdir`.e15.prof )
+    endif ( printenv CET_SUBDIR > /dev/null )
+    fileTest( ${${UPS_PROD_NAME_UC}_FQ_DIR}, -d, "${${UPS_PROD_NAME_UC}_FQ_DIR} directory not found: SETUP ABORTED")
+
+  Action = GetProducts
+    setupRequired( root v6_10_08b -q +e15:+nu:+prof )
+
+Flavor     = ANY
+Qualifiers = "e15:debug"
+
+  Action = GetFQDir
+    if ( printenv CET_SUBDIR > /dev/null )
+      envSet( ${UPS_PROD_NAME_UC}_FQ_DIR, ${${UPS_PROD_NAME_UC}_DIR}/${CET_SUBDIR}.e15.debug )
+    else()
+      envSet( ${UPS_PROD_NAME_UC}_FQ_DIR, ${${UPS_PROD_NAME_UC}_DIR}/`get-directory-name subdir`.e15.debug )
+    endif ( printenv CET_SUBDIR > /dev/null )
+    fileTest( ${${UPS_PROD_NAME_UC}_FQ_DIR}, -d, "${${UPS_PROD_NAME_UC}_FQ_DIR} directory not found: SETUP ABORTED")
+
+  Action = GetProducts
+    setupRequired( root v6_10_08b -q +e15:+nu:+debug )
+
+Flavor     = ANY
+Qualifiers = "e15:opt"
+
+  Action = GetFQDir
+    if ( printenv CET_SUBDIR > /dev/null )
+      envSet( ${UPS_PROD_NAME_UC}_FQ_DIR, ${${UPS_PROD_NAME_UC}_DIR}/${CET_SUBDIR}.e15.opt )
+    else()
+      envSet( ${UPS_PROD_NAME_UC}_FQ_DIR, ${${UPS_PROD_NAME_UC}_DIR}/`get-directory-name subdir`.e15.opt )
+    endif ( printenv CET_SUBDIR > /dev/null )
+    fileTest( ${${UPS_PROD_NAME_UC}_FQ_DIR}, -d, "${${UPS_PROD_NAME_UC}_FQ_DIR} directory not found: SETUP ABORTED")
+
+  Action = GetProducts
+    setupRequired( root v6_10_08b -q +e15:+nu:+opt )
+
 Flavor     = ANY
 Qualifiers = "e14:prof"
 

From 6ead8b3ed103ec0e322864c15ef006e91d2a3a11 Mon Sep 17 00:00:00 2001
From: Herbert Greenlee <greenlee@fnal.gov>
Date: Fri, 2 Feb 2018 10:34:46 -0600
Subject: [PATCH 3/3] Update e14 root version.

---
 ups/larlite.table | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ups/larlite.table b/ups/larlite.table
index a0b6bfc5c..b75333f6d 100644
--- a/ups/larlite.table
+++ b/ups/larlite.table
@@ -57,7 +57,7 @@ Qualifiers = "e14:prof"
     fileTest( ${${UPS_PROD_NAME_UC}_FQ_DIR}, -d, "${${UPS_PROD_NAME_UC}_FQ_DIR} directory not found: SETUP ABORTED")
 
   Action = GetProducts
-    setupRequired( root v6_10_04d -q +e14:+nu:+prof )
+    setupRequired( root v6_10_08b -q +e14:+nu:+prof )
 
 Flavor     = ANY
 Qualifiers = "e14:debug"
@@ -71,7 +71,7 @@ Qualifiers = "e14:debug"
     fileTest( ${${UPS_PROD_NAME_UC}_FQ_DIR}, -d, "${${UPS_PROD_NAME_UC}_FQ_DIR} directory not found: SETUP ABORTED")
 
   Action = GetProducts
-    setupRequired( root v6_10_04d -q +e14:+nu:+debug )
+    setupRequired( root v6_10_08b -q +e14:+nu:+debug )
 
 Flavor     = ANY
 Qualifiers = "e14:opt"
@@ -85,7 +85,7 @@ Qualifiers = "e14:opt"
     fileTest( ${${UPS_PROD_NAME_UC}_FQ_DIR}, -d, "${${UPS_PROD_NAME_UC}_FQ_DIR} directory not found: SETUP ABORTED")
 
   Action = GetProducts
-    setupRequired( root v6_10_04d -q +e14:+nu:+opt )
+    setupRequired( root v6_10_08b -q +e14:+nu:+opt )
 
 Flavor     = ANY
 Qualifiers = "e10:prof"