From afbb61f97febe71625e45f4566a9e0b7cea56479 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Fri, 6 Nov 2020 15:04:11 -0600
Subject: [PATCH] modified: .gitlab-ci.yml modified:
clustering/clustering_config.yml modified: ecal/ecal_config.yml
modified: rich/rich_config.yml modified:
tracking/tracking_config.yml
---
.gitlab-ci.yml | 5 ++---
clustering/barrel_clusters.sh | 4 ++++
clustering/clustering_config.yml | 2 +-
ecal/ecal_config.yml | 3 ++-
ecal/emcal_electrons.sh | 4 ++++
ecal/emcal_pi0s.sh | 5 +++++
rich/rich_config.yml | 2 +-
tracking/central_electrons.sh | 4 ++++
tracking/tracking_config.yml | 2 +-
9 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6604d584..043385ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,15 +10,14 @@ default:
stages:
- build
- - data_init
- config
- run
- benchmarks1
- benchmarks2
- finish
-get_data:
- stage: data_init
+configure:
+ stage: config
script:
- mkdir -p results
- mkdir -p config
diff --git a/clustering/barrel_clusters.sh b/clustering/barrel_clusters.sh
index ecee9584..2d989861 100644
--- a/clustering/barrel_clusters.sh
+++ b/clustering/barrel_clusters.sh
@@ -24,6 +24,10 @@ echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
## Build the detector constructors.
git clone https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
+git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
+pushd ${JUGGLER_DETECTOR}
+ln -s ../accelerator/eic
+popd
mkdir ${JUGGLER_DETECTOR}/build
pushd ${JUGGLER_DETECTOR}/build
cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j30 install
diff --git a/clustering/clustering_config.yml b/clustering/clustering_config.yml
index 89bfc9ca..34eea761 100644
--- a/clustering/clustering_config.yml
+++ b/clustering/clustering_config.yml
@@ -2,7 +2,7 @@ clustering_barrel_electrons:
image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
tags:
- silicon
- needs: ["get_data"]
+ needs: ["configure"]
timeout: 24 hours
artifacts:
expire_in: 20 weeks
diff --git a/ecal/ecal_config.yml b/ecal/ecal_config.yml
index a4bb8ff6..a949bafa 100644
--- a/ecal/ecal_config.yml
+++ b/ecal/ecal_config.yml
@@ -2,7 +2,7 @@ ecal_1_emcal_electrons:
image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
tags:
- silicon
- needs: ["get_data"]
+ needs: ["configure"]
timeout: 24 hours
artifacts:
expire_in: 20 weeks
@@ -16,6 +16,7 @@ ecal_1_emcal_pi0s:
image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
tags:
- silicon
+ needs: ["configure"]
timeout: 12 hours 30 minutes
artifacts:
expire_in: 20 weeks
diff --git a/ecal/emcal_electrons.sh b/ecal/emcal_electrons.sh
index 9cfc1f30..cd33ad36 100644
--- a/ecal/emcal_electrons.sh
+++ b/ecal/emcal_electrons.sh
@@ -32,6 +32,10 @@ echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
# Build the detector constructors.
git clone https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
+git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
+pushd ${JUGGLER_DETECTOR}
+ln -s ../accelerator/eic
+popd
mkdir ${JUGGLER_DETECTOR}/build
pushd ${JUGGLER_DETECTOR}/build
cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j30 install
diff --git a/ecal/emcal_pi0s.sh b/ecal/emcal_pi0s.sh
index 60ef1a1b..fee51297 100644
--- a/ecal/emcal_pi0s.sh
+++ b/ecal/emcal_pi0s.sh
@@ -22,8 +22,13 @@ echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
#git clone https://eicweb.phy.anl.gov/EIC/datasets.git datasets
root -b -q "ecal/scripts/emcal_pi0.cxx(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
root -b -q "ecal/scripts/emcal_pi0_reader.cxx(\"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+
# Detector TOPSiDE
git clone https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
+git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
+pushd ${JUGGLER_DETECTOR}
+ln -s ../accelerator/eic
+popd
mkdir ${JUGGLER_DETECTOR}/build
pushd ${JUGGLER_DETECTOR}/build
cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j30 install
diff --git a/rich/rich_config.yml b/rich/rich_config.yml
index 4fc4c395..85a7a27b 100644
--- a/rich/rich_config.yml
+++ b/rich/rich_config.yml
@@ -2,7 +2,7 @@ rich_job_x:
image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
tags:
- silicon
- needs: ["get_data"]
+ needs: ["configure"]
timeout: 24 hours
artifacts:
expire_in: 20 weeks
diff --git a/tracking/central_electrons.sh b/tracking/central_electrons.sh
index 0593a2a6..2aa4eeb7 100644
--- a/tracking/central_electrons.sh
+++ b/tracking/central_electrons.sh
@@ -24,6 +24,10 @@ echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
### Build the detector constructors.
git clone https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
+git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
+pushd ${JUGGLER_DETECTOR}
+ln -s ../accelerator/eic
+popd
mkdir ${JUGGLER_DETECTOR}/build
pushd ${JUGGLER_DETECTOR}/build
cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j30 install
diff --git a/tracking/tracking_config.yml b/tracking/tracking_config.yml
index b139788f..7e929ece 100644
--- a/tracking/tracking_config.yml
+++ b/tracking/tracking_config.yml
@@ -2,7 +2,7 @@ tracking_central_electrons:
image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
tags:
- silicon
- needs: ["get_data"]
+ needs: ["configure"]
timeout: 24 hours
artifacts:
expire_in: 20 weeks
--
GitLab