src/ref_SolenoidCoil_geo.cpp → src/SolenoidCoil_geo.cpp

@@ -89,4 +89,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
   return sdet;
 }
 
-DECLARE_DETELEMENT(refdet_SolenoidCoil,create_detector)
+DECLARE_DETELEMENT(athena_SolenoidCoil,create_detector)

src/TrapEndcapTracker_geo.cpp

+/** \addtogroup Trackers Trackers
+ * \brief Type: **BarrelTrackerWithFrame**.
+ * \author W. Armstrong
+ *
+ * \ingroup trackers
+ *
+ * @{
+ */
+#include <array>
 #include <map>
 #include "DD4hep/DetFactoryHelper.h"
+#include "DD4hep/Printout.h"
+#include "DD4hep/Shapes.h"
+#include "DDRec/Surface.h"
+#include "DDRec/DetectorData.h"
+#include "XML/Utilities.h"
+#include "XML/Layering.h"
+
+#if defined(USE_ACTSDD4HEP)
+#include "ActsDD4hep/ActsExtension.hpp"
+#include "ActsDD4hep/ConvertMaterial.hpp"
+#else
 #include "Acts/Plugins/DD4hep/ActsExtension.hpp"
-#include "Acts/Definitions/Units.hpp"
+#include "Acts/Plugins/DD4hep/ConvertDD4hepMaterial.hpp"
+#endif
 
 using namespace std;
 using namespace dd4hep;
+using namespace dd4hep::rec;
 using namespace dd4hep::detail;
 
-/*! Endcap Trapezoidal Tracker.
+/** Endcap Trapezoidal Tracker.
  *
  * @author Whitney Armstrong
  *
@@ -23,23 +45,74 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
   DetElement                   sdet(det_name, det_id);
   Assembly                     assembly(det_name);
 
-
   Material  air  = description.material("Air");
   // Volume      assembly    (det_name,Box(10000,10000,10000),vacuum);
   Volume                  motherVol = description.pickMotherVolume(sdet);
   int                     m_id = 0, c_id = 0, n_sensor = 0;
   map<string, Volume>     modules;
   map<string, Placements> sensitives;
+  map<string, std::vector<VolPlane>>        volplane_surfaces;
+  map<string, std::array<double, 2>> module_thicknesses;
   PlacedVolume            pv;
 
 
-  Acts::ActsExtension* detWorldExt = new Acts::ActsExtension();
-  detWorldExt->addType("endcap", "detector");
-  sdet.addExtension<Acts::ActsExtension>(detWorldExt);
+  // ACTS extension
+  {
+    Acts::ActsExtension* detWorldExt = new Acts::ActsExtension();
+    detWorldExt->addType("endcap", "detector");
+    // SJJ probably need to set the envelope here, as ACTS can't figure
+    // that out for Assembly volumes. May also need binning to properly pick up
+    // on the support material @TODO
+    //
+    // Add the volume boundary material if configured
+    for (xml_coll_t bmat(x_det, _Unicode(boundary_material)); bmat; ++bmat) {
+      xml_comp_t x_boundary_material = bmat;
+      Acts::xmlToProtoSurfaceMaterial(x_boundary_material, *detWorldExt, "boundary_material");
+    }
+    sdet.addExtension<Acts::ActsExtension>(detWorldExt);
+  }
 
   assembly.setVisAttributes(description.invisible());
   sens.setType("tracker");
 
+  for (xml_coll_t su(x_det, _U(support)); su; ++su) {
+    xml_comp_t x_support = su;
+    double      support_thickness = getAttrOrDefault(x_support, _U(thickness), 2.0 * mm);
+    double      support_length    = getAttrOrDefault(x_support, _U(length), 2.0 * mm);
+    double      support_rmin      = getAttrOrDefault(x_support, _U(rmin), 2.0 * mm);
+    double      support_zstart    = getAttrOrDefault(x_support, _U(zstart), 2.0 * mm);
+    std::string support_name      = getAttrOrDefault<std::string>(x_support, _Unicode(name), "support_tube");
+    std::string support_vis       = getAttrOrDefault<std::string>(x_support, _Unicode(vis), "AnlRed");
+    xml_dim_t  pos        (x_support.child(_U(position), false));
+    xml_dim_t  rot        (x_support.child(_U(rotation), false));
+    Solid support_solid;
+    if(x_support.hasChild("shape")){
+      xml_comp_t shape(x_support.child(_U(shape)));
+      string     shape_type = shape.typeStr();
+      support_solid  = xml::createShape(description, shape_type, shape);
+    } else {
+      support_solid = Tube(support_rmin, support_rmin + support_thickness, support_length / 2);
+    }
+    Transform3D tr = Transform3D(Rotation3D(),Position(0,0,(reflect?-1.0:1.0) * (support_zstart + support_length / 2)));
+    if ( pos.ptr() && rot.ptr() )  {
+      Rotation3D  rot3D(RotationZYX(rot.z(0),rot.y(0),rot.x(0)));
+      Position    pos3D(pos.x(0),pos.y(0),pos.z(0));
+      tr = Transform3D(rot3D, pos3D);
+    }
+    else if ( pos.ptr() )  {
+      tr = Transform3D(Rotation3D(),Position(pos.x(0),pos.y(0),pos.z(0)));
+    }
+    else if ( rot.ptr() )  {
+      Rotation3D rot3D(RotationZYX(rot.z(0),rot.y(0),rot.x(0)));
+      tr = Transform3D(rot3D,Position());
+    }
+    Material    support_mat       = description.material(x_support.materialStr());
+    Volume      support_vol(support_name, support_solid, support_mat);
+    support_vol.setVisAttributes(description.visAttributes(support_vis));
+    pv = assembly.placeVolume(support_vol, tr);
+    // pv = assembly.placeVolume(support_vol, Position(0, 0, support_zstart + support_length / 2));
+  }
+
   for (xml_coll_t mi(x_det, _U(module)); mi; ++mi, ++m_id) {
     xml_comp_t x_mod = mi;
     string     m_nam = x_mod.nameStr();
@@ -49,12 +122,15 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
     double     x1 = trd.x1();
     double     x2 = trd.x2();
     double     z  = trd.z();
-    double     y1, y2, total_thickness = 0.;
+    double     total_thickness = 0.;
     xml_coll_t ci(x_mod, _U(module_component));
     for (ci.reset(), total_thickness = 0.0; ci; ++ci)
       total_thickness += xml_comp_t(ci).thickness();
 
-    y1 = y2 = total_thickness / 2;
+    double     thickness_so_far = 0.0;
+    double     thickness_sum    = -total_thickness / 2.0;
+    double     y1               = total_thickness / 2;
+    double     y2               = total_thickness / 2;
     Trapezoid m_solid(x1, x2, y1, y2, z);
     Volume m_volume(m_nam, m_solid, vacuum);
     m_volume.setVisAttributes(description.visAttributes(x_mod.visStr()));
@@ -103,6 +179,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
       c_vol.setVisAttributes(description.visAttributes(c.visStr()));
       pv = m_volume.placeVolume(c_vol, Position(0, posY + c_thick / 2, 0));
       if (c.isSensitive()) {
+        module_thicknesses[m_nam] = {thickness_so_far + c_thick/2.0, total_thickness-thickness_so_far - c_thick/2.0};
         //std::cout << " adding sensitive volume" << c_name << "\n";
         sdet.check(n_sensor > 2, "SiTrackerEndcap2::fromCompact: " + c_name + " Max of 2 modules allowed!");
         pv.addPhysVolID("sensor", n_sensor);
@@ -110,8 +187,30 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
         c_vol.setSensitiveDetector(sens);
         sensitives[m_nam].push_back(pv);
         ++n_sensor;
+        // -------- create a measurement plane for the tracking surface attched to the sensitive volume -----
+        Vector3D u(0., 0., -1.);
+        Vector3D v(-1., 0., 0.);
+        Vector3D n(0., 1., 0.);
+        // Vector3D o( 0. , 0. , 0. ) ;
+
+        // compute the inner and outer thicknesses that need to be assigned to the tracking surface
+        // depending on wether the support is above or below the sensor
+        double inner_thickness = module_thicknesses[m_nam][0];
+        double outer_thickness = module_thicknesses[m_nam][1];
+
+        SurfaceType type(SurfaceType::Sensitive);
+
+        // if( isStripDetector )
+        //  type.setProperty( SurfaceType::Measurement1D , true ) ;
+
+        VolPlane surf(c_vol, type, inner_thickness, outer_thickness, u, v, n); //,o ) ;
+        volplane_surfaces[m_nam].push_back(surf);
+
+        //--------------------------------------------
       }
       posY += c_thick;
+      thickness_sum += c_thick;
+      thickness_so_far += c_thick;
     }
     modules[m_nam] = m_volume;
   }
@@ -143,20 +242,25 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
     if (reflect) {
       layer_pv =
           assembly.placeVolume(layer_vol, Transform3D(RotationZYX(0.0, -M_PI, 0.0), Position(0, 0, -layer_center_z)));
-      layer_pv.addPhysVolID("barrel", 3).addPhysVolID("layer", l_id);
+      layer_pv.addPhysVolID("layer", l_id);
       layer_name += "_N";
     } else {
       layer_pv = assembly.placeVolume(layer_vol, Position(0, 0, layer_center_z));
-      layer_pv.addPhysVolID("barrel", 2).addPhysVolID("layer", l_id);
+      layer_pv.addPhysVolID("layer", l_id);
       layer_name += "_P";
     }
     DetElement layer_element(sdet, layer_name, l_id);
     layer_element.setPlacement(layer_pv);
+
     Acts::ActsExtension* layerExtension = new Acts::ActsExtension();
-    layerExtension->addType("layer", "layer");
+    layerExtension->addType("sensitive disk", "layer");
     //layerExtension->addType("axes", "definitions", "XZY");
     //layerExtension->addType("sensitive disk", "layer");
     //layerExtension->addType("axes", "definitions", "XZY");
+    for (xml_coll_t lmat(x_layer, _Unicode(layer_material)); lmat; ++lmat) {
+      xml_comp_t x_layer_material = lmat;
+      xmlToProtoSurfaceMaterial(x_layer_material, *layerExtension, "layer_material");
+    }
     layer_element.addExtension<Acts::ActsExtension>(layerExtension);
 
     for (xml_coll_t ri(x_layer, _U(ring)); ri; ++ri) {
@@ -181,7 +285,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
           DetElement module(layer_element, m_base + "_pos", det_id);
           pv = layer_vol.placeVolume(
               m_vol, Transform3D(RotationZYX(0, -M_PI / 2 - phi, -M_PI / 2), Position(x, y, zstart + dz)));
-          pv.addPhysVolID("barrel", 1).addPhysVolID("layer", l_id).addPhysVolID("module", mod_num);
+          pv.addPhysVolID("module", mod_num);
           module.setPlacement(pv);
           for (size_t ic = 0; ic < sensVols.size(); ++ic) {
             PlacedVolume sens_pv = sensVols[ic];
@@ -190,11 +294,12 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
         //std::cout << " adding ACTS extension" << "\n";
             Acts::ActsExtension* moduleExtension = new Acts::ActsExtension("XZY");
             comp_elt.addExtension<Acts::ActsExtension>(moduleExtension);
+            volSurfaceList(comp_elt)->push_back(volplane_surfaces[m_nam][ic]);
           }
         } else {
           pv = layer_vol.placeVolume(
               m_vol, Transform3D(RotationZYX(0, -M_PI / 2 - phi, -M_PI / 2), Position(x, y, -zstart - dz)));
-          pv.addPhysVolID("barrel", 2).addPhysVolID("layer", l_id).addPhysVolID("module", mod_num);
+          pv.addPhysVolID("module", mod_num);
           DetElement r_module(layer_element, m_base + "_neg", det_id);
           r_module.setPlacement(pv);
           for (size_t ic = 0; ic < sensVols.size(); ++ic) {
@@ -204,6 +309,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
         //std::cout << " adding ACTS extension" << "\n";
             Acts::ActsExtension* moduleExtension = new Acts::ActsExtension("XZY");
             comp_elt.addExtension<Acts::ActsExtension>(moduleExtension);
+            volSurfaceList(comp_elt)->push_back(volplane_surfaces[m_nam][ic]);
           }
         }
         dz = -dz;
@@ -218,6 +324,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
   return sdet;
 }
 
+//@}
 // clang-format off
-DECLARE_DETELEMENT(refdet_TrapEndcapTracker, create_detector)
-DECLARE_DETELEMENT(refdet_GEMTrackerEndcap, create_detector)
+DECLARE_DETELEMENT(athena_TrapEndcapTracker, create_detector)
+DECLARE_DETELEMENT(athena_GEMTrackerEndcap, create_detector)

src/allsilicon_support.cpp

-#include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/OpticalSurfaces.h"
-#include "DD4hep/Printout.h"
-#include "DDRec/DetectorData.h"
-#include "DDRec/Surface.h"
-#include <XML/Helper.h>
-//////////////////////////////////
-// Support structure for ALl-silicon
-//////////////////////////////////
-
-using namespace std;
-using namespace dd4hep;
-
-// Info from
-// https://github.com/reynier0611/g4lblvtx/blob/master/source/AllSi_vtx_serv_2lyr_Detector.cc
-// TODO: this is quite incomplete, should probably wait for official word
-//       from he tracking WG
-
-static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
-{
-  xml_det_t x_det   = e;
-  string    detName = x_det.nameStr();
-  int       detID   = x_det.id();
-  bool      reflect = x_det.reflect();
-  const int sign    = reflect ? -1 : 1;
-
-  // second vertexing layer
-  std::vector<double> z_det   = {15 * cm, 20 * cm};
-  std::vector<double> rin_l2  = {5.48 * cm, 14.8 * cm};
-  std::vector<double> rout_l2 = {0, 0};
-
-  // first vertexing layer
-  std::vector<double> rin_l1  = {3.30 * cm, 14.36 * cm};
-  std::vector<double> rout_l1 = {0, 0};
-
-  const int nzplanes_l2 = z_det.size();
-  const int nzplanes_l1 = z_det.size();
-
-  for (int i = 0; i < nzplanes_l2; i++) {
-    rout_l2[i] = rin_l2[i] + 0.44;
-    z_det[i] *= sign / abs(sign);
-  }
-  for (int i = 0; i < nzplanes_l1; i++) {
-    rout_l1[i] = rin_l1[i] + 0.44;
-    z_det[i] *= sign / abs(sign);
-  }
-  // mother volume
-  std::vector<double> rin_mo  = rin_l1;
-  std::vector<double> rout_mo = rout_l2;
-
-  DetElement det(detName, detID);
-  Material   Vacuum = desc.material("Vacuum");
-  Polycone   empty_cone("empty_cone", 0.0, 360 * degree, z_det, rin_mo, rout_mo);
-  Volume     detVol("empty_cone", empty_cone, Vacuum);
-  detVol.setVisAttributes(desc.invisible());
-
-  Volume       motherVol = desc.pickMotherVolume(det);
-  Transform3D  tr(RotationZYX(0.0, 0.0, 0.0), Position(0.0, 0.0, 0.));
-  PlacedVolume detPV = motherVol.placeVolume(detVol, tr);
-  detPV.addPhysVolID("system", detID);
-  detPV.addPhysVolID("barrel", 1);
-  det.setPlacement(detPV);
-
-  Material Al       = desc.material("Al");
-  Material Graphite = desc.material("Graphite");
-
-  // cb_DIRC_bars_Logic.setVisAttributes(desc.visAttributes(x_det.visStr()));
-
-  Polycone polycone_l2("polycone_l2", 0, 360 * degree, z_det, rin_l2, rout_l2);
-  Volume   logical_l2("polycone_l2_logic", polycone_l2, Al);
-  logical_l2.setVisAttributes(desc.visAttributes(x_det.visStr()));
-  detVol.placeVolume(logical_l2, tr);
-  Polycone polycone_l1("polycone_l1", 0, 360 * degree, z_det, rin_l1, rout_l1);
-  Volume   logical_l1("polycone_l1_logic", polycone_l1, Al);
-  logical_l1.setVisAttributes(desc.visAttributes(x_det.visStr()));
-  detVol.placeVolume(logical_l1, tr);
-
-  return det;
-}
-
-DECLARE_DETELEMENT(allsilicon_support, createDetector)

src/cb_CTD_Si.cpp

-#include <XML/Helper.h>
-#include "DDRec/Surface.h"
-#include "DDRec/DetectorData.h"
-#include "DD4hep/OpticalSurfaces.h"
-#include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
-//////////////////////////////////
-// Central Barrel Tracker Silicon
-//////////////////////////////////
-
-using namespace std;
-using namespace dd4hep;
-
-static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
-{
-  xml_det_t  x_det      = e;
-  string     detName    = x_det.nameStr();
-  int        detID      = x_det.id();
-
-  xml_dim_t  dim        = x_det.dimensions();
-  double     RIn        = dim.rmin();
-  double     ROut       = dim.rmax();
-  double     SizeZ      = dim.length();
-  double     SizeZCut   = dim.zmax();
-  double     SiLayerGap = dim.gap();
-
-  Material   Vacuum     = desc.material("Vacuum");
-
-  // Create Global Volume 
-  Tube cb_CTD_GVol_Solid(RIn, ROut, SizeZ / 2.0, 0., 360.0 * deg);
-  Volume detVol("cb_CTD_GVol_Logic", cb_CTD_GVol_Solid, Vacuum);
-  detVol.setVisAttributes(desc.visAttributes(x_det.visStr()));
-
-  // Construct Silicon Layers
-  xml_comp_t x_layer = x_det.child(_U(layer));
-  const int repeat   = x_layer.repeat();
-  
-  xml_comp_t x_slice = x_layer.child(_U(slice));
-  Material slice_mat = desc.material(x_slice.materialStr());
-  
-  double layerRIn[100];
-  double layerROut[100];
-  
-  // Loop over layers
-  for(int i = 0; i < repeat; i++) {
-    layerRIn[i]  = RIn + (SiLayerGap * i);
-    layerROut[i] = RIn + (0.01 + SiLayerGap * i);
-
-    if (layerROut[i] > ROut)
-      continue; 
-    
-    string logic_layer_name = detName + _toString(i, "_Logic_lay_%d");
-    if (i==7){logic_layer_name = detName + _toString(20, "_Logic_lay_%d");}
-    Volume layerVol(logic_layer_name,Tube(layerRIn[i], layerROut[i], SizeZ / 2.0, 0.0, 360.0 * deg), slice_mat);
-    layerVol.setVisAttributes(desc,x_layer.visStr());
-    sens.setType("tracker");
-    layerVol.setSensitiveDetector(sens);
-
-    Position     layer_pos = Position(0.0, 0.0, 0.0);
-    PlacedVolume layerPV = detVol.placeVolume(layerVol, layer_pos);
-    layerPV.addPhysVolID("layer", i+1);
-  }
-
-  DetElement   det(detName, detID);
-  Volume       motherVol = desc.pickMotherVolume(det);
-  Transform3D  tr(RotationZYX(0.0, 0.0, 0.0), Position(0.0, 0.0, 0.0));
-  PlacedVolume detPV = motherVol.placeVolume(detVol, tr);
-  detPV.addPhysVolID("system", detID);
-  detPV.addPhysVolID("barrel", 1);
-  det.setPlacement(detPV);
-  return det;
-}
-
-DECLARE_DETELEMENT(cb_CTD_Si, createDetector)

src/cb_DIRC.cpp

-#include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/OpticalSurfaces.h"
-#include "DD4hep/Printout.h"
-#include "DDRec/DetectorData.h"
-#include "DDRec/Surface.h"
-#include <XML/Helper.h>
-#include "XML/Layering.h"
-//////////////////////////////////
-// Central Barrel DIRC
-//////////////////////////////////
-
-using namespace std;
-using namespace dd4hep;
-
-static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
-{
-  xml_det_t x_det   = e;
-  string    detName = x_det.nameStr();
-  int       detID   = x_det.id();
-
-  xml_dim_t dim   = x_det.dimensions();
-  xml_dim_t pos   = x_det.position();
-  double    RIn   = dim.rmin();
-  double    ROut  = dim.rmax();
-  double    SizeZ = dim.length();
-
-  Material Vacuum = desc.material("Vacuum");
-  Material mat = desc.material("Quartz");
-  Tube     cb_DIRC_Barrel_GVol_Solid(RIn, ROut, SizeZ / 2.0, 0., 360.0 * deg);
-  Volume   detVol("cb_DIRC_GVol_Solid_Logic", cb_DIRC_Barrel_GVol_Solid, Vacuum);
-  detVol.setVisAttributes(desc.invisible());
-
-  DetElement   det(detName, detID);
-  Volume       motherVol = desc.pickMotherVolume(det);
-  Transform3D  tr(RotationZYX(0.0, 0.0, 0.0), Position(0.0, 0.0, pos.z()));
-  PlacedVolume detPV = motherVol.placeVolume(detVol, tr);
-  detPV.addPhysVolID("system", detID);
-  detPV.addPhysVolID("barrel", 1);
-  det.setPlacement(detPV);
-
-  //////////////////
-  // DIRC Bars
-  //////////////////
-
-  double dR                = dim.radius();
-  double cb_DIRC_bars_DZ   = SizeZ; 
-  double cb_DIRC_bars_DY   = dim.dy();
-  double cb_DIRC_bars_DX   = dim.dx();
-  int    NUM               = dim.number();
-  double cb_DIRC_bars_DPhi = dim.deltaphi();
-
-  Material cb_DIRC_bars_Material = desc.material("Quartz");
-
-  Box    cb_DIRC_bars_Solid(cb_DIRC_bars_DX / 2., cb_DIRC_bars_DY / 2., cb_DIRC_bars_DZ / 2.);
-  Volume cb_DIRC_bars_Logic("cb_DIRC_bars_Logix", cb_DIRC_bars_Solid, cb_DIRC_bars_Material);
-  cb_DIRC_bars_Logic.setVisAttributes(desc.visAttributes(x_det.visStr()));
-  sens.setType("photoncounter");
-  cb_DIRC_bars_Logic.setSensitiveDetector(sens);
-
-  int count = 0;
-  for (xml_coll_t mod(x_det, _U(module)); mod; ++mod) {
-    xml_comp_t x_mod = mod;
-    Transform3D  tr(RotationZ(x_mod.phi()), Position(-x_mod.R() * cos(x_mod.phi()), -x_mod.R() * sin(x_mod.phi()), 0));
-    PlacedVolume barPV = detVol.placeVolume(cb_DIRC_bars_Logic, tr);
-    barPV.addPhysVolID("module", count++);
-  }
-  
-  return det;
-}
-
-DECLARE_DETELEMENT(cb_DIRC, createDetector)

src/cb_VTX_Barrel.cpp

-#include <XML/Helper.h>
-#include "DDRec/Surface.h"
-#include "DDRec/DetectorData.h"
-#include "DD4hep/OpticalSurfaces.h"
-#include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
-//////////////////////////////////
-// Central Barrel Vertex Detector
-//////////////////////////////////
-
-using namespace std;
-using namespace dd4hep;
-
-static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
-{
-  xml_det_t  x_det      = e;
-  string     detName    = x_det.nameStr();
-  int        detID      = x_det.id();
-
-  xml_dim_t  dim        = x_det.dimensions();
-  double     RIn        = dim.rmin();
-  double     ROut       = dim.rmax();
-  double     SizeZ      = dim.length();
-
-  xml_dim_t  pos        = x_det.position();
-
-  Material   Vacuum     = desc.material("Vacuum");
-
-  // Create Global Volume 
-  Tube cb_VTX_Barrel_GVol_Solid(RIn, ROut, SizeZ / 2.0, 0., 360.0 * deg);
-  Volume detVol("cb_VTX_Barrel_GVol_Logic", cb_VTX_Barrel_GVol_Solid, Vacuum);
-  detVol.setVisAttributes(desc.visAttributes(x_det.visStr()));
-
-  //////////////////
-  // Barrel Ladder
-  //////////////////
-  xml_comp_t x_layer = x_det.child(_U(layer));
-  const int repeat   = x_layer.repeat();
-  
-  xml_comp_t x_slice = x_layer.child(_U(slice));
-  Material slice_mat = desc.material(x_slice.materialStr());
-
-  double x = 0.0 * cm;
-  double y = 0.0 * cm;
-  double z = 0.0 * cm;
-  int FDIV = 0;
-  double dR = 0.0;
-  double length = 0.0;
-  double phi = 0.0;
-  // Ladder Layer Parameters
-  double lay_Dx[6];
-  double lay_Dy[6];
-  double lay_Dz[6];
-  double lay_Rin[6];
-  lay_Dx[0] = 0.050 * mm; lay_Dy[0] = 1.0 * cm; lay_Dz[0] = 10.0 * cm; lay_Rin[0] = 3.5 * cm;
-  lay_Dx[1] = 0.050 * mm; lay_Dy[1] = 1.0 * cm; lay_Dz[1] = 11.0 * cm; lay_Rin[1] = 4.5 * cm;
-  lay_Dx[2] = 0.150 * mm; lay_Dy[2] = 2.0 * cm; lay_Dz[2] = 18.0 * cm; lay_Rin[2] = 6.5 * cm;
-  lay_Dx[3] = 0.150 * mm; lay_Dy[3] = 2.0 * cm; lay_Dz[3] = 24.0 * cm; lay_Rin[3] = 10.5 * cm;
-  lay_Dx[4] = 0.150 * mm; lay_Dy[4] = 3.0 * cm; lay_Dz[4] = 36.0 * cm; lay_Rin[4] = 13.5 * cm;
-  lay_Dx[5] = 0.150 * mm; lay_Dy[5] = 3.0 * cm; lay_Dz[5] = 48.0 * cm; lay_Rin[5] = 15.5 * cm;
-
-  int i_layer = 0;
-  int i_module = 0;
-  // Loop over layers
-  for(int i = 0; i < repeat; i++) {
-    double cb_VTX_Barrel_ladder_DZ = lay_Dz[i];
-    double cb_VTX_Barrel_ladder_DY = lay_Dy[i];
-    double cb_VTX_Barrel_ladder_Thickness = lay_Dx[i];
-    dR = lay_Rin[i]; 
-    length = 2.0 * 3.1415 * dR;
-    int laddersCount = length / cb_VTX_Barrel_ladder_DY;
-
-    for (int i = 0; i < 2; i++) {
-      double LN = cb_VTX_Barrel_ladder_DY * laddersCount;
-      double LN1 = cb_VTX_Barrel_ladder_DY * (laddersCount + 1.0 + i);
-
-      if (LN/LN1 > 0.8)
-        laddersCount = laddersCount + 1;
-    }
-
-    double cb_VTX_Barrel_ladder_deltaphi = 2.0 * 3.1415926 / laddersCount;
-
-    string ladderBoxName = detName + _toString(i, "_ladder_Solid_%d");
-    string ladderName = detName + _toString(i, "_ladder_Logic_%d");
-    Volume ladderVol(ladderName, Box(cb_VTX_Barrel_ladder_Thickness * 0.5, cb_VTX_Barrel_ladder_DY * 0.5, cb_VTX_Barrel_ladder_DZ * 0.5), slice_mat);
-    ladderVol.setVisAttributes(desc,x_layer.visStr());
-    sens.setType("tracker");
-    ladderVol.setSensitiveDetector(sens);
-    i_layer++;
-
-    for (int ia = 0; ia < laddersCount; ia++) {
-      phi = (ia * (cb_VTX_Barrel_ladder_deltaphi));
-      x = - dR * cos(phi);
-      y = - dR * sin(phi);
-
-      RotationZYX ladder_rot = RotationZYX(cb_VTX_Barrel_ladder_deltaphi * ia, 0.0, 0.0);
-      Position ladder_pos = Position(x, y, z);
-      string ladderName = detName + _toString(i, "_ladder_Phys_%d") + _toString(ia, "_%d"); 
-      PlacedVolume ladderPV = detVol.placeVolume(ladderVol, Transform3D(ladder_rot, ladder_pos));
-      i_module++;
-      ladderPV.addPhysVolID("layer", i_layer).addPhysVolID("module", i_module);
-    }
-  }
-
-  // TODO: Pixels
-
-  DetElement   det(detName, detID);
-  Volume       motherVol = desc.pickMotherVolume(det);
-  Transform3D  tr(RotationZYX(0.0, 0.0, 0.0), Position(0.0, 0.0, pos.z()));
-  PlacedVolume detPV = motherVol.placeVolume(detVol, tr);
-  detPV.addPhysVolID("system", detID);
-  detPV.addPhysVolID("barrel", 1);
-  det.setPlacement(detPV);
-  return det;
-}
-
-DECLARE_DETELEMENT(cb_VTX_Barrel, createDetector)

views/generate_prim_files.yml

+view_prim:detector_only:
+  extends: .views
+  stage: test
+  script:
+    - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -D -t detector_view
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+
+view_prim:ev001:
+  extends: .views
+  stage: test
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev001 -s 1
+
+view_prim:ev002:
+  extends: .views
+  stage: test
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev002 -s 2
+
+view_prim:ev003:
+  extends: .views
+  stage: test
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev003 -s 3
+
+view_prim:ev004:
+  extends: .views
+  stage: test
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev004 -s 4
+
+
+view_prim:calorimeters:
+  extends: .views
+  stage: test
+  script:
+    - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
+    - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -D -t calorimeters_view
+    - ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
+
+view_prim:calorimeters_ev001:
+  extends: .views
+  stage: test
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
+    - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -t calorimeters_view_ev001 -s 1
+
+view_prim:calorimeters_ev002:
+  extends: .views
+  stage: test
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
+    - ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -t calorimeters_view_ev002 -s 2
+

views/view1.yml

 dawn_view_01:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view01 -d scripts/view1 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view01 -d scripts/view1 -D
+
 dawn_view_01:ev001:
   extends: .views
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  needs:
+    - job: view_prim:ev001
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view01_ev001 -d scripts/view1 -s 1
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view01_ev001 -d scripts/view1 -s 1
+
 dawn_view_01:ev002:
   extends: .views
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  needs:
+    - job: view_prim:ev002
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view01_ev002 -d scripts/view1 -s 2
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim -t view01_ev002 -d scripts/view1 -s 2
 
 view_01:
-  stage: test
-  rules:
-    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
+  stage: collect
   needs:
     - job: dawn_view_01:detector
       optional: false

views/view11.yml

 dawn_view_11:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view11 -d scripts/view11 -D
+
 dawn_view_11:ev000:
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
+  needs:
+    - job: view_prim:ev001
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim  -t view11 -d scripts/view11
+
 dawn_view_11:ev001:
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
+  needs:
+    - job: view_prim:ev001
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 1
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim  -t view11 -d scripts/view11 -s 1
+
 dawn_view_11:ev002:
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
+  needs:
+    - job: view_prim:ev002
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 2
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev003.prim  -t view11 -d scripts/view11 -s 2
 dawn_view_11:ev003:
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
+  needs:
+    - job: view_prim:ev003
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 3
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH} -t view11 -d scripts/view11 -s 3
+
 dawn_view_11:ev004:
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
+  needs:
+    - job: view_prim:ev004
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 4
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH} -t view11 -d scripts/view11 -s 4
 
 view_11:
-  stage: test
+  stage: collect
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:
-    - job: compile
-      optional: false
     - job: dawn_view_11:detector
       optional: false
     - job: dawn_view_11:ev001

views/view12.yml

 dawn_view_12:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view12 -d scripts/view12 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view12 -d scripts/view12 -D -- ${SLICE}
+    - ls -lrth *
+    - ls -lrth images/*
+  parallel:
+    matrix:
+      - SLICE: ["100", "300", "500", "700", "900", "1100", "1300", "1500", "1700", "1900"]
+
 
 view_12:
-  stage: test
+  stage: collect
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:

views/view13.yml

 dawn_view_13:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view13 -d scripts/view13 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view13 -d scripts/view13 -D
 
 view_13:
-  stage: test
+  stage: collect
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:

views/view14.yml

 dawn_view_14:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view14 -d scripts/view14 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view14 -d scripts/view14 -D -- ${SLICE}
+    - ls -lrth *
+    - ls -lrth images/*
+  parallel:
+    matrix:
+      - SLICE: ["100", "300", "500", "700", "900", "1100", "1300", "1500", "1700", "1900"]
 
 view_14:
-  stage: test
+  stage: collect
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:

views/view15.yml

 dawn_view_15:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view15 -d scripts/view15 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view15 -d scripts/view15 -D -- ${SLICE}
+    - ls -lrth *
+    - ls -lrth images/*
+  parallel:
+    matrix:
+      - SLICE: ["100", "300", "500", "700", "900", "1100", "1300", "1500", "1700", "1900"]
 
 view_15:
-  stage: test
+  stage: collect
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:

views/view2.yml

 dawn_view_02:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view02 -d scripts/view2 -D
+
 dawn_view_02:ev001:
   extends: .views
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  needs:
+    - job: view_prim:ev001
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view02_ev001 -d scripts/view2 -s 1
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view02_ev001 -d scripts/view2 -s 1
+
 dawn_view_02:ev002:
   extends: .views
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  needs:
+    - job: view_prim:ev002
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim  -t view02_ev002 -d scripts/view2 -s 2
+
 dawn_view_02:ev003:
   extends: .views
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  needs:
+    - job: view_prim:ev003
+      optional: true
   script:
-    - ./bin/make_dawn_views -t view02_ev003 -d scripts/view2 -s 3
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev003.prim  -t view02_ev003 -d scripts/view2 -s 3
 
 view_02:
-  stage: test
+  stage: collect
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:
@@ -32,7 +47,6 @@ view_02:
       optional: true
     - job: dawn_view_02:ev003
       optional: true
-    #- ["dawn_view_02:detector", "dawn_view_02:ev001", "dawn_view_02:ev002", "dawn_view_02:ev003"]
   script:
     - ls -lrth *
     - ls -lrth images/*

views/view20.yml

+dawn_view_20:detector:
+  extends: .views
+  needs:
+    - job: view_prim:calorimeters
+      optional: false
+  script:
+    - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
+    - ./bin/make_dawn_views -c ${DETECTOR_PATH}/calorimeters.xml -i ${LOCAL_DATA_PATH}/calorimeters_view.prim -t view20 -d scripts/view20 -D
+
+dawn_view_20:ev001:
+  extends: .views
+  needs:
+    - job: view_prim:calorimeters_ev001
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/calorimeters_view_ev001.prim -t view20_ev001 -d scripts/view20 -s 1
+
+dawn_view_20:ev002:
+  extends: .views
+  needs:
+    - job: view_prim:calorimeters_ev002
+      optional: true
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/calorimeters_view_ev002.prim  -t view20_ev002 -d scripts/view20 -s 2
+
+view_20:
+  stage: collect
+  rules:
+    - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
+  needs:
+    - job: dawn_view_20:detector
+      optional: false
+    - job: dawn_view_20:ev001
+      optional: true
+    - job: dawn_view_20:ev002
+      optional: true
+  script:
+    - ls -lrth *
+    - ls -lrth images/*
+

views/view3.yml

 dawn_view_03:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view02 -d scripts/view2 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view03 -d scripts/view3 -D
+
 #dawn_view_03:ev001:
 #  extends: .views
+#  needs:
+#    - job: view_prim:ev001
+#      optional: true
 #  script:
-#    - ./bin/make_dawn_views -t view02_ev001 -d scripts/view2 -s 1
+#    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view03_ev001 -d scripts/view3 -s 1
+
 dawn_view_03:ev002:
   extends: .views
+  needs:
+    - job: view_prim:ev002
+      optional: true
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim  -t view03_ev002 -d scripts/view3 -s 2
 
 view_03:
-  stage: test
+  stage: collect
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:

views/view6.yml

 dawn_view_06:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view06 -d scripts/view6 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view06 -d scripts/view6 -D
+
 dawn_view_06:ev001:
   extends: .views
+  needs:
+    - job: view_prim:ev001
+      optional: true
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view06_ev001 -d scripts/view6 -s 1
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view06_ev001 -d scripts/view6 -s 1
+
 dawn_view_06:ev002:
   extends: .views
+  needs:
+    - job: view_prim:ev002
+      optional: true
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view06_ev002 -d scripts/view6 -s 2
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim  -t view06_ev002 -d scripts/view6 -s 2
+
 dawn_view_06:ev003:
   extends: .views
+  needs:
+    - job: view_prim:ev003
+      optional: true
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view06_ev003 -d scripts/view6 -s 3
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev003.prim  -t view06_ev003 -d scripts/view6 -s 3
+
 dawn_view_06:ev004:
   extends: .views
+  needs:
+    - job: view_prim:ev004
+      optional: true
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view06_ev004 -d scripts/view6 -s 4
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH} -t view06_ev004 -d scripts/view6 -s 4
 
 view_06:
-  stage: test
+  stage: collect
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs:

views/view7.yml

 dawn_view_07:detector:
   extends: .views
+  needs:
+    - job: view_prim:detector_only
+      optional: false
   script:
-    - ./bin/make_dawn_views -t view07 -d scripts/view2 -D
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/detector_view.prim -t view07 -d scripts/view7 -D
+
 dawn_view_07:ev002:
   extends: .views
+  needs:
+    - job: view_prim:ev002
+      optional: true
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view07_ev002 -d scripts/view2 -s 2
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view07_ev002 -d scripts/view7 -s 2
+
 dawn_view_07:ev003:
   extends: .views
+  needs:
+    - job: view_prim:ev003
+      optional: true
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view07_ev003 -d scripts/view2 -s 3
+    - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim  -t view07_ev003 -d scripts/view7 -s 3
 
 view_07:
-  stage: test
+  stage: collect
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   needs: