Compare revisions

2608ed0d · 78e317ee · 914cd35e · fbe2324a · e8ab7003 · 6f333ba0
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,10 @@ ip6

 *.swp

+fieldmaps
+
+manifest.txt
+acts.txt
+acts2.txt
+
+materials-map.cbor
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ workflow:
    - if: '$CI_PIPELINE_SOURCE == "web"'
    - if: '$CI_PIPELINE_SOURCE == "webide"'
    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_BRANCH == "acadia"'
    - if: '$CI_COMMIT_TAG'

 default:
@@ -30,10 +31,9 @@ default:

 stages:
  - config
-  - initialize
  - build
+  - test
  - docs
-  - test 
  - collect
  - finalize 
  - deploy
@@ -47,7 +47,7 @@ common:setup:
  script:
    - export JUGGLER_DETECTOR="athena"
    - |
-      if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event"  || "$CI_COMMIT_BRANCH" == "master" ]]; then
+      #      if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event"  || "$CI_COMMIT_BRANCH" == "master" ]]; then
        export JUGGLER_DETECTOR_VERSION="${CI_COMMIT_REF_NAME}"
        echo "BEAMLINE_CONFIG          = ${BEAMLINE_CONFIG}"
        echo "BEAMLINE_CONFIG_VERSION  = ${BEAMLINE_CONFIG_VERSION}"
@@ -55,45 +55,42 @@ common:setup:
        echo "JUGGLER_DETECTOR_VERSION = ${CI_COMMIT_REF_NAME}"
        echo "JUGGLER_DETECTOR_VERSION=$CI_COMMIT_REF_NAME" >> juggler.env
        echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
-      fi
+        #fi
    - source setup/bin/env.sh && ./setup/bin/install_common.sh

 common:detector:
-  stage: initialize
-  needs: ["common:setup"]
+  stage: build
+  needs: 
+    - common:setup
  script:
-    - source .local/bin/env.sh && build_detector.sh
-    - mkdir_local_data_link sim_output
+    #- source .local/bin/env.sh && build_detector.sh
+    - build_detector.sh
    - mkdir -p results
    - mkdir -p config
    - mkdir -p doc
    - mkdir -p geo
    - print_env.sh

-compile:
+build:simple:
  stage: build
-  needs:
-    - ["common:detector"]
  script:
    - mkdir -p build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j20 && make install  && cd ..
    - echo "Build successful."

+
 .views:
  stage: docs
+  tags:
+    - phy-scratch
  before_script:
    - source .local/bin/env.sh
-      #    - sed -i 's?<support inside?<\!--support inside?' compact/ecal_barrel_hybrid.xml 
-      #    - sed -i 's?</support>?</support-->?' compact/ecal_barrel_hybrid.xml
-      #    - sed -i 's?<fiber material?<\!--fiber material?' compact/ecal_barrel_interlayers.xml 
-      #    - sed -i 's?</fiber>?</fiber-->?' compact/ecal_barrel_interlayers.xml
-      #    - echo $DETECTOR_PATH
-      #    - cp compact/ecal_barrel_interlayers.xml ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml
    - env
    - pip3 install psutil
  needs:
    - ["common:detector"]

 include:
+  - local: 'views/generate_prim_files.yml'
  - local: 'views/view1.yml'
  - local: 'views/view2.yml'
  - local: 'views/view3.yml'
@@ -111,15 +108,46 @@ dump_geometry:
  needs:
    - common:detector
  script:
-   - echo "dumping geometry"
-   - mkdir -p geo
-   ## full geo with downstream beamline
-   - 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}/athena.xml
-   - sed -i '/far_forward/d' ${DETECTOR_PATH}/athena.xml
-   - dd_web_display --output geo/detector_geo.root ${DETECTOR_PATH}/athena.xml
-   - echo "Geometry viewer at https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/detector_geo_full.root?job=dump_geometry&item=default;1&opt=clipxyz;transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all&"
+    - echo "dumping geometry"
+    ## DEBUG
+    - echo "LD_LIBRARY_PATH - $LD_LIBRARY_PATH"
+    - echo "PATH - $PATH"
+    - print_env.sh
+    ## DEBUG
+    - mkdir -p geo
+    - |
+      sed -i -e '/<detectors>/,/<\/detectors>/d' ${DETECTOR_PATH}/compact/tracking_config*.xml
+      mv ${DETECTOR_PATH}/compact/display_geoviewer.xml ${DETECTOR_PATH}/compact/display.xml
+      for xml in ${DETECTOR_PATH}/compact/subsystem_views/*.xml; do
+        echo $xml
+        geo_name=`basename $xml .xml`_geo.root
+        cp $xml ${DETECTOR_PATH}/geo.xml
+        dd_web_display --output geo/${geo_name} ${DETECTOR_PATH}/geo.xml
+      done
+    ## Lower-resolution display of the pfRICH sensors for global views
+    - sed -i 's/_default"\/>/_lores"\/>/' ${DETECTOR_PATH}/compact/pfrich.xml
+    ## full geo with downstream beamline
+    - 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}/athena.xml
+    - sed -i '/beampipe_hadron_B0/d' ${DETECTOR_PATH}/athena.xml
+    - sed -i '/B0_/d' ${DETECTOR_PATH}/athena.xml
+    - sed -i '/far_forward_offM/d' ${DETECTOR_PATH}/athena.xml
+    - sed -i '/far_forward_detectors/d' ${DETECTOR_PATH}/athena.xml
+    - sed -i '/roman_pots/d' ${DETECTOR_PATH}/athena.xml
+    - sed -i '/inner_vacuum_FF_magnets/d' ${DETECTOR_PATH}/athena.xml
+    - dd_web_display --output geo/detector_geo.root ${DETECTOR_PATH}/athena.xml
+    ## print some useful output
+    - |
+      echo "Geometry viewer at:"
+      echo "https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/detector_geo_full.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all"
+      echo " - Central detector view at: "
+      echo "https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/detector_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all"
+      for xml in ${DETECTOR_PATH}/compact/subsystem_views/*.xml; do
+        geo_name=`basename $xml .xml`_geo.root
+        echo " - Subsystem view for `basename $xml .xml` at:"
+        echo "   https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/${geo_name}?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY320;ROTZ340;trz0;trr0;ctrl;all"
+      done

 detector_documentation:
  stage: docs
@@ -130,7 +158,7 @@ detector_documentation:
    - bash bin/build_documentation | tee doc/detector.md
      #- |
      #  xmllint --format --xpath '//comment/text()' ${DETECTOR_PATH}/athena.xml | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee  doc/detector.md
-      #  xmllint --format --xpath '//comment/text()' ${DETECTOR_PATH}/ip6/ip6_defs.xml | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee -a doc/detector.md || true
+      #  xmllint --format --xpath '//comment/text()' ${DETECTOR_PATH}/ip6/definitions.xml | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee -a doc/detector.md || true
      #  for afile in ${DETECTOR_PATH}/compact/*.xml ; do
      #    xmllint --format --xpath '//comment/text()' ${afile} | sed -re 's/<\/?\w+>//g' | sed 's/^[[:space:]]*#/#/' | tee -a doc/detector.md || true
      #  done
@@ -151,7 +179,7 @@ report:
    - view_20
    - dump_constants
    - dump_geometry
-    - convert_to_gdml
+    - dump_gdml
  script:
    - pip3 install jinja2 &&  ls -lrth
    - ./bin/make_images > doc/dawn_views.md
@@ -169,26 +197,53 @@ overlap_check_tgeo:
  needs: 
    - ["common:detector"]
  script:
+    ## disable fibers in ECAL for normal overlap check
+    - sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml
+    - sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward/ZDC_Ecal_WSciFi.xml
    - checkOverlaps -c ${DETECTOR_PATH}/athena.xml  | tee doc/overlap_check_tgeo.out 
    - echo "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l) overlaps..."
    - if [[ "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi

-overlap_check_geant4:
+overlap_check_geant4:full_fast:
  stage: test
  needs: 
    - ["common:detector"]
  script:
+    ## disable fibers in ECAL for normal overlap check
+    - sed -i '/<fiber/,+6d' ${DETECTOR_PATH}/compact/ecal_barrel_interlayers.xml
+    - sed -i '/<fiber/,+4d' ${DETECTOR_PATH}/ip6/far_forward/ZDC_Ecal_WSciFi.xml
+    ## reduce the number of fibers in Hadron EMCal for overlap check
+    ## not needed, as we are running with a different setup now
+    #- sed -i 's/radius="EcalEndcapP_FiberRadius"/radius="EcalEndcapP_FiberRadius*10"/' ${DETECTOR_PATH}/compact/ci_ecal_scfi.xml
    - python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/athena.xml | tee doc/overlap_check_geant4.out
    - echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..."
    - if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi

-convert_to_gdml:
+## TODO: add real full overlap check as child pipeline to run on branches only
+
+overlap_check_geant4:inner_detector:
+  stage: test
+  needs: 
+    - ["common:detector"]
+  script:
+    - cp ${DETECTOR_PATH}/compact/subsystem_views/inner_detector.xml ${DETECTOR_PATH}/inner_detector.xml
+    - python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/inner_detector.xml | tee doc/overlap_check_geant4.out
+    - echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..."
+    - if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
+
+dump_gdml:
  stage: test
  needs: 
    - ["common:detector"]
  script:
    - mkdir -p geo
-    - python scripts/convert_to_gdml.py --compact ${DETECTOR_PATH}/athena.xml --output geo/athena.gdml
+    - |
+      python scripts/convert_to_gdml.py --compact ${DETECTOR_PATH}/athena.xml --output geo/athena.gdml
+      for xml in ${DETECTOR_PATH}/compact/subsystem_views/*.xml; do
+        cp $xml ${DETECTOR_PATH}/geo.xml
+        gdml_name=`basename $xml .xml`.gdml
+        python scripts/convert_to_gdml.py --compact ${DETECTOR_PATH}/geo.xml --output geo/${gdml_name}
+      done

 tracking_geometry_debug:
  stage: test
@@ -214,26 +269,6 @@ benchmarks:detector:
  trigger:
    project: EIC/benchmarks/detector_benchmarks
    strategy: depend
-  needs: ["overlap_check_tgeo","report"]
-
-    #benchmarks:reconstruction:
-    #  stage: deploy
-    #  variables:
-    #    JUGGLER_DETECTOR: "$JUGGLER_DETECTOR"
-    #    JUGGLER_DETECTOR_VERSION: "$JUGGLER_DETECTOR_VERSION"
-    #  trigger:
-    #    project: EIC/benchmarks/reconstruction_benchmarks
-    #    strategy: depend
-    #  needs: ["env","overlap_check_tgeo","overlap_check_geant4","report"]
-    #  
-    #
-    #benchmarks:physics:
-    #  stage: deploy
-    #  variables:
-    #    JUGGLER_DETECTOR: "$JUGGLER_DETECTOR"
-    #    JUGGLER_DETECTOR_VERSION: "$JUGGLER_DETECTOR_VERSION"
-    #  trigger:
-    #    project: EIC/benchmarks/physics_benchmarks
-    #    strategy: depend
-    #  needs: ["env","overlap_check_tgeo","overlap_check_geant4","report"]
-
+  needs: 
+    - overlap_check_geant4:full_fast
+    - common:detector
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+
+# CMP0074: find_package() uses <PackageName>_ROOT variables
+cmake_policy(SET CMP0074 NEW)
+
 PROJECT(athena
  VERSION 0.0.1
  LANGUAGES CXX
@@ -6,9 +10,18 @@ PROJECT(athena
  )

 set(CMAKE_CXX_STANDARD 17)
-find_package( DD4hep REQUIRED COMPONENTS DDCore DDG4 )
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")

-find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep )
+find_package(DD4hep REQUIRED COMPONENTS DDCore DDG4)
+find_package(ActsDD4hep)
+if(ActsDD4hep_FOUND)
+  add_compile_definitions(USE_ACTSDD4HEP)
+  set(ActsDD4hep ActsDD4hep::ActsDD4hep)
+else()
+  find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep)
+  set(ActsDD4hep ActsCore ActsPluginDD4hep)
+endif()
+find_package(fmt REQUIRED)

 #-----------------------------------------------------------------------------------
 set(a_lib_name athena)
@@ -16,29 +29,32 @@ set(a_lib_name athena)
 dd4hep_configure_output()

 dd4hep_add_plugin(${a_lib_name} SOURCES 
-  src/BackwardGEMTracker_geo.cpp
+  src/BarrelBarDetectorWithSideFrame_geo.cpp
  src/BarrelCalorimeter_geo.cpp
-  src/BarrelCalorimeterHybrid_geo.cpp
  src/BarrelCalorimeterInterlayers_geo.cpp
  src/BarrelTrackerWithFrame_geo.cpp
+  src/CompositeTracker_geo.cpp
  src/CylinderTrackerBarrel_geo.cpp
  src/DIRC_geo.cpp
-  src/DRich_geo.cpp
+  src/DRICH_geo.cpp
+  src/PFRICH_geo.cpp
+  src/FileLoader.cpp
  src/FieldMapBrBz.cpp
  src/GaseousRICH_geo.cpp
  src/GeometryHelpers.cpp
  src/HomogeneousCalorimeter_geo.cpp
+  src/HybridCalorimeter_geo.cpp
  src/MRich_geo.cpp
  src/PolyhedraEndcapCalorimeter2_geo.cpp
+  src/ScFiCalorimeter_geo.cpp
  src/ShashlikCalorimeter_geo.cpp
-  src/SimpleDiskTracker_geo.cpp
-  src/SimpleRectangularTracker_geo.cpp
+  src/SimpleDiskDetector_geo.cpp
  src/SolenoidCoil_geo.cpp
  src/TrapEndcapTracker_geo.cpp
-  USES ActsCore ActsPluginDD4hep
+  USES ${ActsDD4hep}
  )
 target_link_libraries(${a_lib_name}
-  PUBLIC DD4hep::DDCore  DD4hep::DDRec
+  PUBLIC DD4hep::DDCore DD4hep::DDRec fmt::fmt
  )

 #-----------------------------------------------------------------------------------
@@ -54,3 +70,8 @@ install(DIRECTORY compact/
 install(FILES athena.xml
    DESTINATION share/${PROJECT_NAME}/
    )
+#-----------------------------------------------------------------------------------
+# Install the detector calibration files.
+install(DIRECTORY calibrations/
+    DESTINATION share/${PROJECT_NAME}/calibrations
+    )
--- a/README.md
+++ b/README.md
@@ -3,22 +3,34 @@ Overview
 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/473/jobs/artifacts/master/raw/geo/detector_geo.root?job=report&item=default;1&opt=clipxyz;transp30;zoom100;ROTY0;ROTZ0;trz100;trr0;ctrl;all&)
- [Full Detector geometry (including beamline)](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/api/v4/projects/473/jobs/artifacts/master/raw/geo/detector_geo_full.root?job=report&item=default;1&opt=clipxyz;transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all&)
-
-<a href="https://eicweb.phy.anl.gov/api/v4/projects/473/jobs/artifacts/master/raw/images/view01.pdf?job=report">
-<img src="https://eicweb.phy.anl.gov/api/v4/projects/473/jobs/artifacts/master/raw/images/view01.png?job=report" width="400px" />
+- [Central detector](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/detector_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all)
+- [Full Detector (including beamline)](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/detector_geo_full.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all)
+- [Inner detector (without calorimetry)](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/inner_detector_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY320;ROTZ340;trz0;trr0;ctrl;all)
+- Subsystem views:
+  - [Calorimetry](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/calorimeters_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all)
+  - [PID](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/pid_only_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY320;ROTZ340;trz0;trr0;ctrl;all)
+    - [dRICH](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/drich_only_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY290;ROTZ350;trz0;trr0;ctrl;all)
+    - [pfRICH](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/pfrich_only_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom55;ROTY49;ROTZ350;trz0;trr0;ctrl;all&)
+    - [DIRC](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/dirc_only_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all)
+    - [ToF](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/tof_only_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom55;ROTY49;ROTZ350;trz0;trr0;ctrl;all&)
+  - [Tracking](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/tracking_only_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY320;ROTZ340;trz0;trr0;ctrl;all)
+    - [Vertex detector](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/vertex_only_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom120;ROTY320;ROTZ340;trz0;trr0;ctrl;all)
+  - [Far-forward](https://eic.phy.anl.gov/geoviewer/index.htm?nobrowser&file=https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/geo/ip6_geo.root?job=dump_geometry&item=default;1&opt=clipx;clipy;transp30;zoom40;ROTY290;ROTZ350;trz0;trr0;ctrl;all)
+
+<a href="https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/images/view01.pdf?job=report">
+<img src="https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/images/view01.png?job=report" width="400px" />
 </a>

 <br />
-<a href="https://eicweb.phy.anl.gov/api/v4/projects/473/jobs/artifacts/master/raw/images/view01_top.pdf?job=report">
-<img src="https://eicweb.phy.anl.gov/api/v4/projects/473/jobs/artifacts/master/raw/images/view01_top.png?job=report" width="400px" />
+<a href="https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/images/view01_top.pdf?job=report">
+<img src="https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/images/view01_top.png?job=report" width="400px" />
 </a>

 [Browse latest](https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/browse/images?job=report)

-[Detector views](views/detector_views.md)
+[Detector views](https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/doc/dawn_views.md?job=report)

+[Constants listing](https://eicweb.phy.anl.gov/EIC/detectors/athena/-/jobs/artifacts/master/raw/doc/constants.out?job=report)

 Getting Started
 ---------------

--- a/athena.xml
+++ b/athena.xml
@@ -33,7 +33,8 @@
      The ip6 (or other ip) defines should be included first.
      These files have only a define tags.
  </documentation>
-    <include ref="ip6/ip6_defs.xml" /> 
+    <include ref="ip6/definitions.xml" /> 
+    <include ref="ip6/far_forward/fields_275.xml" />
    <include ref="compact/definitions.xml" />
  </define>

@@ -83,14 +84,6 @@
     - and more...
  </documentation>

-  <comment>
-      Beamline elements
-      -----------------
-  </comment>
-  <include ref="ip6/forward_ion_beamline.xml"/>
-  <include ref="ip6/beampipe_hadron_B0.xml" />
-  <include ref="ip6/beampipe.xml" />
-
  <documentation level="5">
     ## Main magnet

@@ -98,73 +91,20 @@
  </documentation>
  <include ref="compact/solenoid.xml"/>

-  <documentation level="5">
-      ### Tracker subassemblies for ACTS
-  </documentation>
-  <detectors>
-    <detector id="VertexBarrelSubAssembly_ID"
-      name="VertexBarrelSubAssembly"
-      type="DD4hep_SubdetectorAssembly"
-      vis="TrackerSubAssemblyVis">
-      <composite name="VertexBarrel" />
-    </detector>
-    <detector id="VertexEndcapSubAssembly_ID"
-      name="VertexEndcapSubAssembly"
-      type="DD4hep_SubdetectorAssembly"
-      vis="TrackerSubAssemblyVis">
-      <composite name="VertexEndcapN" />
-      <composite name="VertexEndcapP" />
-    </detector>
-
-    <detector id="TrackerBarrelSubAssembly_Inner_ID"
-      name="TrackerBarrelSubAssembly_Inner"
-      type="DD4hep_SubdetectorAssembly"
-      vis="TrackerSubAssemblyVis">
-      <composite name="TrackerBarrel_Inner"/>
-    </detector>
-    <detector id="TrackerEndcapSubAssembly_Inner_ID"
-      name="TrackerEndcapSubAssembly_Inner"
-      type="DD4hep_SubdetectorAssembly"
-      vis="TrackerSubAssemblyVis">
-      <composite name="TrackerEndcapN_Inner"/>
-      <composite name="TrackerEndcapP_Inner"/>
-    </detector>
-
-    <detector id="TrackerBarrelSubAssembly_Outer_ID"
-      name="TrackerSubAssembly_Outer"
-      type="DD4hep_SubdetectorAssembly"
-      vis="TrackerSubAssemblyVis">
-      <composite name="TrackerBarrel_Outer"/>
-      <composite name="TrackerEndcapP_Outer"/>
-      <composite name="TrackerEndcapN_Outer"/>
-    </detector>
-
-    <detector id="TOFSubAssembly_ID"
-      name="TOFSubAssembly"
-      type="DD4hep_SubdetectorAssembly"
-      vis="TOFSubAssemblyVis">
-      <composite name="BarrelTOF"/>
-      <composite name="ForwardTOF"/>
-      <composite name="BackwardTOF"/>
-    </detector>
-
-  </detectors>
-
  <documentation level="10">
    ## Central tracking detectors
  </documentation>

-  <include ref="compact/tracking_config_silicon.xml"/>
-
-  <!--include ref="compact/tracking_config_mgpds.xml"/-->
+  <!--include ref="compact/tracking_config_acadia.xml"/-->
+  <!--include ref="compact/tracking_config_canyonlands.xml"/-->
+  <include ref="compact/tracking_config_deathvalley.xml"/>

  <documentation level="10">
  ### PID detectors
  </documentation>
-  <!--include ref="compact/dirc.xml"/-->
-  <!--include ref="compact/mrich.xml"/-->
-  <include ref="compact/forward_trd.xml"/>
-  <include ref="compact/drich.xml"/>
+  <!--include ref="compact/pid_config_acadia.xml" /-->
+  <!--include ref="compact/pid_config_canyonlands.xml" /-->
+  <include ref="compact/pid_config_deathvalley.xml" />

  <documentation level="10">
  ## Central calorimetry
@@ -172,74 +112,20 @@
  <include ref="compact/ecal.xml"/>
  <include ref="compact/hcal.xml"/>

+  <documentation level="11">
+  ## Far foward detectors
+  </documentation>
+  <include ref="ip6/central_beampipe.xml"/>

  <documentation level="11">
  ## Far foward detectors
  </documentation>
-  <include ref="ip6/B0_tracker.xml"/>
-  <include ref="ip6/B0_preshower.xml"/>
-  <include ref="ip6/far_forward_offM_tracker.xml"/>
-  <include ref="ip6/far_forward_detectors.xml"/>
-  <include ref="ip6/roman_pots_eRD24_design.xml"/>
-
-  <fields>
-    <field name="B0PF_Magnet" type="MultipoleMagnet">
-      <position x="B0PF_XPosition" y="0" z="B0PF_CenterPosition"/>
-      <rotation x="0" y="B0PF_RotationAngle" z="0"/>
-      <shape type="Tube" rmin="0.0" rmax="B0PF_InnerRadius" dz="B0PF_Length*0.5"/>
-      <coefficient coefficient="B0PF_Bmax" skew="0.0*tesla"/>
-      <!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
-    </field>
-    <field name="B0APF_Magnet" type="MultipoleMagnet">
-      <position x="B0APF_XPosition" y="0" z="B0APF_CenterPosition"/>
-      <rotation x="0" y="B0APF_RotationAngle" z="0"/>
-      <shape type="Tube" rmin="0.0" rmax="B0APF_InnerRadius" dz="B0APF_Length*0.5"/>
-      <coefficient coefficient="B0APF_Bmax" skew="0.0*tesla"/>
-      <!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
-    </field>
-    <field name="Q1APF_Magnet" type="MultipoleMagnet">
-      <position x="Q1APF_XPosition" y="0" z="Q1APF_CenterPosition"/>
-      <rotation x="0" y="Q1APF_RotationAngle" z="0"/>
-      <shape type="Tube" rmin="0.0" rmax="Q1APF_InnerRadius" dz="Q1APF_Length*0.5"/>
-      <coefficient coefficient="Q1APF_Bmax" skew="0.0*tesla"/>
-      <coefficient coefficient="Q1APF_GradientMax" skew="0.0*tesla/cm"/>
-    </field>
-    <field name="Q1BPF_Magnet" type="MultipoleMagnet">
-      <position x="Q1BPF_XPosition" y="0" z="Q1BPF_CenterPosition"/>
-      <rotation x="0" y="Q1BPF_RotationAngle" z="0"/>
-      <shape type="Tube" rmin="0.0" rmax="Q1BPF_InnerRadius" dz="Q1BPF_Length*0.5"/>
-      <coefficient coefficient="Q1BPF_Bmax" skew="0.0*tesla"/>
-      <coefficient coefficient="Q1BPF_GradientMax" skew="0.0*tesla/cm"/>
-    </field>
-    <field name="Q2PF_Magnet" type="MultipoleMagnet">
-      <position x="Q2PF_XPosition" y="0" z="Q2PF_CenterPosition"/>
-      <rotation x="0" y="Q2PF_RotationAngle" z="pi/2.0"/>
-      <shape type="Tube" rmin="0.0" rmax="Q2PF_InnerRadius" dz="Q2PF_Length*0.5"/>
-      <coefficient coefficient="Q2PF_Bmax" skew="0.0*tesla"/>
-      <coefficient coefficient="Q2PF_GradientMax" skew="0.0*tesla/cm"/>
-    </field>
-    <field name="B1PF_Magnet" type="MultipoleMagnet">
-      <position x="B1PF_XPosition" y="0" z="B1PF_CenterPosition"/>
-      <rotation x="0" y="B1PF_RotationAngle" z="0"/>
-      <shape type="Tube" rmin="0.0" rmax="B1PF_InnerRadius" dz="B1PF_Length*0.5"/>
-      <coefficient coefficient="B1PF_Bmax" skew="0.0*tesla"/>
-      <coefficient coefficient="B1PF_GradientMax" skew="0.0*tesla/cm"/>
-    </field>
-    <field name="B1APF_Magnet" type="MultipoleMagnet">
-      <position x="B1APF_XPosition" y="0" z="B1APF_CenterPosition"/>
-      <rotation x="0" y="B1APF_RotationAngle" z="0"/>
-      <shape type="Tube" rmin="0.0" rmax="B1APF_InnerRadius" dz="B1APF_Length*0.5"/>
-      <coefficient coefficient="B1APF_Bmax" skew="0.0*tesla"/>
-      <coefficient coefficient="B1APF_GradientMax" skew="0.0*tesla/cm"/>
-    </field>
-    <field name="B2PF_Magnet" type="MultipoleMagnet">
-      <position x="B2PF_XPosition" y="0" z="B2PF_CenterPosition"/>
-      <rotation x="0" y="B2PF_RotationAngle" z="0"/>
-      <shape type="Tube" rmin="0.0" rmax="B2PF_InnerRadius" dz="B2PF_Length*0.5"/>
-      <coefficient coefficient="B2PF_Bmax" skew="0.0*tesla"/>
-      <coefficient coefficient="B2PF_GradientMax" skew="0.0*tesla/cm"/>
-    </field>
-  </fields>
+  <include ref="ip6/far_forward.xml"/>
+
+  <documentation level="11">
+  ## Far backward detectors
+  </documentation>
+  <include ref="ip6/far_backward.xml"/>

  <comment>
      FB elements

--- a/bin/generate_prim_file
+++ b/bin/generate_prim_file
+#!/usr/local/bin/python
+
+# same as make_dawn_views but stops at generating the prim file.
+# W. Armstrong (ANL), original bash script
+# C. Peng (ANL), translate to python and add flexible run time for simulation
+
+import os
+import signal
+import subprocess
+import argparse
+import atexit
+import time
+from datetime import datetime
+import fcntl
+import psutil
+
+
+def readline_nonblocking(output):
+    fd = output.fileno()
+    fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+    fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+    try:
+        return output.readline()
+    except:
+        return ''
+
+
+# arguments
+parser = argparse.ArgumentParser()
+
+parser.add_argument('-c', '--compact-file', type=str, dest='compact',
+        default=os.path.join(os.environ.get('DETECTOR_PATH', '.'), 'athena.xml'),
+        help='Top level compact file for detectors')
+
+parser.add_argument('-s', '--skip', type=int,
+        default=0,
+        help='Number of events number to skip in the input')
+
+parser.add_argument('-i', '--input', type=str,
+        default='scripts/input_data/few_events.hepmc',
+        help='Input hepmc file')
+
+parser.add_argument('-o', '--output-dir', type=str, dest='out_dir',
+        default='sim_output',
+        help='output directory')
+
+parser.add_argument('-D', '--detector-only', action='store_true', dest='detector_only',
+        help='only generate the prim files for the detector geometry')
+
+parser.add_argument('-t', '--tag', type=str,dest='file_tag',
+        default='view',
+        help='Output file tag')
+
+parser.add_argument('--timeout', type=int,
+        default=3600,
+        help='Timeout in seconds')
+
+parser.add_argument('passthrough', nargs='*')
+
+args = parser.parse_args()
+
+macro = 'macro/dawn_picture.mac' if args.detector_only else 'macro/dawn_picture2.mac'
+
+# raise error if cannot create a temporary working dir
+# os.makedirs('dawn_view_tmp', exist_ok=False)
+os.makedirs(args.out_dir, exist_ok=True)
+
+# use absolute path so the chdir does not affect them
+args.input = os.path.abspath(args.input)
+args.out_dir = os.path.abspath(args.out_dir)
+args.compact = os.path.abspath(args.compact)
+macro = os.path.abspath(macro)
+
+# adjust fiber radius to reduce the number of fibers
+compact_dir = os.path.dirname(os.path.realpath(args.compact))
+ci_ecal = os.path.join(compact_dir, 'compact', 'ci_ecal_scfi.xml')
+os.system('sed -i \'s/radius=\"EcalEndcapP_FiberRadius\"/radius=\"EcalEndcapP_FiberRadius*10\"/\' {}'.format(ci_ecal))
+
+prim_file = 'g4_0000.prim'
+dawn_env = os.environ.copy()
+dawn_env['DAWN_BATCH'] = 'a'
+# sdir = os.path.dirname(os.path.realpath(__file__))
+
+# Using a python warpper such as npsim introduces some problem in managing the subprocess.
+# The process1 managed by subprocess will generate another process with proc2_pid = proc1_pid + 1, which will not
+# be terminated by terminating or killing the process1.
+# In addition, running Geant4 with vis mode will never exit automatically (it waits for input).
+# Thus the created process 2 will occupy the system resources.
+sim_cmd = ['npsim', '--runType', 'vis',
+        '--compact', args.compact,
+        '--inputFiles', args.input,
+        '--outputFile', 'derp.root',
+        '--numberOfEvents', '1',
+        '--skipNEvents', str(args.skip),
+        '--macroFile', macro]
+
+start = datetime.now()
+elapse = datetime.now() - start
+last_update = datetime.now()
+finished = False
+
+# run simulation
+print(' '.join(sim_cmd))
+p = subprocess.Popen(args=sim_cmd, env=dawn_env,
+                     stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
+__child_pid = p.pid
+while elapse.seconds < args.timeout:
+    line = readline_nonblocking(p.stdout)
+    elapse = datetime.now() - start
+    time_left = args.timeout - elapse.seconds
+    time_str = '[{:02d}:{:02d}]'.format(elapse.seconds // 60, elapse.seconds % 60)
+
+    if time_left < 10:
+        print('{} === TIMEOUT ===: Terminating in {:d} seconds'.format(time_str, time_left))
+
+    if line:
+        decoded_line = line.decode('utf-8').strip()
+        print('{} {}'.format(time_str, decoded_line))
+        # what we are looking for
+        if decoded_line == 'File  {}  is generated.'.format(prim_file):
+            print('{} === FINISHED ===: Got the prim file, terminating.'.format(time_str))
+            finished = True
+            break
+        if decoded_line == 'Idle>':
+            p.stdin.write(b'exit')
+            break
+        # do not sleep
+        continue
+
+    # ended early before file
+    if p.poll() is not None:
+        print(p.poll())
+        break
+
+    time.sleep(1)
+
+p.kill()
+# use to kill the subprocess generated from the python wrapper
+# this is unsafe so maybe more checks required
+for proc in psutil.process_iter():
+    pinfo = proc.as_dict(attrs=['pid', 'name', 'create_time'])
+    if pinfo['pid'] == p.pid + 1 and pinfo['name'] == 'python':
+        print('kill {}, generated from {}'.format(pinfo, p.pid))
+        os.kill(pinfo['pid'], signal.SIGTERM)
+
+# revert the change
+os.system('sed -i \'s/radius=\"EcalEndcapP_FiberRadius*10\"/radius=\"EcalEndcapP_FiberRadius\"/\' {}'.format(ci_ecal))
+
+line = b'stderr outputs:\n'
+while line:
+    print(line.decode('utf-8'), end='')
+    line = readline_nonblocking(p.stderr)
+
+if finished:
+    print('Simulation finished')
+else:
+    print('Simulation failed')
+    exit(1)
+
+# move the prim files (which can be quite large)
+# to the local pipeline storage path
+os.system('mv g4_0000.prim {}/{}.prim'.format(args.out_dir,args.file_tag))
+
+
--- a/bin/make_dawn_views
+++ b/bin/make_dawn_views
@@ -36,8 +36,8 @@ parser.add_argument('-s', '--skip', type=int,
        default=0,
        help='Number of events number to skip in the input')

-parser.add_argument('-i', '--input', type=str,
-        default='scripts/input_data/few_events.hepmc',
+parser.add_argument('-i', '--input', type=str, dest='input',
+        default='sim_output',
        help='Input hepmc file')

 parser.add_argument('-o', '--output-dir', type=str, dest='out_dir',
@@ -51,13 +51,15 @@ parser.add_argument('-d', '--dawn-dir', type=str, dest='dawn_dir',
        default='scripts/view1',
        help='Directory to dawn script dir (with .DAWN files and a generate_eps script)')

-parser.add_argument('-t', '--tag', type=str,
+parser.add_argument('-t', '--tag', type=str,dest='file_tag',
        default='view',
        help='Output file tag')

 parser.add_argument('--timeout', type=int,
        default=60,
        help='Timeout in seconds')
+        
+parser.add_argument('passthrough', nargs='*')

 args = parser.parse_args()

@@ -78,90 +80,20 @@ dawn_env = os.environ.copy()
 dawn_env['DAWN_BATCH'] = 'a'
 # sdir = os.path.dirname(os.path.realpath(__file__))

-# Using a python warpper such as npsim introduces some problem in managing the subprocess.
-# The process1 managed by subprocess will generate another process with proc2_pid = proc1_pid + 1, which will not
-# be terminated by terminating or killing the process1.
-# In addition, running Geant4 with vis mode will never exit automatically (it waits for input).
-# Thus the created process 2 will occupy the system resources.
-sim_cmd = ['npsim', '--runType', 'vis',
-        '--compact', args.compact,
-        '--inputFiles', args.input,
-        '--outputFile', 'derp.root',
-        '--numberOfEvents', '1',
-        '--skipNEvents', str(args.skip),
-        '--macroFile', macro]
-
-start = datetime.now()
-elapse = datetime.now() - start
-last_update = datetime.now()
-finished = False
-
-# run simulation
-print(' '.join(sim_cmd))
-p = subprocess.Popen(args=sim_cmd, env=dawn_env,
-                     stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
-__child_pid = p.pid
-while elapse.seconds < args.timeout:
-    line = readline_nonblocking(p.stdout)
-    elapse = datetime.now() - start
-    time_left = args.timeout - elapse.seconds
-    time_str = '[{:02d}:{:02d}]'.format(elapse.seconds // 60, elapse.seconds % 60)
-
-    if time_left < 10:
-        print('{} === TIMEOUT ===: Terminating in {:d} seconds'.format(time_str, time_left))
-
-    if line:
-        decoded_line = line.decode('utf-8').strip()
-        print('{} {}'.format(time_str, decoded_line))
-        # what we are looking for
-        if decoded_line == 'File  {}  is generated.'.format(prim_file):
-            print('{} === FINISHED ===: Got the prim file, terminating.'.format(time_str))
-            finished = True
-            break
-        if decoded_line == 'Idle>':
-            p.stdin.write(b'exit')
-            break
-        # do not sleep
-        continue
-
-    # ended early before file
-    if p.poll() is not None:
-        print(p.poll())
-        break
-
-    time.sleep(1)
-
-p.kill()
-# use to kill the subprocess generated from the python wrapper
-# this is unsafe so maybe more checks required
-for proc in psutil.process_iter():
-    pinfo = proc.as_dict(attrs=['pid', 'name', 'create_time'])
-    if pinfo['pid'] == p.pid + 1 and pinfo['name'] == 'python':
-        print('kill {}, generated from {}'.format(pinfo, p.pid))
-        os.kill(pinfo['pid'], signal.SIGTERM)
-
-line = b'stderr outputs:\n'
-while line:
-    print(line.decode('utf-8'), end='')
-    line = readline_nonblocking(p.stderr)
-
-if finished:
-    print('Simulation finished')
-else:
-    print('Simulation failed')
-    exit(1)
-

 # generate DAWN images
-prim_file = os.path.abspath(prim_file)
+out_dir = os.path.abspath(args.out_dir)
+input_file = os.path.abspath(args.input)
+#prim_file = '{}/{}.prim'.format(input_dir,args.file_tag)
+#prim_file = os.path.abspath(prim_file)
 owd = os.getcwd()
 os.chdir(args.dawn_dir)
 subprocess.run(['pwd'])
-subprocess.run(['./generate_eps', '-t', args.tag, '-i', prim_file])
+subprocess.run(['./generate_eps', '-t', args.file_tag, '-i', input_file] + args.passthrough)
 subprocess.run(['ls', '-lrth'])

 # upload the results
-os.system('cp *.pdf {}'.format(args.out_dir))
-os.system('cp *.png {}'.format(args.out_dir))
+os.system('cp *.pdf {}'.format(out_dir))
+os.system('cp *.png {}'.format(out_dir))
 os.chdir(owd)

--- a/bin/make_images
+++ b/bin/make_images
@@ -7,9 +7,15 @@ env = Environment(
    autoescape=select_autoescape(['html', 'xml'])
 )

+import os
 import glob

-base_url = "https://eicweb.phy.anl.gov/api/v4/projects/390/jobs/artifacts/master/raw"
+if "CI_PROJECT_ID" in os.environ:
+    CI_PROJECT_ID = str(os.environ["CI_PROJECT_ID"])
+else:
+    CI_PROJECT_ID = "473"
+
+base_url = f"https://eicweb.phy.anl.gov/api/v4/projects/{CI_PROJECT_ID}/jobs/artifacts/master/raw"

 #images = ["images/view2a.png","images/view2b.png", "images/view1.png"]
 images = glob.glob("images/*.png")

--- a/bin/set_beam_energy
+++ b/bin/set_beam_energy
+#!/bin/bash
+
+function print_the_help {
+  echo "USAGE:    --ebeam E --pbeam E -c compact.xml"
+  echo "REQUIRED ARGUMENTS:"
+  echo "          -h|--help     Print this message"
+  echo "          --ebeam       Electron beam energy (5, 10 or 18)"
+  echo "          --pbeam       Ion beam energy (41, 100 or 275)"
+  echo "          -c|--compact  Compact file to set beam energy for"
+  exit
+}
+
+EBEAM=
+PBEAM=
+COMPACT=
+
+while [ $# -gt 0 ]
+do
+  key="$1"
+  case $key in
+    -h|--help)
+      print_the_help
+      ;;
+    --ebeam)
+      EBEAM=$2
+      shift
+      shift
+      ;;
+    --pbeam)
+      PBEAM=$2
+      shift
+      shift
+      ;;
+    -c|--compact)
+      COMPACT=$2
+      shift
+      shift
+      ;;
+    *)    # unknown option
+      echo "unknown option"
+      exit 1
+      ;;
+  esac
+done
+
+echo "Setting beam energies to $EBEAM on $PBEAM for $COMPACT"
+
+if [ -z $COMPACT ]; then
+  echo "Error: no compact file given, use -h for help"
+  exit 1
+fi
+if [ -z $EBEAM ]; then
+  echo "Error: --ebeam argument missing, use -h for help"
+  exit 1
+fi
+if [ -z $PBEAM ]; then
+  echo "Error: --pbeam argument missing, use -h for help"
+  exit 1
+fi
+
+if [[ $PBEAM != "41" &&  $PBEAM != "100" && $PBEAM != "275" ]]; then
+  echo "Error: Ion beam energy should be 41, 100, or 275 GeV"
+  exit 1
+fi
+if [[ $EBEAM != 5 && $EBEAM != 10 && $EBEAM != 18 ]]; then
+  echo "Error: Electron beam energy should be 5, 10, or 18 GeV"
+  exit 1
+fi
+if [ ! -f ${COMPACT} ]; then
+  echo "Error: Compact file ${COMPACT} does not exist"
+  exit 1
+fi
+
+sed -i "s?far_forward_fields_.\{2,3\}.xml?far_forward_fields_${PBEAM}.xml?" athena.xml
+sed -i "s?far_backward_fields_.\{1,2\}.xml?far_backward_fields_${EBEAM}.xml?" athena.xml
--- a/calibrations/README.md
+++ b/calibrations/README.md
+## Calibrations for the ATHENA detector
+
+Calibrations and constants for this ATHENA detector setup. These values are used in the
+reconstruction. Each relevant subsystem that requires calibration data should have
+its own subdirectory with relevant calibration files, preferably in JSON format.
+
+Note that these calibrations are strongly versioned and tied directy to this specific
+detector configuration. Therefore, please do not add an extra layer of versioning in the
+file names, but rather only add those calibrations relevant for this particular setup.
--- a/calibrations/calo_digi_acadia.json
+++ b/calibrations/calo_digi_acadia.json
+{
+    "ecal_neg_endcap": {
+        "readout": "module",
+        "dynamicRange": "20*GeV",
+        "capacityBitsADC": 14,
+        "pedestalMean": 100,
+        "pedestalSigma": 1,
+        "thresholdValue": 3
+    },
+    "hcal_neg_endcap": {
+        "readout": "tile",
+        "dynamicRange": "20*MeV",
+        "capacityBitsADC": 8,
+        "pedestalMean": 20,
+        "pedestalSigma": 0.3,
+        "thresholdValue": 1
+    },
+    "ecal_pos_endcap": {
+        "readout": "module",
+        "dynamicRange": "3*GeV",
+        "capacityBitsADC": 14,
+        "pedestalMean": 100,
+        "pedestalSigma": 0.7,
+        "thresholdValue": 2
+    },
+    "hcal_pos_endcap": {
+        "readout": "tile",
+        "dynamicRange": "3.6*GeV",
+        "capacityBitsADC": 10,
+        "pedestalMean": 20,
+        "pedestalSigma": 0.8,
+        "thresholdValue": 3
+    },
+    "ecal_barrel_imaging": {
+        "readout": "pixel",
+        "dynamicRange": "3*MeV",
+        "capacityBitsADC": 13,
+        "pedestalMean": 100,
+        "pedestalSigma": 14,
+        "thresholdValue": 50
+    },
+    "ecal_barrel_scfi": {
+        "readout": "light_guide",
+        "dynamicRange": "750*MeV",
+        "capacityBitsADC": 14,
+        "pedestalMean": 20,
+        "pedestalSigma": 0.3,
+        "thresholdValue": 1
+    },
+    "hcal_barrel": {
+        "readout": "tile",
+        "dynamicRange": "20*MeV",
+        "capacityBitsADC": 8,
+        "pedestalMean": 20,
+        "pedestalSigma": 0.3,
+        "thresholdValue": 1
+    }
+}
--- a/calibrations/calo_digi_canyonlands.json
+++ b/calibrations/calo_digi_canyonlands.json
+{
+    "ecal_neg_endcap": {
+        "readout": "module",
+        "dynamicRange": "20*GeV",
+        "capacityBitsADC": 14,
+        "pedestalMean": 100,
+        "pedestalSigma": 1,
+        "thresholdValue": 3
+    },
+    "hcal_neg_endcap": {
+        "readout": "tile",
+        "dynamicRange": "20*MeV",
+        "capacityBitsADC": 8,
+        "pedestalMean": 20,
+        "pedestalSigma": 0.3,
+        "thresholdValue": 1
+    },
+    "ecal_pos_endcap": {
+        "readout": "module",
+        "dynamicRange": "3*GeV",
+        "capacityBitsADC": 14,
+        "pedestalMean": 100,
+        "pedestalSigma": 0.7,
+        "thresholdValue": 2
+    },
+    "hcal_pos_endcap": {
+        "readout": "tile",
+        "dynamicRange": "3.6*GeV",
+        "capacityBitsADC": 10,
+        "pedestalMean": 20,
+        "pedestalSigma": 0.8,
+        "thresholdValue": 3
+    },
+    "ecal_barrel_imaging": {
+        "readout": "pixel",
+        "dynamicRange": "3*MeV",
+        "capacityBitsADC": 13,
+        "pedestalMean": 100,
+        "pedestalSigma": 14,
+        "thresholdValue": 50
+    },
+    "ecal_barrel_scfi": {
+        "readout": "light_guide",
+        "dynamicRange": "750*MeV",
+        "capacityBitsADC": 14,
+        "pedestalMean": 20,
+        "pedestalSigma": 0.3,
+        "thresholdValue": 1
+    },
+    "hcal_barrel": {
+        "readout": "tile",
+        "dynamicRange": "20*MeV",
+        "capacityBitsADC": 8,
+        "pedestalMean": 20,
+        "pedestalSigma": 0.3,
+        "thresholdValue": 1
+    }
+}
--- a/calibrations/calo_digi_default.json
+++ b/calibrations/calo_digi_default.json
+calo_digi_canyonlands.json
\ No newline at end of file
--- a/calibrations/calo_digi_table_v3.xlsx
+++ b/calibrations/calo_digi_table_v3.xlsx
--- a/calibrations/emcal_barrel_calibration.json
+++ b/calibrations/emcal_barrel_calibration.json
+{
+    "electron": {
+        "particle_name": "electron",
+        "sampling_fraction": 0.1053739677993623,
+        "sampling_fraction_error": 0.00014385360879111712,
+        "sampling_fraction_error_img": 7.262477989358573e-05,
+        "sampling_fraction_error_scfi": 0.0001238835428684493,
+        "sampling_fraction_img": 0.006008855583640059,
+        "sampling_fraction_scfi": 0.09940809338992981,
+        "thrown_energy": 5.000000028019361
+    }
+}
--- a/calibrations/ffi_zdc.json
+++ b/calibrations/ffi_zdc.json
+{
+    "ffi_zdc_ecal": {
+        "sampling_fraction": 1.0,
+        "minClusterCenterEdep": "3.*MeV",
+        "minClusterHitEdep": "0.1*MeV",
+        "localDistXY": ["50*mm", "50*mm"],
+        "splitCluster": true
+    },
+    "ffi_zdc_hcal": {
+        "sampling_fraction": 1.0,
+        "minClusterCenterEdep": "1.*MeV",
+        "minClusterHitEdep": "0.1*MeV",
+        "localDistXY": ["200*mm", "200*mm"],
+        "splitCluster": false
+    }
+}
--- a/calibrations/material-maps.json
+++ b/calibrations/material-maps.json
--- a/compact/ce_ecal.xml
+++ b/compact/ce_ecal.xml
-<lccdd>
-
-  <define>
-    <constant name="CrystalEndcap_rmin"  value="VertexTrackerBarrel_rmin"/>
-    <constant name="CrystalEndcap_rmax"  value="EcalEndcapN_rmin"/>
-    <constant name="CrystalBox_x_length" value="20.0*mm"/>
-    <constant name="CrystalBox_y_length" value="20.0*mm"/>
-    <constant name="CrystalBox_z_length" value="200.0*mm"/>
-    <constant name="CrystalBox_offset"   value="0.000001*mm"/>
-    <constant name="CrystalEndcap_x_pos" value="0.0*m"/>
-    <constant name="CrystalEndcap_y_pos" value="0.0*m"/>
-    <constant name="CrystalEndcap_z_pos" value="-EcalEndcapN_zmin"/>
-  </define>
-
-
-  <limits>
-  </limits>
-
-  <regions>
-  </regions>
-
-  <!-- Common Generic visualization attributes -->
-  <comment>Common Generic visualization attributes</comment>
-  <display>
-  </display>
-
-  <detectors>
-    <comment>
-      -------------------------------
-      Backwards Endcap EM Calorimeter
-      -------------------------------
-      A layered EM calorimeter with tungsten and silicon (or scintillator) strips
-    </comment>
-    <detector id="ECalEndcapN_ID" 
-      name="EcalEndcapN" 
-      type="athena_PolyhedraEndcapCalorimeter2" 
-      reflect="true" 
-      readout="EcalEndcapHits" 
-      vis="EcalEndcapVis" 
-      calorimeterType="EM_ENDCAP">
-      <position x="0" y="0" z="0"/>
-      <dimensions 
-        numsides="CaloSides" 
-        zmin="EcalEndcapN_zmin" 
-        rmin="EcalEndcapN_rmin" 
-        rmax="EcalBarrel_rmin " />
-      <layer repeat="EcalEndcapNLayer1_NRepeat">
-        <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
-        <slice material="Copper" thickness="EcalCopperThickness"/>
-        <slice material="Kapton" thickness="EcalKaptonThickness"/>
-        <slice material="Air" thickness="EcalAir1Thickness"/>
-      </layer>
-      <layer repeat="EcalEndcapNLayer2_NRepeat">
-        <slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
-        <slice material="Air" thickness="EcalAir2Thickness"/>
-        <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
-        <slice material="Copper" thickness="EcalCopperThickness"/>
-        <slice material="Kapton" thickness="EcalKaptonThickness"/>
-        <slice material="Air" thickness="EcalAir1Thickness"/>
-      </layer>
-      <layer repeat="EcalEndcapNLayer3_NRepeat">
-        <slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
-        <slice material="Air" thickness="EcalAir2Thickness"/>
-        <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
-        <slice material="Copper" thickness="EcalCopperThickness"/>
-        <slice material="Kapton" thickness="EcalKaptonThickness"/>
-        <slice material="Air" thickness="EcalAir1Thickness"/>
-      </layer>
-    </detector>
-
-    <comment>
-      -------------------
-      Crystal Calorimeter
-      -------------------
-      Backward (negative pseudorapidity) angle electron detector
-    </comment>
-    <detector 
-      id="CrystalEndcap_ID" 
-      name="ElectronECAL" 
-      type="CrystalCalorimeterEndcap" 
-      readout="CrystalEcalHits" 
-      vis="GreenVis">
-      <position x="CrystalEndcap_x_pos" y="CrystalEndcap_y_pos" z="CrystalEndcap_z_pos" />
-      <dimensions rmin="CrystalEndcap_rmin" rmax="CrystalEndcap_rmax" x="CrystalBox_x_length" y="CrystalBox_y_length" z="CrystalBox_z_length" delta="CrystalBox_offset"/>
-    </detector>
-  </detectors>
-
-  <!--  Definition of the readout segmentation/definition  -->
-  <readouts>
-    <!--  
-    <readout name="PlaneTrackerHits">
-      <segmentation type="CartesianGridXY" grid_size_x="20.0*mm" grid_size_y="20.0*mm" />
-      <id>system:5,module:4,x:32:-16,y:-16</id>
-    </readout>
-    -->
-    <readout name="CrystalEcalHits">
-      <segmentation type="CartesianGridXY" grid_size_x="CrystalBox_x_length" grid_size_y="CrystalBox_y_length" />
-      <id>system:8,sector:4,module:20,x:48:-8,y:-8</id>
-    </readout>
-    <readout name="EcalEndcapNHits">
-      <segmentation type="CartesianGridXY" grid_size_x="3.5 * mm" grid_size_y="3.5 * mm"/>
-      <id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
-    </readout>
-  </readouts>
-
-  <plugins>
-  </plugins>
-
-</lccdd>
--- a/compact/central_tracker.xml
+++ b/compact/central_tracker.xml
--- a/compact/central_tracker_hybrid_v2.xml
+++ b/compact/central_tracker_hybrid_v2.xml
No results found