Skip to content
Snippets Groups Projects
Commit b9740d3f authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Rename to athena

parent a89e4dfe
No related branches found
No related tags found
No related merge requests found
......@@ -45,7 +45,7 @@ common:setup:
before_script:
- git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
script:
- export JUGGLER_DETECTOR="reference_detector"
- export JUGGLER_DETECTOR="athena"
- |
if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]]; then
export JUGGLER_DETECTOR_VERSION="${CI_COMMIT_REF_NAME}"
......@@ -102,11 +102,11 @@ dump_geometry:
- echo "dumping geometry"
- mkdir -p geo
## full geo with downstream beamline
- dd_web_display --output geo/detector_geo_full.root ${DETECTOR_PATH}/reference_detector.xml
- dd_web_display --output geo/detector_geo_full.root ${DETECTOR_PATH}/athena.xml
## only central detector geo
- sed -i '/forward_ion_beamline/d' ${DETECTOR_PATH}/reference_detector.xml
- sed -i '/far_forward/d' ${DETECTOR_PATH}/reference_detector.xml
- dd_web_display --output geo/detector_geo.root ${DETECTOR_PATH}/reference_detector.xml
- sed -i '/forward_ion_beamline/d' ${DETECTOR_PATH}/athena.xml
- sed -i '/far_forward/d' ${DETECTOR_PATH}/athena.xml
- dd_web_display --output geo/detector_geo.root ${DETECTOR_PATH}/athena.xml
report:
stage: finalize
......@@ -132,14 +132,14 @@ dump_constants:
needs:
- ["common:detector"]
script:
- npdet_info dump ${DETECTOR_PATH}/reference_detector.xml | tee doc/constants.out
- npdet_info dump ${DETECTOR_PATH}/athena.xml | tee doc/constants.out
overlap_check:
stage: test
needs:
- ["common:detector"]
script:
- checkOverlaps -c ${DETECTOR_PATH}/reference_detector.xml | tee doc/overlap_check.out
- checkOverlaps -c ${DETECTOR_PATH}/athena.xml | tee doc/overlap_check.out
- echo "$(cat doc/overlap_check.out | grep ovlp | wc -l) overlaps..."
- if [[ "$(cat doc/overlap_check.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
......@@ -148,7 +148,7 @@ detector:config_testing:
needs:
- ["common:detector"]
script:
- checkOverlaps -o 's' -c ${DETECTOR_PATH}/reference_detector.xml | tee doc/overlap_check.out | wc -l
- checkOverlaps -o 's' -c ${DETECTOR_PATH}/athena.xml | tee doc/overlap_check.out | wc -l
- cat doc/overlap_check.out
benchmarks:detector:
......
cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
PROJECT(reference_detector
PROJECT(athena
VERSION 0.0.1
LANGUAGES CXX
DESCRIPTION "A template dd4hep+acts detector"
......@@ -12,7 +12,7 @@ find_package( DD4hep REQUIRED COMPONENTS DDCore DDG4 )
#find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep )
#-----------------------------------------------------------------------------------
set(a_lib_name reference_detector)
set(a_lib_name athena)
dd4hep_configure_output()
......
Overview
--------
The reference detector at IP6 for Electron-Ion Collider experiment.
The Athena Detector at IP6 for Electron-Ion Collider experiment.
**Detector geometry viewer:**
- [Central detector geometry](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/api/v4/projects/447/jobs/artifacts/master/raw/geo/detector_geo.root?job=report&item=default;1&opt=clipxyz;transp30;zoom100;ROTY0;ROTZ0;trz100;trr0;ctrl;all&)
......@@ -16,7 +16,7 @@ The reference detector at IP6 for Electron-Ion Collider experiment.
<img src="https://eicweb.phy.anl.gov/api/v4/projects/447/jobs/artifacts/master/raw/images/view01_top.png?job=report" width="400px" />
</a>
[Browse latest](https://eicweb.phy.anl.gov/EIC/detectors/reference_detector/-/jobs/artifacts/master/browse/images?job=report)
[Browse latest](https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/browse/images?job=report)
[Detector views](views/detector_views.md)
......@@ -56,7 +56,7 @@ More details can be found at the links below:
Related useful links
--------------------
- [Reference_Detector_doc] (https://escalate.readthedocs.io/projects/g4e/en/latest/detector_naming.html)
- [Athena_Detector_doc] (https://escalate.readthedocs.io/projects/g4e/en/latest/detector_naming.html)
- [g4e] (https://gitlab.com/eic/escalate/g4e)
- [eic_tutorial] (https://argonne_eic.gitlab.io/tutorial/eic_tutorial/part2/adding_detectors/)
- [DD4hep] (https://github.com/AIDAsoft/DD4hep)
......
......@@ -3,12 +3,12 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
<!-- Some information about detector -->
<info name="Reference Detector" title="Reference Detector"
<info name="Athena Detector" title="Athena Detector"
author="Jihee Kim, Whitney Armstrong"
url="https://eicweb.phy.anl.gov/EIC/detectors/reference_detector.git"
url="https://eicweb.phy.anl.gov/EIC/detectors/athena.git"
status="development"
version="v1 2021-03-16">
<comment>Reference Detector</comment>
<comment>Athena Detector</comment>
</info>
<define>
......
......@@ -35,7 +35,7 @@ SKIP_EVENTS=0
DETECTOR_ONLY=0
FILE_TAG="view"
DAWN_RUN_DIR="scripts/view1"
DETECTOR_FILE="${DETECTOR_PATH}/reference_detector.xml"
DETECTOR_FILE="${DETECTOR_PATH}/athena.xml"
POSITIONAL=()
while [[ $# -gt 0 ]]
......@@ -98,7 +98,7 @@ rm -f *.prim
if [ "${DETECTOR_ONLY}" -eq "1" ] ; then
./scripts/run_detector_simulation.py \
--compact ${DETECTOR_PATH}/reference_detector.xml \
--compact ${DETECTOR_PATH}/athena.xml \
-i scripts/input_data/few_events.hepmc \
-o derp.root -n 1 \
--ui csh --vis -b -m macro/dawn_picture.mac &
......@@ -116,7 +116,7 @@ else
echo " Running simulation for tracks"
./scripts/run_detector_simulation.py \
--compact ${DETECTOR_PATH}/reference_detector.xml \
--compact ${DETECTOR_PATH}/athena.xml \
-i scripts/input_data/few_events.hepmc \
-o derp.root -s ${SKIP_EVENTS} -n 1 \
--ui csh --vis -b -m macro/dawn_picture2.mac &
......
<lccdd>
<comment>Initial implementation of the Reference Detector
<comment>Initial implementation of the Athena Detector
DIRC (ported from g4e). Currently constructed around
a fixed radius of 83.65cm (between the uRWEL layers).
TODO: this needs to be properly parameterized.
......
#ReferenceDetector
#AthenaDetector
{% for image_path in images %}
......
......@@ -12,7 +12,7 @@ parser = argparse.ArgumentParser(
This program should be run in the "compact" directory.
''')
parser.add_argument("-v","--verbose", help="increase output verbosity", type=int, default=0)
parser.add_argument("--compact", help="compact detector file",default="reference_detector.xml")
parser.add_argument("--compact", help="compact detector file",default="athena.xml")
parser.add_argument("--vis", help="vis true/false", action="store_true",default=False)
parser.add_argument("--ui", help="ui setting tcsh or qt; default=qt", type=str,default="qt",dest="ui")
parser.add_argument("-b","--batch", help="batch turns off vis/ui", action="store_true",default=False, dest="batch")
......@@ -86,7 +86,7 @@ def run():
outputfile = args.output
if outputfile is None:
outputfile = 'data/reference_detector_' + time.strftime('%Y-%m-%d_%H-%M')
outputfile = 'data/athena_' + time.strftime('%Y-%m-%d_%H-%M')
#rootoutput = geant4.setupROOTOutput('RootOutput', outputfile)
#rootoutput.HandleMCTruth = True
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment