Merge pull request #95 from rlcee/tfcl_240125

new trigger fhicl

bin/museSetup.sh

@@ -581,13 +581,16 @@ do
         export ${REPOUPPER}_INC=$BDIR
 
         # add package-generated fcl (trigger) and data (gdml) paths
-        # assuming only Offline generates these
-        if [ "$REPO" == "Offline" ]; then
-            TEMP=$BDIR/build/$MUSE_STUB
+        # assuming only certain repos generate these
+        TEMP=$BDIR/build/$MUSE_STUB
+        if [[ "$REPO" == "Offline" || "$REPO" == "mu2e_trig_config" ]]; then
             export FHICL_FILE_PATH=$( mdropit  $FHICL_FILE_PATH $TEMP )
+        fi
+        if [ "$REPO" == "Offline" ]; then
             export MU2E_SEARCH_PATH=$( mdropit $MU2E_SEARCH_PATH $TEMP )
         fi
 
+
         # libraries built in each package
         export LD_LIBRARY_PATH=$( mdropit $LD_LIBRARY_PATH $BUILD/lib )
         export CET_PLUGIN_PATH=$( mdropit $CET_PLUGIN_PATH $BUILD/lib )

python/SConstruct

@@ -91,8 +91,8 @@ env = Environment( CPPPATH = sch.cppPath(mu2eOpts),   # $ART_INC ...
                    SHLINKCOMSTR= linkcomstr
 )
 
-# compilation_db, starting in version 4
-if mu2eCBD and mu2eOpts['sconsv'][0]>='4':
+# make compile_commands file used by code analysis tools
+if mu2eCBD :
     cstr = "Wrote "+mu2eOpts['workDir']+'/'+mu2eOpts['buildBase'] \
                +"/compile_commands.json"
     env.Tool('compilation_db', COMPILATIONDB_COMSTR=cstr)

python/sconstruct_helper.py

@@ -16,9 +16,6 @@
 def mu2eEnvironment():
     mu2eOpts = {}
 
-    # version, like 4_2_0
-    mu2eOpts['sconsv'] = os.environ['SETUP_SCONS'].split()[1].replace('v','')
-
     # the directory that includes local repos and 'build'
     workDir = os.environ['MUSE_WORK_DIR']