Merge branch 'ACTSFW-99_DD4hepAdaptions' into 'master'

ACTSFW-99_DD4hepAdaptions

Closes ACTSFW-99

See merge request !83

Detectors/DD4hepDetector/compact/FCChhTrackerTkLayout.xml

@@ -144,6 +144,9 @@
     </readouts>
     <include ref="FCChh_Option3_Definitions.xml"/>
     <detectors>
+        <detector id="0" name="beampipe" type="FCChhBeampipe">
+            <dimensions rmin="15*mm" rmax="18*mm" z="CentralBeamTube_dz" material="Beryllium" vis="violet"/>
+        </detector>
         <detector id="100" name="FCChhInner0" type="DD4hep_SubdetectorAssembly" vis="BlueVisTrans">
             <composite name="InnerBRL_0"/>
         </detector>
@@ -165,8 +168,5 @@
             <composite name="FwdECAPneg"/>
             <composite name="FwdECAPpos"/>
         </detector>
-        <detector id="105" name="beampipe" type="FCChhBeampipe">
-            <dimensions rmin="15*mm" rmax="18*mm" z="CentralBeamTube_dz" material="Beryllium" vis="violet"/>
-        </detector>
     </detectors>
 </lccdd>

Plugins/DD4hep/include/ACTFW/Plugins/DD4hep/DD4hepDetectorOptions.hpp

@@ -55,7 +55,7 @@ namespace Options {
     FW::DD4hep::GeometryService::Config gsConfig("GeometryService");
     gsConfig.xmlFileName = vm["dd4hep-input"].template as<std::string>();
     gsConfig.bTypePhi    = Acts::equidistant;
-    gsConfig.bTypeR      = Acts::equidistant;
+    gsConfig.bTypeR      = Acts::arbitrary;
     gsConfig.bTypeZ      = Acts::equidistant;
     gsConfig.envelopeR   = vm["dd4hep-envelopeR"].template as<double>();
     gsConfig.envelopeZ   = vm["dd4hep-envelopeZ"].template as<double>();