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

@@ -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

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

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

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

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

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

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

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

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