Modified recon launch tag recon-2017_01-ver03 using same procedure as

with split of sim-recon.

src/SBMS/SConstruct.plugin

@@ -5,7 +5,7 @@
 # This SConstruct file can be copied into a directory containing
 # the source for a plugin and used to compile it. It will use and
 # install into the directory specified by the HALLD_MY environment
-# variable if defined. Otherwise, it will install in the HALLD_HOME
+# variable if defined. Otherwise, it will install in the HALLD_RECON_HOME
 # directory.
 #
 # This file should not need modification. It will be copied in by
@@ -29,13 +29,13 @@ import sys
 import subprocess
 import glob
 
-# Get HALLD_HOME environment variable, verifying it is set
-halld_home = os.getenv('HALLD_HOME')
+# Get HALLD_RECON_HOME environment variable, verifying it is set
+halld_home = os.getenv('HALLD_RECON_HOME')
 if(halld_home == None):
-	print 'HALLD_HOME environment variable not set!'
+	print 'HALLD_RECON_HOME environment variable not set!'
 	exit(-1)
 
-# Get HALLD_MY if it exists. Otherwise use HALLD_HOME
+# Get HALLD_MY if it exists. Otherwise use HALLD_RECON_HOME
 halld_my = os.getenv('HALLD_MY', halld_home)
 
 # Add SBMS directory to PYTHONPATH
@@ -61,7 +61,7 @@ lib = "%s/lib" % (installdir)
 plugins = "%s/plugins" % (installdir)
 env = Environment(        ENV = os.environ,  # Bring in full environment, including PATH
                       CPPPATH = [include],
-                      LIBPATH = ["%s/%s/lib" %(halld_home, osname)],  # n.b. add HALLD_HOME here and prepend HALLD_MY below
+                      LIBPATH = ["%s/%s/lib" %(halld_home, osname)],  # n.b. add HALLD_RECON_HOME here and prepend HALLD_MY below
                   variant_dir = ".%s" % (osname))
 
 # Only add HALLD_MY library search path if it already exists
@@ -99,7 +99,7 @@ env.Replace( CXX = os.getenv('CXX', 'g++'),
              CC  = os.getenv('CC' , 'gcc'),
              FC  = os.getenv('FC' , 'gfortran') )
 
-# Add local directory, directories from HALLD_MY and HALLD_HOME to include search path
+# Add local directory, directories from HALLD_MY and HALLD_RECON_HOME to include search path
 #env.PrependUnique(CPPPATH = ['#'])
 env.PrependUnique(CPPPATH = ['%s/src' % halld_my, '%s/src/libraries' % halld_my, '%s/src/libraries/include' % halld_my])
 env.PrependUnique(CPPPATH = ['%s/src' % halld_home, '%s/src/libraries' % halld_home, '%s/src/libraries/include' % halld_home])

src/SBMS/sbms.py

@@ -1038,7 +1038,7 @@ def AddAmpTools(env):
 		print 'is not set. Expect to see an error message below....'
 		print ''
 	else:
-		env.AppendUnique(CUDAFLAGS=['-I%s -I%s/src/libraries' % (AMPTOOLS, os.getenv('HALLD_HOME',os.getcwd()))])
+		env.AppendUnique(CUDAFLAGS=['-I%s -I%s/src/libraries' % (AMPTOOLS, os.getenv('HALLD_RECON_HOME',os.getcwd()))])
 		AddCUDA(env)
 		AMPTOOLS_CPPPATH = "%s" % (AMPTOOLS)
 		AMPTOOLS_LIBPATH = "%s/lib" % (AMPTOOLS)
@@ -1070,7 +1070,7 @@ def AddAmpPlotter(env):
 ##################################
 def AddCobrems(env):
 	pyincludes = subprocess.Popen(["python-config", "--includes" ], stdout=subprocess.PIPE).communicate()[0]
-	cobrems_home = os.getenv('HALLD_HOME', 'sim-recon')
+	cobrems_home = os.getenv('HALLD_RECON_HOME', 'halld_recon')
 	env.AppendUnique(CPPPATH = ["%s/src/libraries/AMPTOOLS_MCGEN" % (cobrems_home)])
 	env.AppendUnique(LIBPATH = ["%s/%s/lib" % (cobrems_home, env['OSNAME'])])
 	env.AppendUnique(LIBS    = 'AMPTOOLS_MCGEN')

src/SBMS/sbms_setenv.py

@@ -97,13 +97,13 @@ def mk_setenv_csh(env):
 
 	# HALLD
 	str += '# HALLD\n'
-	str += 'setenv HALLD_HOME %s\n' % halld_home
+	str += 'setenv HALLD_RECON_HOME %s\n' % halld_home
 	str += 'setenv BMS_OSNAME %s\n' % env['OSNAME']
-	str += 'setenv PATH ${HALLD_HOME}/${BMS_OSNAME}/bin:${PATH}\n'
-	str += 'setenv JANA_PLUGIN_PATH ${HALLD_HOME}/${BMS_OSNAME}/plugins:${JANA_PLUGIN_PATH}\n'
+	str += 'setenv PATH ${HALLD_RECON_HOME}/${BMS_OSNAME}/bin:${PATH}\n'
+	str += 'setenv JANA_PLUGIN_PATH ${HALLD_RECON_HOME}/${BMS_OSNAME}/plugins:${JANA_PLUGIN_PATH}\n'
 	# python support
-	str += 'setenv %s ${HALLD_HOME}/${BMS_OSNAME}/lib:${%s}\n' %(LDLPV, LDLPV)
-	str += 'setenv PYTHONPATH ${HALLD_HOME}/${BMS_OSNAME}/lib/python:${PYTHONPATH}\n'
+	str += 'setenv %s ${HALLD_RECON_HOME}/${BMS_OSNAME}/lib:${%s}\n' %(LDLPV, LDLPV)
+	str += 'setenv PYTHONPATH ${HALLD_RECON_HOME}/${BMS_OSNAME}/lib/python:${PYTHONPATH}\n'
 	str += '\n'
 
 	# CCDB
@@ -271,13 +271,13 @@ def mk_setenv_bash(env):
 
 	# HALLD
 	str += '# HALLD\n'
-	str += 'export HALLD_HOME=%s\n' % halld_home
+	str += 'export HALLD_RECON_HOME=%s\n' % halld_home
 	str += 'export BMS_OSNAME=%s\n' % env['OSNAME']
-	str += 'export PATH=${HALLD_HOME}/${BMS_OSNAME}/bin:${PATH}\n'
-	str += 'export JANA_PLUGIN_PATH=${HALLD_HOME}/${BMS_OSNAME}/plugins:${JANA_PLUGIN_PATH}\n'
+	str += 'export PATH=${HALLD_RECON_HOME}/${BMS_OSNAME}/bin:${PATH}\n'
+	str += 'export JANA_PLUGIN_PATH=${HALLD_RECON_HOME}/${BMS_OSNAME}/plugins:${JANA_PLUGIN_PATH}\n'
 	# python support
-	str += 'export %s=${HALLD_HOME}/${BMS_OSNAME}/lib:${%s}\n' %(LDLPV, LDLPV)
-	str += 'export PYTHONPATH=${HALLD_HOME}/${BMS_OSNAME}/lib/python:${PYTHONPATH}\n'
+	str += 'export %s=${HALLD_RECON_HOME}/${BMS_OSNAME}/lib:${%s}\n' %(LDLPV, LDLPV)
+	str += 'export PYTHONPATH=${HALLD_RECON_HOME}/${BMS_OSNAME}/lib/python:${PYTHONPATH}\n'
 	str += '\n'
 
 	# CCDB

src/SConstruct

@@ -21,8 +21,8 @@ BUILDSWIG = ARGUMENTS.get('BUILDSWIG', 0)
 # Get platform-specific name
 osname = os.getenv('BMS_OSNAME', 'build')
 
-# Make sure HALLD_HOME is set (needed for python module builds)
-if not os.getenv('HALLD_HOME'): os.environ['HALLD_HOME'] = Dir('#/..').abspath
+# Make sure HALLD_RECON_HOME is set (needed for python module builds)
+if not os.getenv('HALLD_RECON_HOME'): os.environ['HALLD_RECON_HOME'] = Dir('#/..').abspath
 
 # Get architecture name
 arch = ROOT_CFLAGS = subprocess.Popen(["uname"], stdout=subprocess.PIPE).communicate()[0].strip()