From 1c680d86c5855eeea986fc2acec7d15fed94db86 Mon Sep 17 00:00:00 2001 From: jml985 <44065529+jml985@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:40:06 -0500 Subject: [PATCH 1/5] Disable logging outside of local domain, with no other changes (#644) Clean version of the pull request disabling DAQ logging when compiling outside of the local domain. --- StRoot/RTS/include/rtsLog.h | 45 +++++++-------------------------- StRoot/RTS/src/LOG/Makefile | 3 ++- StRoot/RTS/src/LOG/rtsLog.C | 2 +- StRoot/RTS/src/LOG/rtsLogUnix.c | 38 +++++++++++++++++++++++----- StRoot/RTS/src/rtsmakefile.def | 43 +++++++++++++++++++++++++++++-- 5 files changed, 85 insertions(+), 46 deletions(-) diff --git a/StRoot/RTS/include/rtsLog.h b/StRoot/RTS/include/rtsLog.h index cb5d5749ca0..87fc4d9e7a4 100755 --- a/StRoot/RTS/include/rtsLog.h +++ b/StRoot/RTS/include/rtsLog.h @@ -93,41 +93,14 @@ void rtsLogAddJmlFile (char *fname); -/*Tonko: not used Special (mis)handling for STAR Offline Code -#ifdef __ROOT__ -#define RTS_DISABLE_LOG -#endif -*/ -#ifdef RTS_DISABLE_LOG - -#define RTS_ASSERT(expr) assert(expr) - - - #define LOG(SEV,STRING,ARGS...) \ - do { \ - const char *const yada = SEV ; \ - if((*yada == 'E')) { \ - fprintf(stderr,"" ANSI_RED "RTS_" SEV ": " __FILE__ " [line %d]: " STRING "" ANSI_RESET "\n" , __LINE__ , ##ARGS) ;\ - } \ - else if((*yada == 'C')) { \ - fprintf(stderr,"" ANSI_RED "" ANSI_REVERSE "RTS_" SEV ": " __FILE__ " [line %d]: " STRING "" ANSI_RESET "\n" , __LINE__ , ##ARGS) ;\ - } \ - else if((*yada == 'I')) { \ - fprintf(stderr,"" ANSI_BLUE "" ANSI_BOLD "RTS_" SEV ": " __FILE__ " [line %d]: " STRING "" ANSI_RESET "\n" , __LINE__ , ##ARGS) ;\ - } \ - else if((*yada == 'T')) { \ - fprintf(stderr,"" ANSI_GREEN "" ANSI_BOLD "RTS_" SEV ": " __FILE__ " [line %d]: " STRING "" ANSI_RESET "\n" , __LINE__ , ##ARGS) ;\ - } \ - else if((*yada == 'W')) { \ - fprintf(stderr,"" ANSI_CYAN "" ANSI_BOLD "RTS_" SEV ": " __FILE__ " [line %d]: " STRING "" ANSI_RESET "\n" , __LINE__ , ##ARGS) ;\ - } \ - else if((*yada == 'O')) { \ - fprintf(stderr,"" ANSI_BLUE "" ANSI_REVERSE "RTS_" SEV ": " __FILE__ " [line %d]: " STRING "" ANSI_RESET "\n" , __LINE__ , ##ARGS) ;\ - } \ - } while(0) \ +#ifndef RTS_ENABLE_LOG +#define RTS_ASSERT(expr) assert(expr) +#define LOG(SEV,STRING,ARGS...) +#define rtsLogUnix_v(str, ...) +#define rtsLogAddCmd(x) // the following become noops... @@ -136,7 +109,7 @@ void rtsLogAddJmlFile (char *fname); #define rtsLogLevelInt(x) #define rtsLogOutput(x) -#else /* RTS_DISABLE_LOG */ +#else /* RTS_ENABLE_LOG */ #ifdef __GNUC__ @@ -270,12 +243,12 @@ INLINE_HACK void rtsLogLevel(const char *level) -#endif +#endif /* RTS_LOG_COLORED */ -#endif +#endif /* __vxworks */ -#endif /* RTS_DISABLE_LOG */ +#endif /* RTS_ENABLE_LOG */ #ifdef __cplusplus } diff --git a/StRoot/RTS/src/LOG/Makefile b/StRoot/RTS/src/LOG/Makefile index 8107ebe358f..c1447ead38a 100755 --- a/StRoot/RTS/src/LOG/Makefile +++ b/StRoot/RTS/src/LOG/Makefile @@ -2,6 +2,7 @@ include ../rtsmakefile.def include ../rtsplus.def + # zap LDLIBS LDLIBS = @@ -28,7 +29,7 @@ rtsLog.o : rtsLog.C rtsLog: rtsLog.o rtsLogUnix.o $(CXX) $(CXXFLAGS) rtsLogUnix.o rtsLog.o -o rtsLog - + #operDisplay.sh: diff --git a/StRoot/RTS/src/LOG/rtsLog.C b/StRoot/RTS/src/LOG/rtsLog.C index 481ebdfe1b6..b9aa11ed557 100644 --- a/StRoot/RTS/src/LOG/rtsLog.C +++ b/StRoot/RTS/src/LOG/rtsLog.C @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) use_stdin = 0 ; rtsLogLevel(DBG) ; - rtsLogOutput(RTS_LOG_NET) ; + //rtsLogOutput(RTS_LOG_NET) ; memset(logstr,0,sizeof(logstr)) ; diff --git a/StRoot/RTS/src/LOG/rtsLogUnix.c b/StRoot/RTS/src/LOG/rtsLogUnix.c index c48799c7d8d..8d2d0cdb5ff 100755 --- a/StRoot/RTS/src/LOG/rtsLogUnix.c +++ b/StRoot/RTS/src/LOG/rtsLogUnix.c @@ -29,7 +29,31 @@ extern "C" { volatile int tonkoLogLevel = 2 ; -static char *getCmd(void) ; + + + + +#ifdef RTS_ENABLE_LOG +#warning "DAQ logging is enabled" +#ifdef RTS_LOG_DEFAULT_NET +#warning "DAQ logging defaults to daqman" +#else +#warning "DAQ logging defaults to STDERR" +#endif /* RTS_LOG_DEFAULT_NET */ +#else +#warning "DAQ logging is disabled" +#endif /* RTS_ENABLE_LOG */ + + +#ifdef RTS_ENABLE_LOG + +#ifdef RTS_LOG_DEFAULT_NET +static int output_flag = RTS_LOG_NET ; +#else +static int output_flag = RTS_LOG_STDERR ; +#endif + +static const char *getCmd(void) ; static int odesc = -1 ; static int handchange ; static FILE *fdesc = 0 ; @@ -42,7 +66,7 @@ static char servER[80] = RTS_LOG_HOST ; #endif static int port = RTS_LOG_PORT ; -static int output_flag = RTS_LOG_NET ; + static char cmd[1024] ; /* @@ -113,7 +137,6 @@ void rtsLogAddJmlFile (char *fname) jml_fname = _g_fname; } - int rtsLogUnix_v(const char *str, ...) { /* common to all threads */ @@ -328,9 +351,7 @@ int rtsLogUnix_v(const char *str, ...) return 0 ; } - - -static char *getCmd(void) +static const char *getCmd(void) { @@ -370,6 +391,11 @@ static char *getCmd(void) #endif } + +#endif + + + #ifdef __cplusplus } #endif diff --git a/StRoot/RTS/src/rtsmakefile.def b/StRoot/RTS/src/rtsmakefile.def index b22ce170a78..7f0b82f740c 100755 --- a/StRoot/RTS/src/rtsmakefile.def +++ b/StRoot/RTS/src/rtsmakefile.def @@ -17,6 +17,8 @@ ifeq ($(HOST_NAME),daqman.starp.bnl.gov) endif +HOSTDOMAIN = $(shell hostname -d) + # jml... TARGET_CPU_STRING to mean the full string... # go from "uname" to gcc -mcpu=TARGET_CPU variant @@ -372,8 +374,41 @@ endif DEFINES = -D_REENTRANT ${RTS_DAQMAN_FLAGS} -DRTS_HOST_NAME=\"${HOST_NAME}\" -DTARGET_SYSTEM=\"${TARGET_SYSTEM}\" -DPROJDIR=\"${PROJDIR}\" -DINSTALL_SUFFIX=\"${INSTALL_SUFFIX}\" -D${RTS_TYPE} ${HOW} ${HOSTDEFINES} -DRTS_ONLINE -BASEFLAGS = -O3 -Wall -pipe -fverbose-asm ${HOSTFLAGS} -#BASEFLAGS= -Wall -pipe -fverbose-asm ${HOSTFLAGS} +# Set strict errors in LINUX +BASEFLAGS = -O3 -Wall -Wno-error=strict-overflow -Wno-error=maybe-uninitialized -Wno-error=unused-label -Wno-error=unused-value -Wno-error=unused-variable -Wno-error=unused-function -Wno-unused-but-set-variable -pipe -fverbose-asm ${HOSTFLAGS} + + +#-O3 +ifneq (${TARGET_SYSTEM}, LINUX) + BASEFLAGS = -Wall -pipe -fverbose-asm ${HOSTFLAGS} +endif + +ifeq (${HOST_NAME},xvme01.daq.bnl.local) + BASEFLAGS = -O3 -Wall -Wno-error=strict-overflow -Wno-error=unused-label -Wno-error=unused-value -Wno-error=unused-variable -Wno-error=unused-function -Wno-unused-but-set-variable -pipe -fverbose-asm ${HOSTFLAGS} +endif + +# if not compiling on one of the standard domains, then +# use the default log destination of std_err +# if compiling on local domain, write to daqman +# +# if compiling somewhere else for writing to daqman these defines +ifeq (${HOSTDOMAIN},starp.bnl.gov) + DEFINES += -DRTS_LOG_DEFAULT_NET + DEFINES += -DRTS_ENABLE_LOG +else ifeq (${HOSTDOMAIN},daq.bnl.local) + DEFINES += -DRTS_LOG_DEFAULT_NET + DEFINES += -DRTS_ENABLE_LOG +else ifeq (${HOSTDOMAIN},daq2.bnl.local) + DEFINES += -DRTS_LOG_DEFAULT_NET + DEFINES += -DRTS_ENABLE_LOG +else ifeq (${HOSTDOMAIN},trg.bnl.local) + DEFINES += -DRTS_LOG_DEFAULT_NET + DEFINES += -DRTS_ENABLE_LOG +else ifeq (${HOSTDOMAIN},l4.bnl.local) + DEFINES += -DRTS_LOG_DEFAULT_NET + DEFINES += -DRTS_ENABLE_LOG +endif + CCFLAGS = ${BASEFLAGS} ${USRCCFLAGS} ${DEFINES} ${INCLUDES} CXXFLAGS = ${BASEFLAGS} ${USRCXXFLAGS} ${DEFINES} ${INCLUDES} CFLAGS = ${BASEFLAGS} ${USRCFLAGS} ${DEFINES} ${INCLUDES} @@ -387,6 +422,10 @@ ifeq ($(RTS_PROJECT),PP2PP) endif endif + + + + # noticed problems on Linux where the default linker gcc doesn't work well for g++ compiled # files LINK.o = $(CXX) $(LDFLAGS) $(TARGET_ARCH) From 05bbcc8726914d23fff0ae662a23225d804fc311 Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Tue, 13 Feb 2024 18:39:04 -0500 Subject: [PATCH 2/5] build: sync CI machinery with SL23f_2 --- .github/workflows/build-containers.yml | 44 ++++++++++++++-- .github/workflows/build-pull-request.yml | 64 +++++++++++++++++++----- .github/workflows/delete_untagged.py | 25 +++++++++ 3 files changed, 116 insertions(+), 17 deletions(-) create mode 100755 .github/workflows/delete_untagged.py diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index cbb63bec89b..cb5aaf35d52 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -14,20 +14,24 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - starenv: [root5, root6] + starenv: [root5] compiler: [gcc485] env: STARENV: ${{ matrix.starenv }}-${{ matrix.compiler }} steps: - name: Get branch name id: branch-name - uses: tj-actions/branch-names@v5.2 + uses: tj-actions/branch-names@v6 + + - name: Define complete image tag + run: | + echo "TAG=${{ steps.branch-name.outputs.current_branch || steps.branch-name.outputs.tag }}-${{ env.STARENV }}" >> $GITHUB_ENV - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.actor }} @@ -39,5 +43,35 @@ jobs: build-args: | starenv=${{ matrix.starenv }} compiler=${{ matrix.compiler }} - push: true - tags: ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }}-${{ env.STARENV }} + load: true + tags: ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }} + + - name: Push container image + run: | + docker push ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }} + + - name: Create latest tag for default branch + if: ${{ steps.branch-name.outputs.is_tag == 'false' && steps.branch-name.outputs.is_default == 'true' && env.STARENV == 'root5-gcc485' }} + run: | + docker tag ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }} ghcr.io/${{ github.repository_owner }}/star-sw:latest + docker push ghcr.io/${{ github.repository_owner }}/star-sw:latest + + - name: Create latest tag for SL* branches + if: ${{ steps.branch-name.outputs.is_tag == 'false' && steps.branch-name.outputs.is_default == 'false' && env.STARENV == 'root5-gcc485' }} + run: | + docker tag ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }} ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }} + docker push ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }} + + - name: Create image tag based on pushed tag + if: ${{ steps.branch-name.outputs.is_tag == 'true' && env.STARENV == 'root5-gcc485' }} + run: | + docker tag ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }} ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.tag }} + docker push ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.tag }} + + build-cleanup: + runs-on: ubuntu-latest + needs: build + steps: + - name: Checkout + uses: actions/checkout@v3 + - run: .github/workflows/delete_untagged.py ${{ secrets.STAR_BNL_STAR_SW_TOKEN }} diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 8cffe584805..bf46bc9bf95 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -1,13 +1,22 @@ name: Build Pull Request -on: pull_request +on: + pull_request: + paths-ignore: + - '.github/**' + - 'docs/**' + - '!.github/workflows/**' + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: build: runs-on: ubuntu-latest strategy: matrix: - starenv: [root5, root6] + starenv: [root5] compiler: [gcc485] env: STARENV: ${{ matrix.starenv }}-${{ matrix.compiler }} @@ -32,14 +41,17 @@ jobs: name: star-sw-${{ env.STARENV }} path: /tmp/star-sw-${{ env.STARENV }}.tar - ROOT5_test: + test: runs-on: ubuntu-latest needs: build strategy: + fail-fast: false matrix: - test_id: [29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, 60, 76, 77, 78, 90, 91, 92, 119, 120] + test_id: [10, 11, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, 60, 76, 77, 78, 90, 91, 92, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121] + starenv: [root5] + compiler: [gcc485] env: - STARENV: root5-gcc485 + STARENV: ${{ matrix.starenv }}-${{ matrix.compiler }} steps: - name: Download artifact uses: actions/download-artifact@v3 @@ -48,21 +60,23 @@ jobs: path: /tmp - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar - - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v2 + - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7 - run: | TEST_CMD=$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py -c ${{ matrix.test_id }}) # Workaround https://sft.its.cern.ch/jira/browse/ROOT-7660 in ROOT 5 by checking the output log docker run --volumes-from star-test-data ghcr.io/star-bnl/star-sw-${{ env.STARENV }} \ sh -c "set -e; MALLOC_CHECK_=3 $TEST_CMD 2>&1 | tee log; grep 'Run completed' log" - ROOT6_test_ignore_fail: + ROOT5_test_doEvents: runs-on: ubuntu-latest needs: build strategy: + fail-fast: false matrix: - test_id: [50, 52, 54, 90, 91, 92, 119, 120] + test_id: [121, 122] + compiler: [gcc485] env: - STARENV: root6-gcc485 + STARENV: root5-${{ matrix.compiler }} steps: - name: Download artifact uses: actions/download-artifact@v3 @@ -71,8 +85,34 @@ jobs: path: /tmp - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar - - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v2 + - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7 - run: | - TEST_CMD=$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py -c ${{ matrix.test_id }}) + TEST_FILE=$(echo "$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py ${{ matrix.test_id }} -a fullpath)" | sed -E 's/\.(daq|fzd)$/.event.root/') + TEST_CMD="root4star -b -q -l 'StRoot/macros/analysis/doEvents.C(100, \"$TEST_FILE\")'" + docker run --volumes-from star-test-data ghcr.io/star-bnl/star-sw-${{ env.STARENV }} \ + sh -c "set -e; $TEST_CMD 2>&1 | tee log; grep ' IO:' log" + + ROOT5_test_find_vertex: + runs-on: ubuntu-latest + needs: build + strategy: + fail-fast: false + matrix: + test_id: [102, 121, 122] + compiler: [gcc485] + env: + STARENV: root5-${{ matrix.compiler }} + steps: + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: star-sw-${{ env.STARENV }} + path: /tmp + + - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar + - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7 + - run: | + TEST_FILE=$(echo "$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py ${{ matrix.test_id }} -a fullpath)" | sed -E 's/\.(daq|fzd)$/.event.root/') + TEST_CMD="root4star -b -q -l 'StRoot/macros/analysis/find_vertex.C(\"$TEST_FILE\")'" docker run --volumes-from star-test-data ghcr.io/star-bnl/star-sw-${{ env.STARENV }} \ - sh -c "MALLOC_CHECK_=3 $TEST_CMD || echo 'Failed with an exit code: '\$?" + sh -c "set -e; $TEST_CMD 2>&1 | tee log; grep ' StIO:' log" diff --git a/.github/workflows/delete_untagged.py b/.github/workflows/delete_untagged.py new file mode 100755 index 00000000000..f5a5f98096b --- /dev/null +++ b/.github/workflows/delete_untagged.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python3 + +import argparse +import json +import requests +import types + +parser = argparse.ArgumentParser() +parser.add_argument("token", help="GitHub token") +args = parser.parse_args() + +domain = "api.github.com" +org = "star-bnl" +package_type = "container" +package_name = "star-sw" + +api_url = f"https://{domain}/orgs/{org}/packages/{package_type}/{package_name}/versions" + +respjson = requests.get(api_url, auth=("token", args.token)) +entries = json.loads(respjson.text, object_hook=lambda d: types.SimpleNamespace(**d)) + +for e in entries: + if not e.metadata.container.tags: + response = requests.delete(api_url + f"/{e.id}", auth=("token", args.token)) + print("delete", e.id, e.html_url, e.name, response.url, response.status_code) From ef332696e8e68c62c44ec5c3337819eecf82e00f Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Tue, 13 Feb 2024 19:01:30 -0500 Subject: [PATCH 3/5] build: sync Dockerfile and mgr/ with SL23f_2 --- Dockerfile | 11 +- mgr/ConsDefs.pm | 220 +++++++-------------- mgr/Conscript-standard | 24 ++- mgr/Construct | 36 +++- mgr/config/v0.2.3-rhel7-root5.34.38.config | 17 ++ mgr/config/v0.2.3-rhel7-root6.16.00.config | 18 ++ mgr/config/v0.2.3-rhel7-root6.24.06.config | 18 ++ mgr/config/v0.3.0-rhel7-root5.34.38.config | 16 ++ mgr/config/v0.3.0-rhel7-root6.16.00.config | 16 ++ mgr/config/v0.3.0-rhel7-root6.24.06.config | 16 ++ mgr/default.config | 16 ++ mgr/warnoff_dirs.txt | 126 ++++++++++++ 12 files changed, 360 insertions(+), 174 deletions(-) create mode 100644 mgr/config/v0.2.3-rhel7-root5.34.38.config create mode 100644 mgr/config/v0.2.3-rhel7-root6.16.00.config create mode 100644 mgr/config/v0.2.3-rhel7-root6.24.06.config create mode 100644 mgr/config/v0.3.0-rhel7-root5.34.38.config create mode 100644 mgr/config/v0.3.0-rhel7-root6.16.00.config create mode 100644 mgr/config/v0.3.0-rhel7-root6.24.06.config create mode 100644 mgr/default.config create mode 100644 mgr/warnoff_dirs.txt diff --git a/Dockerfile b/Dockerfile index d3a5743cd64..1aee302f9d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,9 @@ ARG starenv=root5 # Pick one from [gcc485, gcc11] ARG compiler=gcc485 -FROM ghcr.io/star-bnl/star-spack:v0.1.6-${starenv}-${compiler} +FROM ghcr.io/star-bnl/star-spack:v0.3.0-${starenv}-${compiler} + +ARG compiler ENV NODEBUG=yes ENV STAR=/star-sw @@ -21,8 +23,11 @@ COPY . ${STAR} SHELL ["/bin/bash", "-l", "-c"] -RUN cons \ - && find .$STAR_HOST_SYS -name *.o -exec rm '{}' \; +RUN < WARNING ** Could not define XMLLIBDIR, XMLINCDIR, XMLLIBS\n"; - } - } + $XMLINCDIR = `$xml --cflags`; + chomp($XMLINCDIR); + $XMLINCDIR =~ s/ -I/:/g; + $XMLINCDIR =~ s/-I//g; + my $XML = `$xml --libs`; # die "$XML\n"; + my(@libs)= split(" ", $XML); + + $XMLLIBDIR = shift(@libs); + if ($XMLLIBDIR =~ /-L/){ + $XMLLIBDIR =~ s/-L//; + $XMLLIBS = join(" ",@libs); } else { - print "Could not find xml libs\n" if (! $param::quiet); + # no -L, assume all were LIBS + $XMLLIBS = $XMLLIBDIR ." ".join(" ",@libs); + # and fix -L / should work for both 32 and 64 + $XMLLIBDIR = "/usr/$LLIB"; + } + + my $XMLVersion = `$xml --version`; # print "XMLVersion = $XMLVersion\n"; + my ($major,$minor) = split '\.', $XMLVersion; # print "major = $major,minor = $minor\n"; + $XMLCPPFlag = "";#-DXmlTreeReader"; + if ($major < 2 or $major == 2 and $minor < 5) { + $XMLCPPFlag = "-DNoXmlTreeReader"; + } + if ( ! $param::quiet ){ + if ( $XMLLIBDIR ){ + print "Using $xml\n\tXMLLIBDIR = $XMLLIBDIR\n\tXMLINCDIR = $XMLINCDIR\n\tXMLLIBS = $XMLLIBS\n\tXMLCPPFlag = $XMLCPPFlag\n" if !$param::quiet; + } else { + print "Use xml -> WARNING ** Could not define XMLLIBDIR, XMLINCDIR, XMLLIBS\n"; + } } chomp($FASTJET_PREFIX = `fastjet-config --prefix`); @@ -1216,6 +1131,7 @@ 'ENV' => { 'CPATH' => $CPATH, 'PATH' => $PATH, + 'PYTHONPATH' => $PYTHONPATH, 'LM_LICENSE_FILE' => $LM_LICENSE_FILE, 'INCLUDE' => $INCLUDE_PATH, 'ROOT' => $ROOT, diff --git a/mgr/Conscript-standard b/mgr/Conscript-standard index 5ab27fc0938..0df341f33a7 100644 --- a/mgr/Conscript-standard +++ b/mgr/Conscript-standard @@ -1,5 +1,5 @@ #!/usr/bin/env perl -Import qw ( env CWD INCLUDE LIB BIN BUILD OBJ); +Import qw ( env CWD INCLUDE LIB BIN BUILD OBJ warnoff_dirs); ( my $build = $OBJ ) =~ s/\#//g; $build =~ s/\\/\//g; # print "OBJ = $OBJ build = $build\n"; # print "MAIN = $MAIN\n"; @@ -11,12 +11,8 @@ my $STAR_SYS = $env->{ENV}->{STAR_SYS}; my $STAR_VERSION = $env->{ENV}->{STAR_VERSION}; # print "##### $STAR_VER\n"; my $AFS_RHIC = $env->{ENV}->{AFS_RHIC}; -my $ROOT_FEATURES = `root-config --features`; - @Repo = Repository_List unless $param::noRepository;# print "Repositories = |@Repo|\n"; - - print "+-+-+- STAR=".$env->{ENV}->{STAR}."\n" if $param::debug; print "+-+-+- cwd=".$CWD."\n" if $param::debug; my $IsDotDev = 0; @@ -94,6 +90,7 @@ my $SOFLAGS = $env1->{SOFLAGS}; my $LIBPATH = $env1->{LIBPATH}; my $STIC = $env1->{STIC}; my $EXTRA_CPPFLAGS = $env1->{EXTRA_CPPFLAGS}; +my $EXTRA_CXXFLAGS = $env1->{EXTRA_CXXFLAGS}; my $CPPFLAGS = $env1->{CPPFLAGS}; my $ROOTCINT_CPPFLAGS = ""; @@ -248,6 +245,13 @@ if ($FC =~ m/g77/ || $FC =~ m/gfortran/ ){ #} } +# Disable all compiler warnings if $Dir matches any value from @$warnoff_dirs +if ( index($EXTRA_CXXFLAGS, "-Werror") != -1 ) { + if ( grep($Dir =~ m/^$_$/, @$warnoff_dirs) ) { + $EXTRA_CXXFLAGS =~ s/-Werror//; + } +} + #+ # Now we treat anything which is neither sim nor gen # This will include all makers @@ -255,14 +259,6 @@ if ($FC =~ m/g77/ || $FC =~ m/gfortran/ ){ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) { print "\t--- Regular case treatment (not gen not sim) ---\n" if $param::debug; - - - if ( $Dir =~ m/Table$/ ) { - if ( $ROOT_FEATURES =~ m/table/ ){ print "[ROOT has table support]\n";@srcL=();@h_filesL = (); } - else { print "[ROOT has no table support, compile Table] \n"; } - } - - # if user requested debug, print some info on what was found if ($param::debug) { $i = 0; @@ -982,6 +978,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) { #print "DEBUG Passing $ROOTCINT_CPPFLAGS\n"; $env2 = $env1->clone('Package' => $pkg, 'EXTRA_CPPFLAGS' => $EXTRA_CPPFLAGS, + 'EXTRA_CXXFLAGS' => $EXTRA_CXXFLAGS, 'CPPPATH' => $CPPPATH, 'CFLAGS' => $CFLAGS, 'CXXFLAGS' => $CXXFLAGS, @@ -1011,6 +1008,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) { $envCint = $env2->clone('DEBUG' => $env2->{NOOPT}, 'CPPPATH' => $Cint_CPPPATH, 'CPPFLAGS' => $CPPFLAGS, + 'EXTRA_CXXFLAGS' => $EXTRA_CXXFLAGS, 'EXTRA_CPPFLAGS' => $EXTRA_CPPFLAGS); print "LIBPATH = |", $env2->{LIBPATH}, "|\n LIBS = |", $env2->{LIBS}, diff --git a/mgr/Construct b/mgr/Construct index 6a86284e091..60cab6f79c4 100644 --- a/mgr/Construct +++ b/mgr/Construct @@ -4,8 +4,6 @@ use Env; use lib qw(./mgr $STAR/mgr);#$ENV{ConstructLocation}; # Modify perl include path use ConsDefs; -my $ROOT_FEATURES = `root-config --features`; - #my $xx=$ENV{ConstructLocation}; #print "Path used for ConsDefs is $xx\n" unless ($param::quiet); @@ -167,7 +165,8 @@ foreach my $dir (@DirsWithIncludes, @DirsIdlInc) { print "---> looking for include in $dir\n" if ($param::debug); next if ! -r $dir; - next if ( ($ROOT_FEATURES=~/table/) && ($dir =~ /Table$/) ); # Do not export Table headers if ROOT provides table support + # Do not export StRoot/Table headers if ROOT_VERSION < 6 + next if ($dir =~ /StRoot\/Table$/ and $def->{ENV}->{ROOT_VERSION_MAJOR} < 6); opendir( DIR, $dir ) or die "Can't open $dir\n"; my @incs = readdir DIR; print "incs = @incs\n" if ($param::debug); @@ -265,11 +264,11 @@ my $items = "";# print "items $#items = @items\n"; if ( defined($SKIP_DIRS) ) { $items = join("|", split(" ", $SKIP_DIRS)); } else { - $items = "StShadowMaker"; + $items = "StShadowMaker|PWGTools"; } if ( $#items > -1){ - if (! $item) {$items = join("|",@items);} + if (!$items) {$items = join("|",@items);} else {$items .= "|" . join("|",@items);} print "SKIP_DIRS is now: $#items $items\n"; } @@ -286,6 +285,10 @@ foreach my $dir( "pams", "StRoot", "StPiD", "StarVMC" ) { next if ( $sub_dir =~ $excludeDirList); my $sub_Dir = $dir . "/" . $sub_dir; next if !-d $sub_Dir and !-l $sub_Dir; + + # Do not build StRoot/Table if ROOT_VERSION < 6 + next if ($sub_Dir =~ m/StRoot\/Table$/ and $def->{ENV}->{ROOT_VERSION_MAJOR} < 6); + print "dir = $dir \t sub_dir = $sub_dir sub_Dir = $sub_Dir\n" if ($param::debug); # print "$sub_dir => $items\n"; # if ($items and $sub_dir =~ /$items/) {print "skip dir: $sub_dir \t=> $items\n"; next;} @@ -345,6 +348,22 @@ foreach my $dir( "pams", "StRoot", "StPiD", "StarVMC" ) { } } print "subdirs = @subdirs\n" if $param::debug; + +if ( index($env->{EXTRA_CXXFLAGS}, "-Werror") != -1 ) { + # Read regex expressions from the file into an array. The patterns are matched against the names + # of source directories in order to disable compiler warnings + open(warnoff_dirs_file, "mgr/warnoff_dirs.txt") or print "Warning: Can't open mgr/warnoff_dirs.txt\n"; + chomp(@warnoff_dirs = ); + close(warnoff_dirs_file); + + if (@warnoff_dirs) { + print "Compiler warnings will be inhibited for directories matching the following patterns:\n"; + foreach $dir (@warnoff_dirs) { + print "\t$dir\n"; + } + } +} + my @Targets = (); # List of targets @@ -380,12 +399,15 @@ if ($STAR_SYS !~ /x86_darwin/) { #print "sysdirlist = @sysdirlist \n subdirs = @subdirs\n"; +@skip_dirs = split(/\|/, $items); + foreach $dir(@sysdirlist , @subdirs ) { if ( -d $dir or -l $dir ) { # next if $param::include && $dir !~ /$param::include/o; # next if $param::exclude && $dir =~ /$param::exclude/o; print "Add dir : $dir\n" if $param::debug; #push @Targets, $OBJ . "/" . $dir . "/Conscript"; + next if grep($dir =~ m/$_/, @skip_dirs); push @packages, $dir; } } @@ -405,7 +427,9 @@ if ($param::debug){ print "Packages $#packages : @packages\n"; print "Targets $#Targets : @Targets\n" ; } -Export qw( env CWD INCLUDE LIB BIN BUILD OBJ); + +$warnoff_dirs = \@warnoff_dirs; +Export qw( env CWD INCLUDE LIB BIN BUILD OBJ warnoff_dirs); Default qw ( . ); Depends $env $STAR . "/mgr/RootCint.pl", $env->{ENV}->{ROOTSYS} . "/bin/rootcint"; diff --git a/mgr/config/v0.2.3-rhel7-root5.34.38.config b/mgr/config/v0.2.3-rhel7-root5.34.38.config new file mode 100644 index 00000000000..e172257917a --- /dev/null +++ b/mgr/config/v0.2.3-rhel7-root5.34.38.config @@ -0,0 +1,17 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.2.3-root-5.34.38 +module load libiconv-1.16 diff --git a/mgr/config/v0.2.3-rhel7-root6.16.00.config b/mgr/config/v0.2.3-rhel7-root6.16.00.config new file mode 100644 index 00000000000..d79f4e7fe0d --- /dev/null +++ b/mgr/config/v0.2.3-rhel7-root6.16.00.config @@ -0,0 +1,18 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.2.3-root-6.16.00 +module load libiconv-1.16 +module load vc-0.7.4 diff --git a/mgr/config/v0.2.3-rhel7-root6.24.06.config b/mgr/config/v0.2.3-rhel7-root6.24.06.config new file mode 100644 index 00000000000..1eb0d7e4d4b --- /dev/null +++ b/mgr/config/v0.2.3-rhel7-root6.24.06.config @@ -0,0 +1,18 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.2.3-root-6.24.06 +module load libiconv-1.16 +module load vc-0.7.4 diff --git a/mgr/config/v0.3.0-rhel7-root5.34.38.config b/mgr/config/v0.3.0-rhel7-root5.34.38.config new file mode 100644 index 00000000000..bfb649b306d --- /dev/null +++ b/mgr/config/v0.3.0-rhel7-root5.34.38.config @@ -0,0 +1,16 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.3.0-root-5.34.38 diff --git a/mgr/config/v0.3.0-rhel7-root6.16.00.config b/mgr/config/v0.3.0-rhel7-root6.16.00.config new file mode 100644 index 00000000000..b33b1856c90 --- /dev/null +++ b/mgr/config/v0.3.0-rhel7-root6.16.00.config @@ -0,0 +1,16 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.3.0-root-6.16.00 diff --git a/mgr/config/v0.3.0-rhel7-root6.24.06.config b/mgr/config/v0.3.0-rhel7-root6.24.06.config new file mode 100644 index 00000000000..80efe1ef9cb --- /dev/null +++ b/mgr/config/v0.3.0-rhel7-root6.24.06.config @@ -0,0 +1,16 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.3.0-root-6.24.06 diff --git a/mgr/default.config b/mgr/default.config new file mode 100644 index 00000000000..bfb649b306d --- /dev/null +++ b/mgr/default.config @@ -0,0 +1,16 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.3.0-root-5.34.38 diff --git a/mgr/warnoff_dirs.txt b/mgr/warnoff_dirs.txt new file mode 100644 index 00000000000..74a46211c86 --- /dev/null +++ b/mgr/warnoff_dirs.txt @@ -0,0 +1,126 @@ +OnlTools/Jevp +StRoot/RTS +StRoot/StAnalysisMaker +StRoot/StAssociationMaker +StRoot/StBTofPool.* +StRoot/StBTofSimMaker +StRoot/StChain +StRoot/StDaqLib +StRoot/StDbLib +StRoot/StDbUtilities +StRoot/StEEmcDbMaker +StRoot/StEEmcPool.* +StRoot/StEEmcSimulatorMaker +StRoot/StEEmcUtil +StRoot/StEStructPool.* +StRoot/StEmbeddingUtilities +StRoot/StEmcADCtoEMaker +StRoot/StEmcCalibrationMaker +StRoot/StEmcMixerMaker +StRoot/StEmcPool.* +StRoot/StEmcRawMaker +StRoot/StEmcSimulatorMaker +StRoot/StEmcTriggerMaker +StRoot/StEmcUtil +StRoot/StEpcMaker +StRoot/StEpdUtil +StRoot/StEvent +StRoot/StEventUtilities +StRoot/StFcsClusterMaker +StRoot/StFcsDbMaker +StRoot/StFcsRawHitMaker +StRoot/StFcsWaveformFitMaker +StRoot/StFgtA2CMaker +StRoot/StFgtClusterMaker +StRoot/StFgtPool.* +StRoot/StFgtSimulatorMaker +StRoot/StFgtUtil +StRoot/StFilterMaker +StRoot/StFlowAnalysisMaker +StRoot/StFlowMaker +StRoot/StFmsHitMaker +StRoot/StFmsPointMaker +StRoot/StFmsUtil +StRoot/StFtpcClusterMaker +StRoot/StFtpcDriftMapMaker +StRoot/StFtpcSlowSimMaker +StRoot/StFtpcTrackMaker +StRoot/StFttClusterMaker +StRoot/StFttDbMaker +StRoot/StFttHitCalibMaker +StRoot/StFttPointMaker +StRoot/StFttRawHitMaker +StRoot/StFwdTrackMaker +StRoot/StGammaMaker +StRoot/StGenericVertexMaker +StRoot/StHbtMaker +StRoot/StHeavyTagMaker +StRoot/StHighptPool.* +StRoot/StJetMaker +StRoot/StMCFilter +StRoot/StMcAnalysisMaker +StRoot/StMcEventMaker +StRoot/StMiniMcEvent +StRoot/StMtdEvtFilterMaker +StRoot/StMtdUtil +StRoot/StMuDSTMaker +StRoot/StPass0CalibMaker +StRoot/StPeCMaker +StRoot/StPidAmpMaker +StRoot/StPmdCalibrationMaker +StRoot/StPmdClusterMaker +StRoot/StPmdDiscriminatorMaker +StRoot/StPmdReadMaker +StRoot/StPmdSimulatorMaker +StRoot/StPmdUtil +StRoot/StPreEclMaker +StRoot/StPxlClusterMaker +StRoot/StPxlDbMaker +StRoot/StPxlSimMaker +StRoot/StRefMultCorr +StRoot/StSpectraPool.* +StRoot/StSpinPool.* +StRoot/StStarLogger +StRoot/StStrangeMuDstMaker +StRoot/StStrangeTagsMaker +StRoot/StSvtCalibMaker +StRoot/StSvtClassLibrary +StRoot/StSvtClusterMaker +StRoot/StSvtDaqMaker +StRoot/StSvtPool.* +StRoot/StSvtSeqAdjMaker +StRoot/StSvtSimulationMaker +StRoot/StTofCalibMaker +StRoot/StTofHitMaker +StRoot/StTofMaker +StRoot/StTofPool.* +StRoot/StTofSimMaker +StRoot/StTofUtil +StRoot/StTofpMatchMaker +StRoot/StTofrMatchMaker +StRoot/StTpcHitMaker +StRoot/StTpcHitMoverMaker +StRoot/StTpcRSMaker +StRoot/StTreeMaker +StRoot/StTriggerUtilities +StRoot/StTrsMaker +StRoot/StUtilities +StRoot/St_QA_Maker +StRoot/St_base +StRoot/St_ctf_Maker +StRoot/St_emc_Maker +StRoot/St_trg_Maker +StRoot/StarClassLibrary +StRoot/StarGenerator.* +StRoot/StarRoot +StRoot/StdEdxY2Maker +StRoot/Sti +StRoot/StiCA +StRoot/StiMaker +StRoot/StiTpc +StRoot/StiUtilities +StarVMC/StarAgmlLib +StarVMC/StarBASE +StarVMC/StarGeometry +StarVMC/geant3 +pams/ctf From 91a724ab74da5946348a70e19c3cc7317c42549a Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Tue, 13 Feb 2024 19:44:43 -0500 Subject: [PATCH 4/5] build: sync StRoot/macros with SL23f_2 --- StRoot/macros/analysis/doEvents.C | 1 + StRoot/macros/analysis/find_vertex.C | 4 ++++ StRoot/macros/rootlogon.C | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/StRoot/macros/analysis/doEvents.C b/StRoot/macros/analysis/doEvents.C index b18d2df0953..47fd8f8bc1c 100644 --- a/StRoot/macros/analysis/doEvents.C +++ b/StRoot/macros/analysis/doEvents.C @@ -356,6 +356,7 @@ void loadLibs(const char *opt) gSystem->Load("StTriggerDataMaker"); // new starting from April 2003 gSystem->Load("StBichsel"); gSystem->Load("StEvent"); + gSystem->Load("StTpcDb"); gSystem->Load("StEventUtilities"); gSystem->Load("StEmcUtil"); gSystem->Load("StTofUtil"); diff --git a/StRoot/macros/analysis/find_vertex.C b/StRoot/macros/analysis/find_vertex.C index 2c02dd0dd4d..703e8956862 100644 --- a/StRoot/macros/analysis/find_vertex.C +++ b/StRoot/macros/analysis/find_vertex.C @@ -23,6 +23,8 @@ class StChain; class StMinuitVertexFinder; class StGenericVertexFinder; class StGenericVertexMaker; +class StEvent; +class StPrimaryVertex; StChain *chain=0; TH1F *dca_z_h=0; @@ -97,6 +99,7 @@ void find_vertex(char * fname="high_053/st_physics_6053108_raw_2020002.event.roo gSystem->Load("StTriggerDataMaker"); // new starting from April 2003 gSystem->Load("StBichsel"); gSystem->Load("StEvent"); + gSystem->Load("StTpcDb"); gSystem->Load("StEventUtilities"); gSystem->Load("StEmcUtil"); gSystem->Load("StTofUtil"); @@ -122,6 +125,7 @@ void find_vertex(char * fname="high_053/st_physics_6053108_raw_2020002.event.roo gSystem->Load("Sti"); gSystem->Load("libStEEmcUtil"); + gSystem->Load("libMinuit"); gSystem->Load("StGenericVertexMaker"); TFile *fout = new TFile("vtx_tree.root","RECREATE"); diff --git a/StRoot/macros/rootlogon.C b/StRoot/macros/rootlogon.C index 3edf950a6c0..16c3b1623f9 100644 --- a/StRoot/macros/rootlogon.C +++ b/StRoot/macros/rootlogon.C @@ -30,5 +30,10 @@ std::cout << " *** Start at Date : " << TDatime().AsString() << std::endl; - gSystem->AddIncludePath(" -I. -I./.$STAR_HOST_SYS/include -I./StRoot -I$STAR/.$STAR_HOST_SYS/include -I$STAR/StRoot -I/usr/include/mysql"); + gInterpreter->AddIncludePath("."); + gInterpreter->AddIncludePath("./.$STAR_HOST_SYS/include"); + gInterpreter->AddIncludePath("./StRoot"); + gInterpreter->AddIncludePath("$STAR/.$STAR_HOST_SYS/include"); + gInterpreter->AddIncludePath("$STAR/StRoot"); + gInterpreter->AddIncludePath("/usr/include/mysql"); } From e0df12bc308b8e467a3b155b8640f3bc4a911e51 Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Wed, 14 Feb 2024 10:55:39 -0500 Subject: [PATCH 5/5] build: sync asps/ with SL23f_2 --- asps/Simulation/starsim/Conscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asps/Simulation/starsim/Conscript b/asps/Simulation/starsim/Conscript index 0da6aafb1df..5100171907f 100644 --- a/asps/Simulation/starsim/Conscript +++ b/asps/Simulation/starsim/Conscript @@ -123,10 +123,10 @@ $env2 = $env->clone('FC' => $FC, 'FCPATH' => $FCPATH, 'FEXTEND' => "", 'FDEBUG' => $FDEBUG, + 'CFLAGS' => "$env->{CFLAGS} -fcommon", 'CPPFLAGS' => $CPPFLAGS, 'CPPPATH' => $CPPPATH, 'DEBUG' => $DEBUG, - 'AGETOFLAGS' => "", 'LIBS' => $LIBS, 'ObjDir' => $obj_dir, 'Libraries' => $Libraries