Analysis/TrackInspect/CMakeLists.txt

+
+# Modules
+gaudi_add_module(TrackInspect
+                 SOURCES src/TrackInspectAlg.cpp
+                 LINK DataHelperLib
+                      k4FWCore::k4FWCore
+                      Gaudi::GaudiKernel 
+                      EDM4HEP::edm4hep 
+                      k4FWCore::k4FWCore
+                      ${ROOT_LIBRARIES}
+                      ${CLHEP_LIBRARIES}
+)
+
+install(TARGETS TrackInspect
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)

Analysis/TrackInspect/src/TrackInspectAlg.cpp

+/***********************************************************************************\
+* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+*                                                                                   *
+* This software is distributed under the terms of the Apache version 2 licence,     *
+* copied verbatim in the file "LICENSE".                                            *
+*                                                                                   *
+* In applying this licence, CERN does not waive the privileges and immunities       *
+* granted to it by virtue of its status as an Intergovernmental Organization        *
+* or submit itself to any jurisdiction.                                             *
+\***********************************************************************************/
+/* The algorithm is created by Mingrui ZHAO.
+ * It is transplanted from Marlin to Gaudi by Shunan ZHANG and Mingrui ZHAO.
+ * It is now maintained by Mingrui ZHAO (mingrui.zhao@mail.labz0.org)
+ *  please contact if you have any question. 
+ * 
+ * ------------------------------------
+ * The algorithm inspects the MCParticles and the correponding tracks.
+ * The output of the algorithm is a tuple.
+ * In each element of the tuple, it contains:
+ *    The information of the MCParticle,
+ *    The information of the corresponding tracks.
+ *        If the number of reconstructed track candidates is larger than 1, 
+ *        each reconstructed track will occupy an element of the tuple, and they
+ *        will be differred through the "nCandidates",
+ *
+ * Establishment of the correspondance:
+ * MCParticle -(1)-> SimTrackerHit -(2)-> TrackerHits -(3)-> Track
+ * 
+ *
+ *
+ */
+// Include files
+#include "TrackInspectAlg.h"
+
+#include "GaudiKernel/DataObject.h"
+#include "GaudiKernel/IHistogramSvc.h"
+#include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SmartDataPtr.h"
+
+#include "DataHelper/HelixClass.h"
+
+#include "podio/podioVersion.h"
+
+#include "CLHEP/Units/SystemOfUnits.h"
+#include <math.h>
+#include <TTree.h>
+#include <TFile.h>
+#include <TLorentzVector.h>
+#include <TVector3.h>
+#include <vector>
+#include <iostream>
+
+DECLARE_COMPONENT( TrackInspectAlg )
+
+//------------------------------------------------------------------------------
+TrackInspectAlg::TrackInspectAlg( const std::string& name, ISvcLocator* pSvcLocator )
+    : Algorithm( name, pSvcLocator ) {
+        declareProperty("TrackCollection", _inTrackColHdl, "Handle of the Input Track collection");
+        declareProperty("MCParticleCollection", _inMCParticleColHdl, "Handle of the Input MC particle collection");
+
+        declareProperty("TPCTrackerHitRelations", _TPCRelColHdl, "Handle of the TPC Tracker Hit relations");
+        declareProperty("VXDTrackerHitRelations", _VXDRelColHdl, "Handle of the TPC Tracker Hit relations");
+        declareProperty("SITTrackerHitRelations", _SITRelColHdl, "Handle of the TPC Tracker Hit relations");
+        declareProperty("SETTrackerHitRelations", _SETRelColHdl, "Handle of the TPC Tracker Hit relations");
+        declareProperty("FTDTrackerHitRelations", _FTDRelColHdl, "Handle of the TPC Tracker Hit relations");
+
+        declareProperty("useTPC", _useTPC, "flag whether to use TPC hits");
+        declareProperty("useVXD", _useVXD, "flag whether to use VXD hits");
+        declareProperty("useSIT", _useSIT, "flag whether to use SIT hits");
+        declareProperty("useSET", _useSET, "flag whether to use SET hits");
+        declareProperty("useFTD", _useFTD, "flag whether to use FTD hits");
+       
+        m_thisName = name;
+    }
+
+//------------------------------------------------------------------------------
+StatusCode TrackInspectAlg::initialize(){
+    info() << "Booking Ntuple" << endmsg;
+    
+    NTuplePtr nt1(ntupleSvc(), "MyTuples/Track"+m_thisName);
+    if ( !nt1 ) {
+        m_tuple = ntupleSvc()->book("MyTuples/Track"+m_thisName,CLID_ColumnWiseTuple,"Tracking result");
+        if ( 0 != m_tuple ) {
+            m_tuple->addItem        ("nmc",                 m_nParticles, 0, 1000 ).ignore();
+            m_tuple->addIndexedItem ("vx",                  m_nParticles, vx                 ).ignore();
+            m_tuple->addIndexedItem ("vy",                  m_nParticles, vy                 ).ignore();
+            m_tuple->addIndexedItem ("vz",                  m_nParticles, vz                 ).ignore();
+            m_tuple->addIndexedItem ("ex",                  m_nParticles, ex                 ).ignore();
+            m_tuple->addIndexedItem ("ey",                  m_nParticles, ey                 ).ignore();
+            m_tuple->addIndexedItem ("ez",                  m_nParticles, ez                 ).ignore();
+            m_tuple->addIndexedItem ("Omega",               m_nParticles, Omega              ).ignore();
+            m_tuple->addIndexedItem ("D0",                  m_nParticles, D0                 ).ignore();
+            m_tuple->addIndexedItem ("Z0",                  m_nParticles, Z0                 ).ignore();
+            m_tuple->addIndexedItem ("Phi",                 m_nParticles, Phi                ).ignore();
+            m_tuple->addIndexedItem ("TanLambda",           m_nParticles, TanLambda          ).ignore();
+            m_tuple->addIndexedItem ("TRUEPX",              m_nParticles, TRUEPX             ).ignore();
+            m_tuple->addIndexedItem ("TRUEPY",              m_nParticles, TRUEPY             ).ignore();
+            m_tuple->addIndexedItem ("TRUEPZ",              m_nParticles, TRUEPZ             ).ignore();
+            m_tuple->addIndexedItem ("TRUEPE",              m_nParticles, TRUEPE             ).ignore();
+            m_tuple->addIndexedItem ("TRUEPT",              m_nParticles, TRUEPT             ).ignore();
+            m_tuple->addIndexedItem ("TRUEP",               m_nParticles, TRUEP              ).ignore();
+            m_tuple->addIndexedItem ("TRUEETA",             m_nParticles, TRUEETA            ).ignore();
+            m_tuple->addIndexedItem ("TRUEY",               m_nParticles, TRUEY              ).ignore();
+            m_tuple->addIndexedItem ("TRUETHETA",           m_nParticles, TRUETHETA          ).ignore();
+            m_tuple->addIndexedItem ("eventNumber",         m_nParticles, eventNumber        ).ignore();
+            m_tuple->addIndexedItem ("particleNumber",      m_nParticles, particleNumber     ).ignore();
+            m_tuple->addIndexedItem ("totalCandidates",     m_nParticles, totalCandidates    ).ignore();
+            m_tuple->addIndexedItem ("nCandidate",          m_nParticles, nCandidate         ).ignore();
+            m_tuple->addIndexedItem ("nHits",               m_nParticles, nHits              ).ignore();
+            m_tuple->addIndexedItem ("pid",                 m_nParticles, pid                ).ignore();
+            m_tuple->addIndexedItem ("WMSelectionVariable", m_nParticles, WMSelectionVariable).ignore();
+        }
+        else { // did not manage to book the N tuple....
+            fatal() << "Cannot book MyTuples/Track"+m_thisName <<endmsg; 
+            return StatusCode::FAILURE;
+        }
+    }
+    else{
+        m_tuple = nt1;
+    }
+
+    _nEvt = 0;
+    return StatusCode::SUCCESS;
+}
+
+//------------------------------------------------------------------------------
+StatusCode TrackInspectAlg::execute(){
+    debug() << "TrackInspectAlg::execute() ------ start ------"  << endmsg;
+    hitmap.clear();
+    mcpHitMap.clear();
+    matchvec.clear();
+
+    std::vector<const edm4hep::MCRecoTrackerAssociationCollection*> relCols;
+
+
+    for (auto relCol: relCols) {
+    	if (relCol){
+	    for (auto rel: *relCol){
+		    std::pair<edm4hep::TrackerHit, edm4hep::MCParticle> p = std::make_pair(rel.getRec(), rel.getSim().getMCParticle());
+		    if (hitmap.find(p) == hitmap.end()) hitmap[p] = 0.;
+		    hitmap[p] += rel.getWeight();
+	    }
+	}
+    }
+
+
+    // Establish the relation of MCParticle --> Track
+    // Put the relation of MCParticle --> Track to matchvec
+    const edm4hep::TrackCollection* trkCol = nullptr;
+    try {
+        trkCol = _inTrackColHdl.get();
+    }
+    catch ( GaudiException &e ) {
+        debug() << "Collection " << _inTrackColHdl.fullKey() << " is unavailable in event " << _nEvt << endmsg;
+    }
+    const edm4hep::MCParticleCollection* mcpCol = nullptr;
+    try {
+        mcpCol = _inMCParticleColHdl.get();
+    }
+    catch ( GaudiException &e ) {
+        debug() << "Collection " << _inMCParticleColHdl.fullKey() << " is unavailable in event " << _nEvt << endmsg;
+    }
+    if (trkCol && mcpCol){
+        for (auto track: *trkCol){
+            for (auto particle: *mcpCol){
+                double match_weight = match(particle, track);
+                if (match_weight > 0.2){
+                    std::tuple<edm4hep::MCParticle, edm4hep::Track, double> tuple = std::make_tuple(particle, track, match_weight);
+                    matchvec.push_back(tuple);
+                }
+            }
+        }
+    }
+
+    if (mcpCol){
+        // MCParticleHitAssociator(mcpCol);
+        m_nParticles = 0;
+        for (auto particle: *mcpCol) {
+            std::vector<edm4hep::Track> theTracks = MCParticleTrackAssociator(particle);
+
+            if (theTracks.size() == 0) {
+                totalCandidates[m_nParticles] = 0;
+                nCandidate[m_nParticles] = -1;
+#if PODIO_BUILD_VERSION < PODIO_VERSION(0, 17, 4)
+                Fill(particle, edm4hep::Track(nullptr));
+#else
+                Fill(particle, edm4hep::Track::makeEmpty());
+#endif
+                m_nParticles++;
+            }
+            else {
+                for (unsigned j = 0; j < theTracks.size(); j++) {
+                    totalCandidates[m_nParticles] = theTracks.size();
+                    nCandidate[m_nParticles] = j;
+                    Fill(particle, theTracks[j]);
+                    m_nParticles++;
+                }   
+            }   
+        }
+        debug() << "MCParticle: " << m_nParticles << endmsg;
+    }
+    m_tuple->write();
+    _nEvt++;
+    debug() << "TrackInspectAlg::execute() ------ end ------"  << endmsg;
+    return StatusCode::SUCCESS;
+}
+
+double TrackInspectAlg::match(edm4hep::MCParticle particle, edm4hep::Track track){
+
+    int NHits = track.trackerHits_size();
+
+    double matchedHits = 0;
+    double usedHits = 0;
+    for (int i = 0; i < NHits; i++) {
+        edm4hep::TrackerHit hit = track.getTrackerHits(i);
+        usedHits++;
+        std::pair<edm4hep::TrackerHit, edm4hep::MCParticle> ele = std::make_pair(hit, particle);
+        //std::cout << "lookup --> " << ele.first << std::endl;
+        //if (hitmap.find(ele) != hitmap.end() ) {
+        //std::cout << "find --> " << hitmap[ele] << std::endl;
+        //} 
+        if (hitmap.find(ele) != hitmap.end() && hitmap[ele] > 0.2) {
+            matchedHits++;
+        }   
+    }   
+
+    // UTIL::BitField64* encoder = new UTIL::BitField64(lcio::ILDCellID0::encoder_string);
+    //     encoder->setValue(hit->getCellID0());
+    //     int detID = (*encoder)[lcio::ILDCellID0::subdet];
+    //     if (detID < 0 || !usedDetectorsArray[detID]) continue;
+    // delete encoder;
+
+    return matchedHits / usedHits;
+}
+
+void TrackInspectAlg::Fill(edm4hep::MCParticle particle, edm4hep::Track theTrack) {
+    pid[m_nParticles] = particle.getPDG();
+
+    vx[m_nParticles] = particle.getVertex().x;
+    vy[m_nParticles] = particle.getVertex().y;
+    vz[m_nParticles] = particle.getVertex().z;
+
+    ex[m_nParticles] = particle.getEndpoint().x;
+    ey[m_nParticles] = particle.getEndpoint().y;
+    ez[m_nParticles] = particle.getEndpoint().z;
+
+    TLorentzVector v2;
+    v2.SetXYZM(
+        particle.getMomentum().x, 
+        particle.getMomentum().y,
+        particle.getMomentum().z,
+        particle.getMass() );
+    TRUEPX[m_nParticles] = v2.X();
+    TRUEPY[m_nParticles] = v2.Y();
+    TRUEPZ[m_nParticles] = v2.Z();
+    TRUEPE[m_nParticles] = v2.E();
+    TRUEPT[m_nParticles] = v2.Pt();
+    TRUEP[m_nParticles]  = v2.P();
+    TRUEETA[m_nParticles] = v2.PseudoRapidity();
+    TRUEY[m_nParticles] = v2.Rapidity();
+    TRUETHETA[m_nParticles] = v2.Theta();
+
+    // TVector3 theMomentum = TVector3(
+    //         particle->getMomentum().x,
+    //         particle->getMomentum().y,
+    //         particle->getMomentum().z );
+
+    // WMSelectionVariable = (
+    //         theParticle->isDecayedInTracker()==0 &&
+    //         theMomentum.Perp()>1.0 &&
+    //         theParticle->isDecayedInCalorimeter() &&
+    //         theParticle->getGeneratorStatus() == 1 &&
+    //         sin(theMomentum.Theta()) > 0.18 );
+
+    if (theTrack.isAvailable()) {
+        for (std::vector<edm4hep::TrackState>::const_iterator it = theTrack.trackStates_end() - 1; it != theTrack.trackStates_begin() - 1; it--){
+            edm4hep::TrackState trackState = *it;
+            Omega[m_nParticles] = trackState.omega;
+            TanLambda[m_nParticles] = trackState.tanLambda;
+            Phi[m_nParticles] = trackState.phi;
+            D0[m_nParticles] = trackState.D0;
+            Z0[m_nParticles] = trackState.Z0;
+            nHits[m_nParticles] = theTrack.trackerHits_size();
+        }
+    }   
+    else {
+        Omega[m_nParticles] = -1;
+        TanLambda[m_nParticles] = -1;
+        Phi[m_nParticles] = -1;
+        D0[m_nParticles] = -1;
+        Z0[m_nParticles] = -1; 
+        nHits[m_nParticles] = 0;
+    }   
+}
+
+std::vector<edm4hep::Track> TrackInspectAlg::MCParticleTrackAssociator(edm4hep::MCParticle theParticle) {
+    std::vector<edm4hep::Track> theTracks;
+    // std::cout << "The particle: " << theParticle.getPDG() << " " << theParticle << std::endl;
+    for (auto matchtuple: matchvec){
+        if (std::get<0>(matchtuple) == theParticle){
+            if (std::get<2>(matchtuple) > _weight){
+                theTracks.push_back(std::get<1>(matchtuple));
+            }
+        }
+    }   
+    return theTracks;
+}
+
+void TrackInspectAlg::initializeRelationCollections(std::vector<const edm4hep::MCRecoTrackerAssociationCollection*> &relCols) {
+
+    // Use TPC 
+    if (_useTPC) {
+	    const edm4hep::MCRecoTrackerAssociationCollection* relCol = nullptr;
+	    // Establish the relation of MCParticle --> TrackerHit
+	    try {
+		relCol = _TPCRelColHdl.get();
+	    }
+	    catch ( GaudiException &e ) {
+		debug() << "Collection " << _TPCRelColHdl.fullKey() << " is unavailable in event " << _nEvt << endmsg;
+	    }
+            relCols.push_back(relCol);
+    }
+
+    // Use VXD
+    if (_useVXD) {
+	    const edm4hep::MCRecoTrackerAssociationCollection* relCol = nullptr;
+	    // Establish the relation of MCParticle --> TrackerHit
+	    try {
+		relCol = _VXDRelColHdl.get();
+	    }
+	    catch ( GaudiException &e ) {
+		debug() << "Collection " << _VXDRelColHdl.fullKey() << " is unavailable in event " << _nEvt << endmsg;
+	    }
+            relCols.push_back(relCol);
+    }
+
+    // Use SIT
+    if (_useSIT) {
+	    const edm4hep::MCRecoTrackerAssociationCollection* relCol = nullptr;
+	    // Establish the relation of MCParticle --> TrackerHit
+	    try {
+		relCol = _SITRelColHdl.get();
+	    }
+	    catch ( GaudiException &e ) {
+		debug() << "Collection " << _SITRelColHdl.fullKey() << " is unavailable in event " << _nEvt << endmsg;
+	    }
+            relCols.push_back(relCol);
+    }
+
+    // Use SET
+    if (_useSET) {
+	    const edm4hep::MCRecoTrackerAssociationCollection* relCol = nullptr;
+	    // Establish the relation of MCParticle --> TrackerHit
+	    try {
+		relCol = _SETRelColHdl.get();
+	    }
+	    catch ( GaudiException &e ) {
+		debug() << "Collection " << _SETRelColHdl.fullKey() << " is unavailable in event " << _nEvt << endmsg;
+	    }
+            relCols.push_back(relCol);
+    }
+
+    // Use FTD
+    if (_useFTD) {
+	    const edm4hep::MCRecoTrackerAssociationCollection* relCol = nullptr;
+	    // Establish the relation of MCParticle --> TrackerHit
+	    try {
+		relCol = _FTDRelColHdl.get();
+	    }
+	    catch ( GaudiException &e ) {
+		debug() << "Collection " << _FTDRelColHdl.fullKey() << " is unavailable in event " << _nEvt << endmsg;
+	    }
+            relCols.push_back(relCol);
+    }
+}
+
+//------------------------------------------------------------------------------
+StatusCode TrackInspectAlg::finalize(){
+    debug() << "Finalizing..." << endmsg;
+
+    return StatusCode::SUCCESS;
+}

Analysis/TrackInspect/src/TrackInspectAlg.h

+#ifndef HITSCANPROCESSOR_H
+#define HITSCANPROCESSOR_H
+
+#include "k4FWCore/DataHandle.h"
+#include "GaudiKernel/Algorithm.h"
+
+#include "edm4hep/TrackCollection.h"
+#include "edm4hep/TrackerHit.h"
+#include "edm4hep/MCParticle.h"
+#include "edm4hep/MCParticleCollection.h"
+#include "edm4hep/SimTrackerHitCollection.h"
+#include "edm4hep/TrackerHitCollection.h"
+#include "edm4hep/MCRecoTrackerAssociationCollection.h"
+
+#include "GaudiKernel/NTuple.h"
+
+class TrackInspectAlg : public Algorithm {
+    public :
+        TrackInspectAlg(const std::string& name, ISvcLocator* pSvcLocator);
+        ~TrackInspectAlg(){};
+
+        StatusCode initialize() override;
+        StatusCode execute() override;
+        StatusCode finalize() override;
+
+    private :
+
+        // TruthMatchProcessor
+        DataHandle<edm4hep::TrackCollection> _inTrackColHdl{"InputTrackCollection", Gaudi::DataHandle::Reader, this};
+        DataHandle<edm4hep::MCParticleCollection> _inMCParticleColHdl{"InputMCParticleCollection", Gaudi::DataHandle::Reader, this};
+
+        DataHandle<edm4hep::MCRecoTrackerAssociationCollection> _TPCRelColHdl{"TPCTrackerHitRelations", Gaudi::DataHandle::Reader, this};
+        DataHandle<edm4hep::MCRecoTrackerAssociationCollection> _VXDRelColHdl{"VXDTrackerHitRelations", Gaudi::DataHandle::Reader, this};
+        DataHandle<edm4hep::MCRecoTrackerAssociationCollection> _SITRelColHdl{"SITTrackerHitRelations", Gaudi::DataHandle::Reader, this};
+        DataHandle<edm4hep::MCRecoTrackerAssociationCollection> _SETRelColHdl{"SETTrackerHitRelations", Gaudi::DataHandle::Reader, this};
+        DataHandle<edm4hep::MCRecoTrackerAssociationCollection> _FTDRelColHdl{"FTDTrackerHitRelations", Gaudi::DataHandle::Reader, this};
+        Gaudi::Property<double> _weight{this, "Weight", 0.5};
+
+        Gaudi::Property<bool> _useTPC{this, "useTPC", true};
+        Gaudi::Property<bool> _useVXD{this, "useVXD", true};
+        Gaudi::Property<bool> _useSIT{this, "useSIT", true};
+        Gaudi::Property<bool> _useSET{this, "useSET", true};
+        Gaudi::Property<bool> _useFTD{this, "useFTD", true};
+
+        std::map<std::pair<edm4hep::TrackerHit, edm4hep::MCParticle>, double> hitmap;
+        std::vector<std::tuple<edm4hep::MCParticle, edm4hep::Track, double>> matchvec;
+        double match(edm4hep::MCParticle, edm4hep::Track);
+
+        void initializeRelationCollections(std::vector<const edm4hep::MCRecoTrackerAssociationCollection*> &relCols);
+
+        int _nEvt;
+        std::string m_thisName;
+
+        // TrackingEfficiency
+        void Fill(edm4hep::MCParticle, edm4hep::Track);
+        std::vector<edm4hep::Track> MCParticleTrackAssociator(edm4hep::MCParticle);
+
+        std::map<edm4hep::MCParticle, std::vector<edm4hep::SimTrackerHit>> mcpHitMap;
+        std::string treeFileName;
+
+        NTuple::Tuple* m_tuple;
+
+        NTuple::Item<long>    m_nParticles;
+        NTuple::Array<double> vx;
+        NTuple::Array<double> vy;
+        NTuple::Array<double> vz;
+        NTuple::Array<double> ex;
+        NTuple::Array<double> ey;
+        NTuple::Array<double> ez;
+        NTuple::Array<double> Omega;
+        NTuple::Array<double> D0;
+        NTuple::Array<double> Z0;
+        NTuple::Array<double> Phi;
+        NTuple::Array<double> TanLambda;
+        NTuple::Array<double> TRUEPX;
+        NTuple::Array<double> TRUEPY;
+        NTuple::Array<double> TRUEPZ;
+        NTuple::Array<double> TRUEPE;
+        NTuple::Array<double> TRUEPT;
+        NTuple::Array<double> TRUEP;
+        NTuple::Array<double> TRUEETA;
+        NTuple::Array<double> TRUEY;
+        NTuple::Array<double> TRUETHETA;
+        NTuple::Array<int> eventNumber;
+        NTuple::Array<int> particleNumber;
+        NTuple::Array<int> totalCandidates;
+        NTuple::Array<int> nCandidate;
+        NTuple::Array<int> pid;
+        NTuple::Array<int> nHits;
+        NTuple::Array<int> WMSelectionVariable;
+        // TTree tree;
+        // TTree tuple;
+        // TFile treeFile;
+};
+
+#endif

CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.15)
 
-find_package(ROOT COMPONENTS RIO Tree)
+project(CEPCSW)
 
-find_package(GaudiProject)
+# setup some necessary envvar
+include(cmake/CEPCSWEnv.cmake)
+#
+
+include(GNUInstallDirs)
+include(CTest)
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/InstallArea/ CACHE PATH
+    "Install path prefix, prepended onto install directories." FORCE )
+endif()
+
+set(CMAKE_SKIP_BUILD_RPATH TRUE)
+set(CMAKE_EXECUTABLE_SUFFIX .exe)
+
+# Put bin/lib/include under CMAKE_BINARY_DIR
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+include_directories(${CMAKE_BINARY_DIR}/include)
+
+# set Install/lib
+set(CMAKE_INSTALL_LIBDIR lib)
 
 # Set up C++ Standard
 # ``-DCMAKE_CXX_STANDARD=<standard>`` when invoking CMake
 set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
 
-if(NOT CMAKE_CXX_STANDARD MATCHES "14|17")
+if(NOT CMAKE_CXX_STANDARD MATCHES "17|20")
   message(FATAL_ERROR "Unsupported C++ standard: ${CMAKE_CXX_STANDARD}")
 endif()
 
+# Build type
+#   Use ``-DCMAKE_BUILD_TYPE=Debug`` when invoking CMake.
+#   By default, it is RelWithDebInfo since Sept 6th, 2024.
+if (NOT CMAKE_CONFIGURATION_TYPES)
+  if (NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release
+      CACHE STRING "Choose the type of build, options are: None|Release|MinSizeRel|Debug|RelWithDebInfo" FORCE)
+  else()
+    set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}
+      CACHE STRING "Choose the type of build, options are: None|Release|MinSizeRel|Debug|RelWithDebInfo" FORCE)
+  endif()
+endif()
+
+
+list(PREPEND CMAKE_MODULE_PATH $ENV{PANDORAPFA}/cmakemodules)
+list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # (Find*.cmake)
+include(cmake/CEPCSWOptions.cmake)
+include(cmake/CEPCSWDependencies.cmake)
+
+add_subdirectory(Analysis)
+add_subdirectory(Detector)
+add_subdirectory(Digitization)
+add_subdirectory(Examples)
+add_subdirectory(Generator)
+add_subdirectory(Reconstruction)
+add_subdirectory(Service)
+add_subdirectory(Simulation)
+add_subdirectory(Utilities)
+
+##############################################################################
+# INSTALL
+##############################################################################
+
+install(EXPORT ${PROJECT_NAME}Targets
+  NAMESPACE ${PROJECT_NAME}::
+  FILE "${PROJECT_NAME}Targets.cmake"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/"
+  )
+
+gaudi_install(CMAKE cmake/${PROJECT_NAME}Config.cmake)
+
+file(WRITE ${CMAKE_BINARY_DIR}/setup.sh.in
+    "#!/bin/bash\n"
+    "# Generated by cmake \n"
+    "# Following is the extra envvar:\n"
+    "@RUN_SCRIPT_EXTRA_COMMANDS@"
+)
+configure_file("${CMAKE_BINARY_DIR}/setup.sh.in" "${CMAKE_BINARY_DIR}/setup.sh"
+               @ONLY)
 
-gaudi_project(CEPCSW v0r1
-              USE Gaudi v33r1 
-              USE k4FWCore v0r1
-)
\ No newline at end of file
+install(FILES "${CMAKE_BINARY_DIR}/setup.sh"
+        DESTINATION ${CMAKE_INSTALL_PREFIX})

Detector/CMakeLists.txt

+
+add_subdirectory(DetCEPCv4)
+add_subdirectory(DetCRD)
+add_subdirectory(DetDriftChamber)
+add_subdirectory(DetEcalMatrix)
+add_subdirectory(DetInterface)
+add_subdirectory(DetSegmentation)
+add_subdirectory(DetGeomSvc)
+add_subdirectory(DetIdentifier)
+add_subdirectory(MagneticFieldMap)

Detector/DetCEPCv4/CMakeLists.txt

@@ -3,54 +3,45 @@
 # Ref to Package: DetFCCeeIDEA
 # Based on package: lcgeo
 ################################################################################
-gaudi_subdir(DetCEPCv4 v0r0)
-
-gaudi_depends_on_subdirs(GaudiKernel)
-
-
-find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED)
-# find_package(DD4hep)
-find_package(Geant4)
-include(${Geant4_USE_FILE})
-
-set(CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH}  ${DD4hep_ROOT}/cmake )
-include( DD4hep )
-
-find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
-
-install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetCEPCv4)
-
-set(DetCEPCv4_src
-    src/tracker/VXD04_geo.cpp
-    src/tracker/FTD_Simple_Staggered_geo.cpp
-    src/tracker/FTD_cepc_geo.cpp
-    src/tracker/SIT_Simple_Pixel_geo.cpp 
-    src/tracker/SIT_Simple_Planar_geo.cpp
-    src/tracker/TPC10_geo.cpp
-    src/tracker/SET_Simple_Planar_geo.cpp
-    src/calorimeter/SEcal05_Helpers.cpp
-    src/calorimeter/SEcal05_Barrel.cpp
-    src/calorimeter/SEcal05_Endcaps.cpp
-    src/calorimeter/SEcal05_ECRing.cpp
-    src/other/BoxSupport_o1_v01_geo.cpp
-    src/other/TubeSupport_o1_v01_geo.cpp
-)
 
 gaudi_add_module(DetCEPCv4
-                  ${DetCEPCv4_src}
-		  INCLUDE_DIRS 
-                  # DD4hep 
-                  # ROOT 
-                  # Geant4 
-                  src/include
-		  LINK_LIBRARIES
-                  # GaudiKernel
-                  #DD4hep
-                  ${DD4hep_COMPONENT_LIBRARIES}
-                  # ROOT 
-                  # Geant4
+                 SOURCES src/tracker/VXD04_geo.cpp
+                         src/tracker/FTD_Simple_Staggered_geo.cpp
+                         src/tracker/FTD_cepc_geo.cpp
+                         src/tracker/SIT_Simple_Pixel_geo.cpp 
+                         src/tracker/SIT_Simple_Planar_geo.cpp
+                         src/tracker/TPC10_geo.cpp
+                         src/tracker/SET_Simple_Planar_geo.cpp
+                         src/calorimeter/SEcal05_Helpers.cpp
+                         src/calorimeter/SEcal05_Barrel.cpp
+                         src/calorimeter/SEcal05_Endcaps.cpp
+                         src/calorimeter/SEcal05_ECRing.cpp
+                         src/calorimeter/SHcalRpc01_Barrel.cpp
+                         src/calorimeter/SHcalRpc02_Barrel.cpp
+                         src/calorimeter/SHcalRpc01_Endcaps.cpp
+                         src/calorimeter/SHcalRpc01_EndcapRing.cpp
+                         src/calorimeter/SHcalSc04_Barrel_v04.cpp
+                         src/calorimeter/SHcalSc04_Endcaps_v01.cpp
+                         src/calorimeter/SHcalSc04_Endcaps_v02.cpp
+                         src/calorimeter/Yoke05_Barrel.cpp
+                         src/calorimeter/Yoke05_Endcaps.cpp
+                         src/other/BoxSupport_o1_v01_geo.cpp
+                         src/other/TubeSupport_o1_v01_geo.cpp
+                         src/other/SCoil02_geo.cpp
+
+		 LINK ${DD4hep_COMPONENT_LIBRARIES}
 )
 
+target_include_directories(DetCEPCv4 PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/src/include
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
 set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 message(STATUS "LIBRARY_OUTPUT_PATH -> ${LIBRARY_OUTPUT_PATH}")
 dd4hep_generate_rootmap(DetCEPCv4)
+
+install(TARGETS DetCEPCv4
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)

Detector/DetCEPCv4/compact/Beampipe_o1_v01_01.xml

@@ -103,17 +103,17 @@
            rMax1="TUBE_incoming_beamcalToQD0_InnerRadius+TUBE_upstream_thickness"  rMax2="TUBE_incoming_QD0andBeyond_InnerRadius+TUBE_upstream_thickness"
            material="stainless_steel" name="BeamCalToQD0UpstreamTrans" />
 
-  <section type ="Upstream"
+  <!--section type ="Upstream"
            start="TUBE_QD0_Lstar"                    end="TUBE_QD0_Lstar+TUBE_QD0_length"
            rMin1="TUBE_incoming_QD0andBeyond_InnerRadius"          rMin2="TUBE_incoming_QD0andBeyond_InnerRadius"
            rMax1="TUBE_incoming_QD0andBeyond_InnerRadius+20*mm"    rMax2="TUBE_incoming_QD0andBeyond_InnerRadius+20*mm"
-           material="stainless_steel" name="QD0CryoUpstream" />
+           material="stainless_steel" name="QD0CryoUpstream" /-->
 
-  <section type ="Upstream"
+  <!--section type ="Upstream"
            start="TUBE_QD0_Lstar+TUBE_QD0_length"    end="10*m"
            rMin1="TUBE_incoming_QD0andBeyond_InnerRadius"          rMin2="TUBE_incoming_QD0andBeyond_InnerRadius"
            rMax1="TUBE_incoming_QD0andBeyond_InnerRadius+TUBE_upstream_thickness"    rMax2="TUBE_incoming_QD0andBeyond_InnerRadius+TUBE_upstream_thickness"
-           material="stainless_steel" name="BeyondQD0Upstream" />
+           material="stainless_steel" name="BeyondQD0Upstream" /-->
 
 
 
@@ -137,17 +137,17 @@
            rMax1="TUBE_outgoing_beamcalToQD0_InnerRadius+TUBE_upstream_thickness"  rMax2="TUBE_outgoing_beamcalToQD0_InnerRadius+TUBE_upstream_thickness"
            material="stainless_steel" name="BeamCalToQDEX1ADnstream" />
 
-  <section type ="Dnstream"
+  <!--section type ="Dnstream"
            start="TUBE_QDEX1A_Lstar"                    end="TUBE_QD0_Lstar+TUBE_QD0_cryostat_length"
            rMin1="TUBE_outgoing_QD0andBeyond_InnerRadius"          rMin2="TUBE_outgoing_QD0andBeyond_InnerRadius"
            rMax1="TUBE_outgoing_QD0andBeyond_InnerRadius+20*mm"    rMax2="TUBE_outgoing_QD0andBeyond_InnerRadius+20*mm"
-           material="stainless_steel" name="QDEX1A" />
+           material="stainless_steel" name="QDEX1A" /-->
 
-  <section type ="Dnstream"
+  <!--section type ="Dnstream"
            start="TUBE_QD0_Lstar+TUBE_QD0_cryostat_length"         end="10*m"
            rMin1="TUBE_outgoing_QD0andBeyond_InnerRadius"          rMin2="TUBE_outgoing_QD0andBeyond_InnerRadius"
            rMax1="TUBE_outgoing_QD0andBeyond_InnerRadius+TUBE_upstream_thickness"    rMax2="TUBE_outgoing_QD0andBeyond_InnerRadius+TUBE_upstream_thickness"
-           material="stainless_steel" name="BeyondQD0Dnstream" />
+           material="stainless_steel" name="BeyondQD0Dnstream" /-->
 
 </detector>
 
@@ -160,12 +160,12 @@
   <type_flags type="DetType_SUPPORT + DetType_BEAMPIPE "/>
 
   <section start="TUBE_QD0_Lstar-20*mm" end="TUBE_QD0_Lstar+TUBE_QD0_cryostat_length"
-	   rMin="235.*mm" rMax="250.*mm"
+	   rMin="170.*mm" rMax="185.*mm"
 	   material="stainless_steel"
 	   name="qd0_cryostat"/>
 
   <section start="TUBE_QD0_Lstar-20*mm" end="TUBE_QD0_Lstar+TUBE_QD0_cryostat_length"
-	   rMin="235.*mm" rMax="250.*mm"
+	   rMin="205.*mm" rMax="210.*mm"
 	   material="stainless_steel"
 	   name="qd0_cryostat_wall"/>
 
@@ -183,7 +183,7 @@
 
 </detector>
 
-<detector name="QD0_support" type="BoxSupport_o1_v01" vis="BeamPipeVis" id="ILDDetID_NOTUSED" reflect="true">
+<detector name="QD0_support" type="TubeSupport_o1_v01" vis="BeamPipeVis" id="ILDDetID_NOTUSED" reflect="true">
 
   <envelope vis="BlueVis">
     <shape type="Assembly"/>
@@ -191,18 +191,19 @@
 
   <type_flags type="DetType_SUPPORT + DetType_BEAMPIPE "/>
 
-  <section start="TUBE_QD0_Lstar+20*mm" end="TUBE_QD0_Lstar+TUBE_QD0_cryostat_length"
-	   rMin="275.*mm" rMax="300*mm"
+  <section start="TUBE_QD0_Lstar-20*mm" end="TUBE_QD0_Lstar+TUBE_QD0_cryostat_length"
+	   rMin="240.*mm" rMax="310*mm"
 	   material="stainless_steel"
 	   name="qd0_support"/>
 
-  <section start="Ecal_endcap_zmin" end="Ecal_endcap_zmin+Ecal_barrel_thickness"
+  <!--section start="Ecal_endcap_zmin" end="Ecal_endcap_zmin+Ecal_barrel_thickness"
 	   rMin="EcalEndcapRing_outer_radius + 2*env_safety" rMax="EcalEndcap_inner_radius - 2*env_safety"
 	   material="stainless_steel"
-	   name="forward_support_tube"/>
+	   name="forward_support_tube"/-->
 
-  <section start="top_LHCal_min_z + top_LHCal_thickness+10*mm" end="BeamCal_min_z + top_BeamCal_thickness+4600*mm"
-	   rMin="305*mm" rMax="325*mm"
+  <!--section start="top_LHCal_min_z + top_LHCal_thickness+10*mm" end="BeamCal_min_z + top_BeamCal_thickness+4600*mm"-->
+  <section start="top_LHCal_min_z + top_LHCal_thickness+10*mm" end="TUBE_QD0_Lstar-20*mm"
+	   rMin="175*mm" rMax="240*mm"
 	   material="stainless_steel"
 	   name="forward_support_tube"/>
 

Detector/DetCEPCv4/compact/CEPCV4_FullDet_GearOutput.xml

+<gear>
+    <global detectorName="CEPC_v4" />
+    <!--Gear XML file automatically created with GearXML::createXMLFile ....-->
+    <BField type="ConstantBField" x="0.000000000e+00" y="0.000000000e+00" z="3.000000000e+00" />
+    <detectors>
+        <detector geartype="TPCParameters" name="TPC">
+            <maxDriftLength value="2.225000000e+03" />
+            <driftVelocity value="0.000000000e+00" />
+            <coordinateType value="polar" />
+            <modules>
+                <module>
+                    <moduleID value="0" />
+                    <readoutFrequency value="0.000000000e+00" />
+                    <PadRowLayout2D type="FixedPadSizeDiskLayout" rMin="3.840000000e+02" rMax="1.716000000e+03" padHeight="6.000000000e+00" padWidth="1.000000000e+00" maxRow="222" padGap="0.000000000e+00" phiMax="6.283185307e+00" />
+                    <offset x_r="0.000000000e+00" y_phi="0.000000000e+00" />
+                    <angle value="0.000000000e+00" />
+                    <enlargeActiveAreaBy value="0.000000000e+00" />
+                </module>
+            </modules>
+            <parameter name="TPCGasProperties_RadLen" type="double" value="1.155205461e+05" />
+            <parameter name="TPCGasProperties_dEdx" type="double" value="2.668179899e-07" />
+            <parameter name="TPCInnerWallProperties_RadLen" type="double" value="2.740688665e+03" />
+            <parameter name="TPCInnerWallProperties_dEdx" type="double" value="1.241647394e-05" />
+            <parameter name="TPCOuterWallProperties_RadLen" type="double" value="6.495646008e+03" />
+            <parameter name="TPCOuterWallProperties_dEdx" type="double" value="5.300932694e-06" />
+            <parameter name="TPCWallProperties_RadLen" type="double" value="2.740688665e+03" />
+            <parameter name="TPCWallProperties_dEdx" type="double" value="1.241647394e-05" />
+            <parameter name="tpcInnerRadius" type="double" value="3.290000000e+02" />
+            <parameter name="tpcInnerWallThickness" type="double" value="2.500000000e+01" />
+            <parameter name="tpcOuterRadius" type="double" value="1.808000000e+03" />
+            <parameter name="tpcOuterWallThickness" type="double" value="6.000000000e+01" />
+            <parameter name="tpcZAnode" type="double" value="4.600000000e+03" />
+        </detector>
+        <detector name="EcalBarrel" geartype="CalorimeterParameters">
+            <layout type="Barrel" symmetry="8" phi0="0.000000000e+00" />
+            <dimensions inner_r="1.847415655e+03" outer_z="2.350000000e+03" />
+            <layer repeat="19" thickness="5.250000000e+00" absorberThickness="2.100000000e+00" cellSize0="1.016666667e+01" cellSize1="1.016666667e+01" />
+            <layer repeat="1" thickness="6.300000000e+00" absorberThickness="2.100000000e+00" cellSize0="1.016666667e+01" cellSize1="1.016666667e+01" />
+            <layer repeat="9" thickness="7.350000000e+00" absorberThickness="4.200000000e+00" cellSize0="1.016666667e+01" cellSize1="1.016666667e+01" />
+        </detector>
+        <detector name="EcalEndcap" geartype="CalorimeterParameters">
+            <layout type="Endcap" symmetry="2" phi0="0.000000000e+00" />
+            <dimensions inner_r="4.000000000e+02" outer_r="2.088800000e+03" inner_z="2.450000000e+03" />
+            <layer repeat="19" thickness="5.250000000e+00" absorberThickness="2.100000000e+00" cellSize0="1.016666667e+01" cellSize1="1.016666667e+01" />
+            <layer repeat="1" thickness="6.300000000e+00" absorberThickness="2.100000000e+00" cellSize0="1.016666667e+01" cellSize1="1.016666667e+01" />
+            <layer repeat="9" thickness="7.350000000e+00" absorberThickness="4.200000000e+00" cellSize0="1.016666667e+01" cellSize1="1.016666667e+01" />
+        </detector>
+        <detector name="EcalPlug" geartype="CalorimeterParameters">
+            <layout type="Endcap" symmetry="2" phi0="0.000000000e+00" />
+            <dimensions inner_r="2.400000000e+02" outer_r="4.000000000e+02" inner_z="2.450000000e+03" />
+            <layer repeat="19" thickness="5.250000000e+00" absorberThickness="2.100000000e+00" cellSize0="1.016666667e+01" cellSize1="1.016666667e+01" />
+            <layer repeat="1" thickness="6.300000000e+00" absorberThickness="2.100000000e+00" cellSize0="1.016666667e+01" cellSize1="1.016666667e+01" />
+            <layer repeat="9" thickness="7.350000000e+00" absorberThickness="4.200000000e+00" cellSize0="1.016666667e+01" cellSize1="1.016666667e+01" />
+        </detector>
+        <detector name="YokeBarrel" geartype="CalorimeterParameters">
+            <layout type="Barrel" symmetry="12" phi0="0.000000000e+00" />
+            <dimensions inner_r="4.173929932e+03" outer_z="4.072000000e+03" />
+            <layer repeat="1" thickness="4.000000000e+01" absorberThickness="0.000000000e+00" cellSize0="3.000000000e+01" cellSize1="3.000000000e+01" />
+            <layer repeat="9" thickness="1.400000000e+02" absorberThickness="1.000000000e+02" cellSize0="3.000000000e+01" cellSize1="3.000000000e+01" />
+            <layer repeat="3" thickness="6.000000000e+02" absorberThickness="5.600000000e+02" cellSize0="3.000000000e+01" cellSize1="3.000000000e+01" />
+            <layer repeat="1" thickness="4.000000000e+01" absorberThickness="4.027623145e-320" cellSize0="3.000000000e+01" cellSize1="3.000000000e+01" />
+        </detector>
+        <detector name="YokeEndcap" geartype="CalorimeterParameters">
+            <layout type="Endcap" symmetry="2" phi0="0.000000000e+00" />
+            <dimensions inner_r="3.200000000e+02" outer_r="7.414929932e+03" inner_z="4.072000000e+03" />
+            <layer repeat="1" thickness="1.000000000e+02" absorberThickness="1.000000000e+02" cellSize0="3.000000000e+01" cellSize1="3.000000000e+01" />
+            <layer repeat="9" thickness="1.400000000e+02" absorberThickness="1.000000000e+02" cellSize0="3.000000000e+01" cellSize1="3.000000000e+01" />
+            <layer repeat="2" thickness="6.000000000e+02" absorberThickness="5.600000000e+02" cellSize0="3.000000000e+01" cellSize1="3.000000000e+01" />
+        </detector>
+        <detector name="YokePlug" geartype="CalorimeterParameters">
+            <layout type="Endcap" symmetry="2" phi0="0.000000000e+00" />
+            <dimensions inner_r="3.200000000e+02" outer_r="2.849254326e+03" inner_z="3.781430000e+03" />
+            <parameter name="YokePlugThickness" type="double" value="2.905700000e+02" />
+        </detector>
+        <detector name="HcalBarrel" geartype="CalorimeterParameters">
+            <layout type="Barrel" symmetry="8" phi0="1.570796327e+00" />
+            <dimensions inner_r="2.058000000e+03" outer_z="2.350000000e+03" />
+            <layer repeat="40" thickness="2.673000000e+01" absorberThickness="2.000000000e+01" cellSize0="1.000000000e+01" cellSize1="1.000000000e+01" />
+            <parameter name="Hcal_barrel_number_modules" type="int" value="5" />
+            <parameter name="N_cells_z" type="int" value="91" />
+            <parameter name="FrameWidth" type="double" value="1.000000000e+00" />
+            <parameter name="Hcal_lateral_structure_thickness" type="double" value="1.000000000e+01" />
+            <parameter name="Hcal_modules_gap" type="double" value="2.000000000e+00" />
+            <parameter name="Hcal_outer_radius" type="double" value="3.144432447e+03" />
+            <parameter name="Hcal_virtual_cell_size" type="double" value="1.000000000e+01" />
+            <parameter name="InnerOctoSize" type="double" value="1.704903012e+03" />
+            <parameter name="RPC_PadSeparation" type="double" value="0.000000000e+00" />
+            <parameter name="TPC_Ecal_Hcal_barrel_halfZ" type="double" value="2.350000000e+03" />
+        </detector>
+        <detector name="HcalEndcap" geartype="CalorimeterParameters">
+            <layout type="Endcap" symmetry="2" phi0="0.000000000e+00" />
+            <dimensions inner_r="3.500000000e+02" outer_r="3.144432447e+03" inner_z="2.650000000e+03" />
+            <layer repeat="40" thickness="2.673000000e+01" absorberThickness="2.000000000e+01" cellSize0="1.000000000e+01" cellSize1="1.000000000e+01" />
+            <parameter name="FrameWidth" type="double" value="0.000000000e+00" />
+            <parameter name="Hcal_virtual_cell_size" type="double" value="1.000000000e+01" />
+        </detector>
+        <detector name="HcalRing" geartype="CalorimeterParameters">
+            <layout type="Endcap" symmetry="2" phi0="0.000000000e+00" />
+            <dimensions inner_r="2.138800000e+03" outer_r="3.144432447e+03" inner_z="2.450000000e+03" />
+            <layer repeat="6" thickness="2.673000000e+01" absorberThickness="2.000000000e+01" cellSize0="1.000000000e+01" cellSize1="1.000000000e+01" />
+            <parameter name="FrameWidth" type="double" value="0.000000000e+00" />
+            <parameter name="Hcal_virtual_cell_size" type="double" value="1.000000000e+01" />
+        </detector>
+        <detector name="Lcal" geartype="CalorimeterParameters">
+            <layout type="Endcap" symmetry="1" phi0="0.000000000e+00" />
+            <dimensions inner_r="3.225828541e+01" outer_r="9.880000000e+01" inner_z="9.519000000e+02" />
+            <layer repeat="30" thickness="4.290000000e+00" absorberThickness="3.500000000e+00" cellSize0="1.039714290e+00" cellSize1="1.308996939e-01" />
+            <parameter name="beam_crossing_angle" type="double" value="0.000000000e+00" />
+        </detector>
+        <detector name="VXD" geartype="ZPlanarParameters">
+            <type technology="HYBRID" />
+            <shell halfLength="1.450000000e+02" gap="0.000000000e+00" innerRadius="6.500000000e+01" outerRadius="6.549392000e+01" radLength="3.527597571e+02" />
+            <layers>
+                <layer nLadders="10" phi0="-1.570796327e+00">
+                    <ladder distance="1.600000000e+01" thickness="1.000000000e+00" width="1.150000000e+01" length="6.250000000e+01" offset="-1.874869853e+00" radLength="1.014262421e+03" />
+                    <sensitive distance="1.595000000e+01" thickness="5.000000000e-02" width="1.100000000e+01" length="6.250000000e+01" offset="-1.624869853e+00" radLength="9.366070445e+01" />
+                </layer>
+                <layer nLadders="10" phi0="-1.570796327e+00">
+                    <ladder distance="1.700000000e+01" thickness="1.000000000e+00" width="1.150000000e+01" length="6.250000000e+01" offset="-1.874869853e+00" radLength="1.014262421e+03" />
+                    <sensitive distance="1.800000000e+01" thickness="5.000000000e-02" width="1.100000000e+01" length="6.250000000e+01" offset="-1.624869853e+00" radLength="9.366070445e+01" />
+                </layer>
+                <layer nLadders="11" phi0="-1.570796327e+00">
+                    <ladder distance="3.700000000e+01" thickness="1.000000000e+00" width="2.250000000e+01" length="1.250000000e+02" offset="-1.837940563e+00" radLength="1.014262421e+03" />
+                    <sensitive distance="3.695000000e+01" thickness="5.000000000e-02" width="2.200000000e+01" length="1.250000000e+02" offset="-1.587940563e+00" radLength="9.366070445e+01" />
+                </layer>
+                <layer nLadders="11" phi0="-1.570796327e+00">
+                    <ladder distance="3.800000000e+01" thickness="1.000000000e+00" width="2.250000000e+01" length="1.250000000e+02" offset="-1.837940563e+00" radLength="1.014262421e+03" />
+                    <sensitive distance="3.900000000e+01" thickness="5.000000000e-02" width="2.200000000e+01" length="1.250000000e+02" offset="-1.587940563e+00" radLength="9.366070445e+01" />
+                </layer>
+                <layer nLadders="17" phi0="-1.570796327e+00">
+                    <ladder distance="5.800000000e+01" thickness="1.000000000e+00" width="2.250000000e+01" length="1.250000000e+02" offset="-2.636744400e+00" radLength="1.014262421e+03" />
+                    <sensitive distance="5.795000000e+01" thickness="5.000000000e-02" width="2.200000000e+01" length="1.250000000e+02" offset="-2.386744400e+00" radLength="9.366070445e+01" />
+                </layer>
+                <layer nLadders="17" phi0="-1.570796327e+00">
+                    <ladder distance="5.900000000e+01" thickness="1.000000000e+00" width="2.250000000e+01" length="1.250000000e+02" offset="-2.636744400e+00" radLength="1.014262421e+03" />
+                    <sensitive distance="6.000000000e+01" thickness="5.000000000e-02" width="2.200000000e+01" length="1.250000000e+02" offset="-2.386744400e+00" radLength="9.366070445e+01" />
+                </layer>
+            </layers>
+        </detector>
+        <detector name="FTD" geartype="FTDParameters">
+            <layers>
+                <layer nPetals="16" nSensors="1" isDoubleSided="0" sensorType="PIXEL" petalOpenningAngle="1.963495408e-01" phi0="0.000000000e+00" alpha="0.000000000e+00" zoffset="0.000000000e+00" zsign0="1.000000000e+00" zposition="2.205200000e+02">
+                    <support thickness="1.000000000e+00" width="1.224000000e+02" lengthMin="1.173582968e+01" lengthMax="6.042957721e+01" rInner="2.950000000e+01" radLength="2.807467352e+02" />
+                    <sensitive thickness="2.000000000e-02" width="1.224000000e+02" lengthMin="1.173582968e+01" lengthMax="6.042957721e+01" rInner="2.950000000e+01" radLength="9.366070445e+01" />
+                </layer>
+                <layer nPetals="16" nSensors="1" isDoubleSided="0" sensorType="PIXEL" petalOpenningAngle="1.963495408e-01" phi0="0.000000000e+00" alpha="0.000000000e+00" zoffset="0.000000000e+00" zsign0="1.000000000e+00" zposition="3.715200000e+02">
+                    <support thickness="1.000000000e+00" width="1.213600000e+02" lengthMin="1.214956740e+01" lengthMax="6.042957721e+01" rInner="3.054000000e+01" radLength="2.807467352e+02" />
+                    <sensitive thickness="2.000000000e-02" width="1.213600000e+02" lengthMin="1.214956740e+01" lengthMax="6.042957721e+01" rInner="3.054000000e+01" radLength="9.366070445e+01" />
+                </layer>
+                <layer nPetals="16" nSensors="2" isDoubleSided="1" sensorType="STRIP" petalOpenningAngle="1.963495408e-01" phi0="0.000000000e+00" alpha="0.000000000e+00" zoffset="0.000000000e+00" zsign0="1.000000000e+00" zposition="6.462000000e+02">
+                    <support thickness="2.000000000e+00" width="2.665000000e+02" lengthMin="1.292930388e+01" lengthMax="1.189495957e+02" rInner="3.250000000e+01" radLength="2.807467352e+02" />
+                    <sensitive thickness="2.000000000e-01" width="2.665000000e+02" lengthMin="1.292930388e+01" lengthMax="1.189495957e+02" rInner="3.250000000e+01" radLength="9.366070445e+01" />
+                </layer>
+                <layer nPetals="16" nSensors="2" isDoubleSided="1" sensorType="STRIP" petalOpenningAngle="1.963495408e-01" phi0="0.000000000e+00" alpha="0.000000000e+00" zoffset="0.000000000e+00" zsign0="1.000000000e+00" zposition="8.472000000e+02">
+                    <support thickness="2.000000000e+00" width="2.750000000e+02" lengthMin="1.352604098e+01" lengthMax="1.229278430e+02" rInner="3.400000000e+01" radLength="2.807467352e+02" />
+                    <sensitive thickness="2.000000000e-01" width="2.750000000e+02" lengthMin="1.352604098e+01" lengthMax="1.229278430e+02" rInner="3.400000000e+01" radLength="9.366070445e+01" />
+                </layer>
+                <layer nPetals="16" nSensors="2" isDoubleSided="1" sensorType="STRIP" petalOpenningAngle="1.963495408e-01" phi0="0.000000000e+00" alpha="0.000000000e+00" zoffset="0.000000000e+00" zsign0="1.000000000e+00" zposition="9.262000000e+02">
+                    <support thickness="2.000000000e+00" width="2.735000000e+02" lengthMin="1.412277808e+01" lengthMax="1.229278430e+02" rInner="3.550000000e+01" radLength="2.807467352e+02" />
+                    <sensitive thickness="2.000000000e-01" width="2.735000000e+02" lengthMin="1.412277808e+01" lengthMax="1.229278430e+02" rInner="3.550000000e+01" radLength="9.366070445e+01" />
+                </layer>
+            </layers>
+            <parameter name="strip_angle_deg" type="double" value="5.000000000e+00" />
+            <parameter name="strip_length_mm" type="double" value="1.600000000e+03" />
+            <parameter name="strip_pitch_mm" type="double" value="1.000000000e-02" />
+            <parameter name="strip_width_mm" type="double" value="1.000000000e-03" />
+        </detector>
+        <detector name="SIT" geartype="ZPlanarParameters">
+            <type technology="CCD" />
+            <shell halfLength="0.000000000e+00" gap="0.000000000e+00" innerRadius="0.000000000e+00" outerRadius="0.000000000e+00" radLength="0.000000000e+00" />
+            <layers>
+                <layer nLadders="10" phi0="0.000000000e+00">
+                    <ladder distance="1.531000000e+02" thickness="1.000000000e+00" width="9.916044311e+01" length="3.680000000e+02" offset="0.000000000e+00" radLength="2.134851878e+02" />
+                    <sensitive distance="1.529000000e+02" thickness="2.000000000e-01" width="9.916044311e+01" length="3.680000000e+02" offset="0.000000000e+00" radLength="9.366070445e+01" />
+                </layer>
+                <layer nLadders="10" phi0="0.000000000e+00">
+                    <ladder distance="1.544000000e+02" thickness="1.000000000e+00" width="1.001352022e+02" length="3.680000000e+02" offset="0.000000000e+00" radLength="2.134851878e+02" />
+                    <sensitive distance="1.554000000e+02" thickness="2.000000000e-01" width="1.001352022e+02" length="3.680000000e+02" offset="0.000000000e+00" radLength="9.366070445e+01" />
+                </layer>
+                <layer nLadders="19" phi0="0.000000000e+00">
+                    <ladder distance="3.001000000e+02" thickness="1.000000000e+00" width="9.988891763e+01" length="6.440000000e+02" offset="0.000000000e+00" radLength="2.134851878e+02" />
+                    <sensitive distance="2.999000000e+02" thickness="2.000000000e-01" width="9.988891763e+01" length="6.440000000e+02" offset="0.000000000e+00" radLength="9.366070445e+01" />
+                </layer>
+                <layer nLadders="19" phi0="0.000000000e+00">
+                    <ladder distance="3.014000000e+02" thickness="1.000000000e+00" width="1.003895291e+02" length="6.440000000e+02" offset="0.000000000e+00" radLength="2.134851878e+02" />
+                    <sensitive distance="3.024000000e+02" thickness="2.000000000e-01" width="1.003895291e+02" length="6.440000000e+02" offset="0.000000000e+00" radLength="9.366070445e+01" />
+                </layer>
+            </layers>
+            <parameter name="sensor_length_mm" type="double" value="9.200000000e+01" />
+            <parameter name="strip_angle_deg" type="double" value="7.000000000e+00" />
+            <parameter name="strip_length_mm" type="double" value="9.200000000e+01" />
+            <parameter name="strip_pitch_mm" type="double" value="5.000000000e-02" />
+            <parameter name="strip_width_mm" type="double" value="1.250000000e-02" />
+            <parameter name="n_sensors_per_ladder" type="IntVec" value="8 8 14 14" />
+        </detector>
+        <detector name="SET" geartype="ZPlanarParameters">
+            <type technology="CCD" />
+            <shell halfLength="0.000000000e+00" gap="0.000000000e+00" innerRadius="0.000000000e+00" outerRadius="0.000000000e+00" radLength="0.000000000e+00" />
+            <layers>
+                <layer nLadders="24" phi0="0.000000000e+00">
+                    <ladder distance="1.811100000e+03" thickness="1.000000000e+00" width="4.766190158e+02" length="2.300000000e+03" offset="0.000000000e+00" radLength="2.134851878e+02" />
+                    <sensitive distance="1.810900000e+03" thickness="2.000000000e-01" width="4.766190158e+02" length="2.300000000e+03" offset="0.000000000e+00" radLength="9.366070445e+01" />
+                </layer>
+                <layer nLadders="24" phi0="0.000000000e+00">
+                    <ladder distance="1.812400000e+03" thickness="1.000000000e+00" width="4.770139733e+02" length="2.300000000e+03" offset="0.000000000e+00" radLength="2.134851878e+02" />
+                    <sensitive distance="1.813400000e+03" thickness="2.000000000e-01" width="4.770139733e+02" length="2.300000000e+03" offset="0.000000000e+00" radLength="9.366070445e+01" />
+                </layer>
+            </layers>
+            <parameter name="sensor_length_mm" type="double" value="9.200000000e+01" />
+            <parameter name="strip_angle_deg" type="double" value="7.000000000e+00" />
+            <parameter name="strip_length_mm" type="double" value="9.200000000e+01" />
+            <parameter name="strip_pitch_mm" type="double" value="5.000000000e-02" />
+            <parameter name="strip_width_mm" type="double" value="1.250000000e-02" />
+            <parameter name="n_sensors_per_ladder" type="IntVec" value="50 50" />
+        </detector>
+        <detector name="BeamPipe" geartype="GearParameters">
+            <parameter name="BeamPipeHalfZ" type="double" value="7.300000000e+02" />
+            <parameter name="BeamPipeProperties_RadLen" type="double" value="3.527597571e+02" />
+            <parameter name="BeamPipeProperties_dEdx" type="double" value="2.941795296e-04" />
+            <parameter name="BeamPipeRadius" type="double" value="1.400000000e+01" />
+            <parameter name="BeamPipeThickness" type="double" value="5.000000000e-01" />
+            <parameter name="RInner" type="DoubleVec" value="1.400000000e+01 1.400000000e+01 2.500000000e+00 1.300000000e+01 1.300000000e+01 1.300000000e+01 1.550000000e+01 1.550000000e+01 1.900000000e+01 1.900000000e+01 2.500000000e+01 2.500000000e+01 1.300000000e+01 1.300000000e+01 2.050000000e+01 2.050000000e+01 2.300000000e+01 2.300000000e+01 2.600000000e+01 2.600000000e+01 3.200000000e+01 3.200000000e+01" />
+            <parameter name="ROuter" type="DoubleVec" value="1.450000000e+01 1.450000000e+01 1.800000000e+01 1.800000000e+01 1.550000000e+01 1.550000000e+01 1.900000000e+01 1.900000000e+01 2.500000000e+01 2.500000000e+01 3.300000000e+01 3.300000000e+01 1.550000000e+01 1.550000000e+01 2.300000000e+01 2.300000000e+01 2.600000000e+01 2.600000000e+01 3.200000000e+01 3.200000000e+01 4.000000000e+01 4.000000000e+01" />
+            <parameter name="Z" type="DoubleVec" value="0.000000000e+00 5.000000000e+02 7.000000000e+02 7.010000000e+02 2.200000000e+03 2.200000000e+03 2.200000000e+03 2.200000000e+03 2.200000000e+03 2.200000000e+03 2.200000000e+03 2.200000000e+03 3.950000000e+03 3.950000000e+03 4.450000000e+03 4.450000000e+03 4.450000000e+03 4.450000000e+03 4.450000000e+03 4.450000000e+03 4.450000000e+03 4.450000000e+03" />
+        </detector>
+        <detector name="CoilParameters" geartype="GearParameters">
+            <parameter name="Coil_cryostat_c_modules_half_z" type="double" value="1.224000000e+03" />
+            <parameter name="Coil_cryostat_c_modules_inner_radius" type="double" value="3.348930000e+03" />
+            <parameter name="Coil_cryostat_c_modules_outer_radius" type="double" value="3.599930000e+03" />
+            <parameter name="Coil_cryostat_half_z" type="double" value="3.872000000e+03" />
+            <parameter name="Coil_cryostat_inner_cyl_half_z" type="double" value="3.872000000e+03" />
+            <parameter name="Coil_cryostat_inner_cyl_inner_radius" type="double" value="3.173930000e+03" />
+            <parameter name="Coil_cryostat_inner_cyl_outer_radius" type="double" value="3.963930000e+03" />
+            <parameter name="Coil_cryostat_inner_radius" type="double" value="3.173930000e+03" />
+            <parameter name="Coil_cryostat_mandrel_half_z" type="double" value="3.675000000e+03" />
+            <parameter name="Coil_cryostat_mandrel_inner_radius" type="double" value="3.599930000e+03" />
+            <parameter name="Coil_cryostat_mandrel_outer_radius" type="double" value="3.827930000e+03" />
+            <parameter name="Coil_cryostat_modules_half_z" type="double" value="7.960000000e+02" />
+            <parameter name="Coil_cryostat_modules_inner_radius" type="double" value="3.348930000e+03" />
+            <parameter name="Coil_cryostat_modules_outer_radius" type="double" value="3.599930000e+03" />
+            <parameter name="Coil_cryostat_outer_cyl_half_z" type="double" value="3.872000000e+03" />
+            <parameter name="Coil_cryostat_outer_cyl_inner_radius" type="double" value="3.893930000e+03" />
+            <parameter name="Coil_cryostat_outer_cyl_outer_radius" type="double" value="3.923930000e+03" />
+            <parameter name="Coil_cryostat_outer_radius" type="double" value="3.923930000e+03" />
+            <parameter name="Coil_cryostat_scint1_inner_radius" type="double" value="3.263930000e+03" />
+            <parameter name="Coil_cryostat_scint1_outer_radius" type="double" value="3.273930000e+03" />
+            <parameter name="Coil_cryostat_scint1_zposend" type="double" value="3.972000000e+03" />
+            <parameter name="Coil_cryostat_scint1_zposin" type="double" value="3.772000000e+03" />
+            <parameter name="Coil_cryostat_scint2_inner_radius" type="double" value="3.278930000e+03" />
+            <parameter name="Coil_cryostat_scint2_outer_radius" type="double" value="3.288930000e+03" />
+            <parameter name="Coil_cryostat_scint2_zposend" type="double" value="3.972000000e+03" />
+            <parameter name="Coil_cryostat_scint2_zposin" type="double" value="3.772000000e+03" />
+            <parameter name="Coil_cryostat_scint3_inner_radius" type="double" value="3.833930000e+03" />
+            <parameter name="Coil_cryostat_scint3_outer_radius" type="double" value="3.843930000e+03" />
+            <parameter name="Coil_cryostat_scint3_zposend" type="double" value="3.972000000e+03" />
+            <parameter name="Coil_cryostat_scint3_zposin" type="double" value="3.772000000e+03" />
+            <parameter name="Coil_cryostat_scint4_inner_radius" type="double" value="3.818930000e+03" />
+            <parameter name="Coil_cryostat_scint4_outer_radius" type="double" value="3.828930000e+03" />
+            <parameter name="Coil_cryostat_scint4_zposend" type="double" value="3.972000000e+03" />
+            <parameter name="Coil_cryostat_scint4_zposin" type="double" value="3.772000000e+03" />
+            <parameter name="Coil_cryostat_side_l_half_z" type="double" value="2.500000000e+01" />
+            <parameter name="Coil_cryostat_side_l_inner_radius" type="double" value="3.213930000e+03" />
+            <parameter name="Coil_cryostat_side_l_outer_radius" type="double" value="3.893930000e+03" />
+            <parameter name="Coil_cryostat_side_r_half_z" type="double" value="2.500000000e+01" />
+            <parameter name="Coil_cryostat_side_r_inner_radius" type="double" value="3.213930000e+03" />
+            <parameter name="Coil_cryostat_side_r_outer_radius" type="double" value="3.893930000e+03" />
+            <parameter name="Coil_material_c_modules" type="string" value="aluminium" />
+            <parameter name="Coil_material_inner_cyl" type="string" value="aluminium" />
+            <parameter name="Coil_material_mandrel" type="string" value="aluminium" />
+            <parameter name="Coil_material_modules" type="string" value="aluminium" />
+            <parameter name="Coil_material_outer_cyl" type="string" value="aluminium" />
+            <parameter name="Coil_material_scint1" type="string" value="polystyrene" />
+            <parameter name="Coil_material_scint2" type="string" value="polystyrene" />
+            <parameter name="Coil_material_scint3" type="string" value="polystyrene" />
+            <parameter name="Coil_material_scint4" type="string" value="polystyrene" />
+            <parameter name="Coil_material_side_l" type="string" value="aluminium" />
+            <parameter name="Coil_material_side_r" type="string" value="aluminium" />
+        </detector>
+        <detector name="MokkaParameters" geartype="GearParameters">
+            <parameter name="Ecal_endcap_outer_radius" type="string" value="2088.8" />
+            <parameter name="Ecal_endcap_plug_rmin" type="string" value="240" />
+            <parameter name="Ecal_endcap_zmax" type="string" value="2635" />
+            <parameter name="Ecal_endcap_zmin" type="string" value="2450" />
+            <parameter name="Ecal_outer_radius" type="string" value="2028" />
+            <parameter name="Hcal_R_max" type="string" value="3144.43" />
+            <parameter name="Hcal_endcap_zmin" type="string" value="2650" />
+            <parameter name="Lcal_z_begin" type="string" value="951.9" />
+            <parameter name="Lcal_z_thickness" type="string" value="128.1" />
+            <parameter name="MokkaModel" type="string" value="CEPC_v4" />
+            <parameter name="MokkaVersion" type="string" value="void" />
+            <parameter name="SIT1_Half_Length_Z" type="string" value="368" />
+            <parameter name="SIT1_Radius" type="string" value="152.9" />
+            <parameter name="SIT2_Half_Length_Z" type="string" value="644" />
+            <parameter name="SIT2_Radius" type="string" value="299.9" />
+            <parameter name="SiTrackerEndcap" type="string" value="FTD_PIXEL,29.5,151.9,220,16;FTD_PIXEL,30.54,151.9,371,16;FTD_STRIP,32.5,299,645,16;FTD_STRIP,34,309,846,16;FTD_STRIP,35.5,309,925,16" />
+            <parameter name="SiTrackerLayerStructure" type="string" value="FTD_PIXEL,Si:-0.02,CarbonFiber:1;FTD_STRIP,Si:-0.2,CarbonFiber:2,Si:-0.2" />
+            <parameter name="TPC_Ecal_Hcal_barrel_halfZ" type="string" value="2350" />
+            <parameter name="Yoke_Z_start_endcaps" type="string" value="4072" />
+            <parameter name="Yoke_barrel_inner_radius" type="string" value="4173.929931640625" />
+            <parameter name="calorimeter_region_rmax" type="string" value="3144.43" />
+            <parameter name="calorimeter_region_zmax" type="string" value="3736.43" />
+            <parameter name="tracker_region_rmax" type="string" value="1842.9" />
+            <parameter name="tracker_region_zmax" type="string" value="2350" />
+            <parameter name="world_box_hx" type="string" value="" />
+            <parameter name="world_box_hy" type="string" value="" />
+            <parameter name="world_box_hz" type="string" value="" />
+        </detector>
+        <detector name="VXDInfra" geartype="GearParameters">
+            <parameter name="ActiveLayerProperties_dEdx" type="double" value="3.870163611e-04" />
+            <parameter name="BeSupportEndplateThickness" type="double" value="2.000000000e+00" />
+            <parameter name="BeSupport_dEdx" type="double" value="2.941795296e-04" />
+            <parameter name="CryostatAlHalfZ" type="double" value="1.766000000e+02" />
+            <parameter name="CryostatAlInnerR" type="double" value="2.420000000e+01" />
+            <parameter name="CryostatAlRadius" type="double" value="1.000000000e+02" />
+            <parameter name="CryostatAlThickness" type="double" value="5.000000000e-01" />
+            <parameter name="CryostatAlZEndCap" type="double" value="1.768500000e+02" />
+            <parameter name="CryostatFoamRadius" type="double" value="9.000000000e+01" />
+            <parameter name="CryostatFoamThickness" type="double" value="1.000000000e+01" />
+            <parameter name="Cryostat_RadLen" type="double" value="8.896317758e+01" />
+            <parameter name="Cryostat_dEdx" type="double" value="4.350185478e-04" />
+            <parameter name="ElectronicEndLength" type="double" value="1.000000000e+01" />
+            <parameter name="ElectronicEndThickness" type="double" value="1.000000000e-01" />
+            <parameter name="StripLineBeamPipeRadius" type="double" value="2.430000000e+01" />
+            <parameter name="VXDEndPlateInnerRadius" type="double" value="3.000000000e+01" />
+            <parameter name="VXDSupport_dEdx" type="double" value="5.431907412e-05" />
+            <parameter name="LadderGaps" type="DoubleVec" value="0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00" />
+            <parameter name="StripLineFinalZ" type="DoubleVec" value="1.500000000e+02 1.500000000e+02 1.500000000e+02 1.500000000e+02 1.500000000e+02 1.500000000e+02" />
+        </detector>
+    </detectors>
+    <materials>
+        <material name="VXDFoamShellMaterial" A="1.043890843e+01" Z="5.612886646e+00" density="2.500000000e+01" radLength="1.751650267e+04" intLength="6.594366018e+01" />
+        <material name="VXDSupportMaterial" A="2.075865162e+01" Z="1.039383117e+01" density="2.765900000e+02" radLength="1.014262421e+03" intLength="1.206635688e+02" />
+    </materials>
+</gear>

Detector/DetCEPCv4/compact/CepCBeamPipe_v01_01.xml

+<lccdd>
+  <info name="CRD" title="CRD Beam pipe" author="Chengdong Fu" url="no" status="development" version="1.0">
+    <comment>A beampipe for CRD</comment>
+  </info>
+
+  <define>
+    <constant name="BeamPipe_Be_inner_thickness"   value="0.5*mm"/>
+    <constant name="BeamPipe_Cooling_thickness"    value="0.5*mm"/>
+    <constant name="BeamPipe_Be_outer_thickness"   value="0.3*mm"/>
+    <constant name="BeamPipe_Be_total_thickness"   value="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness"/>
+    <constant name="BeamPipe_Al_thickness"         value="BeamPipe_Be_total_thickness"/>
+    <constant name="BeamPipe_Cu_thickness"         value="2.0*mm"/>
+    <constant name="BeamPipe_Iron_thickness"       value="2.5*mm"/>
+
+    <constant name="BeamPipe_CentralBe_zmax"       value="120*mm"/>
+    <constant name="BeamPipe_CentralAl_zmax"       value="205*mm"/>
+    <constant name="BeamPipe_ConeAl_zmax"          value="655*mm"/>
+    <constant name="BeamPipe_LinkerAl_zmax"        value="700*mm"/>
+    <constant name="BeamPipe_LinkerCu_zmax"        value="780*mm"/>
+    <constant name="BeamPipe_Waist_zmax"           value="805*mm"/>
+    <constant name="BeamPipe_Crotch_zmax"          value="855*mm"/>
+    <constant name="BeamPipe_FirstSeparated_zmax"  value="1110*mm"/>
+    <constant name="BeamPipe_SecondSeparated_zmax" value="2200*mm"/>
+    <constant name="BeamPipe_QD0_zmax"             value="3950*mm"/>
+    <constant name="BeamPipe_QF1_zmin"             value="4450*mm"/>
+    <constant name="BeamPipe_QF1_zmax"             value="5910*mm"/>
+    <constant name="BeamPipe_end_z"                value="7050*mm"/>
+    
+    <constant name="BeamPipe_Central_inner_radius"  value="14*mm"/>
+    <constant name="BeamPipe_Expanded_inner_radius" value="20*mm"/>
+    <constant name="BeamPipe_Upstream_inner_radius" value="6*mm"/>
+    <constant name="BeamPipe_Dnstream_inner_radius" value="10*mm"/>
+    <constant name="BeamPipe_QF1_inner_radius"  value="20.5*mm"/>
+    <constant name="BeamPipe_Crotch_hole_height"    value="30.67*mm"/>
+    <constant name="BeamPipe_VertexRegion_rmax"     value="BeamPipe_Central_inner_radius+BeamPipe_Al_thickness"/>
+    <constant name="BeamPipe_ForwardRegion_rmax"    value="BeamPipe_Expanded_inner_radius+BeamPipe_Cu_thickness"/>
+
+    <constant name="ForkAsymThickness" value="BeamPipe_Dnstream_inner_radius+BeamPipe_Cu_thickness-BeamPipe_Upstream_inner_radius"/>
+  </define>
+
+  <detectors>        
+    <detector name="BeamPipe" type="CRDBeamPipe_v01" vis="BeamPipeVis">
+      <parameter crossingangle="CepC_Main_Crossing_Angle" />
+      <envelope>
+	<shape type="Assembly"/>
+      </envelope>
+
+      <section type ="Center" name="IPInnerTube" zStart="0" zEnd="BeamPipe_CentralBe_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+	<layer material="G4_Be" thickness="BeamPipe_Be_inner_thickness" vis="BeamPipeVis"/>
+	<layer material="G4_PARAFFIN" thickness="BeamPipe_Cooling_thickness"/>
+	<layer material="G4_Be" thickness="BeamPipe_Be_outer_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="Center" name="IPAl" zStart="BeamPipe_CentralBe_zmax" zEnd="BeamPipe_CentralAl_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
+	<layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="Center" name="ExpandPipe" zStart="BeamPipe_CentralAl_zmax" zEnd="BeamPipe_ConeAl_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Central_inner_radius" thicknessEnd="BeamPipe_Expanded_inner_radius" vis="VacVis"/>
+	<layer material="G4_Al" thickness="BeamPipe_Al_thickness" thicknessEnd="BeamPipe_Al_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="Center" name="ThickPipe" zStart="BeamPipe_ConeAl_zmax" zEnd="BeamPipe_LinkerAl_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Expanded_inner_radius" vis="VacVis"/>
+	<layer material="G4_Al" thickness="BeamPipe_Al_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="OutsideLink" zStart="BeamPipe_LinkerAl_zmax" zEnd="BeamPipe_LinkerCu_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Expanded_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="FatWaist" name="Waist" zStart="BeamPipe_LinkerCu_zmax" zEnd="BeamPipe_Waist_zmax" rStart="BeamPipe_Expanded_inner_radius" size="BeamPipe_Crotch_hole_height">
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="CrotchAsymUp" name="Fork" zStart="BeamPipe_Waist_zmax" zEnd="BeamPipe_Crotch_zmax"
+	       rStart="BeamPipe_Expanded_inner_radius" rEnd="BeamPipe_Upstream_inner_radius" size="BeamPipe_Crotch_hole_height">
+	<layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" thicknessEnd="ForkAsymThickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="CrotchAsymDn" name="Fork" zStart="BeamPipe_Waist_zmax" zEnd="BeamPipe_Crotch_zmax"
+	       rStart="BeamPipe_Expanded_inner_radius" rEnd="BeamPipe_Dnstream_inner_radius" size="BeamPipe_Crotch_hole_height">
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="FlareLegUp" name="FirstDoublePipe" zStart="BeamPipe_Crotch_zmax" zEnd="BeamPipe_FirstSeparated_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Upstream_inner_radius" thicknessEnd="BeamPipe_Dnstream_inner_radius" vis="VacVis"/>
+	<layer material="G4_Cu" thickness="ForkAsymThickness" thicknessEnd="BeamPipe_Cu_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="FlareLegDn" name="FirstDoublePipe" zStart="BeamPipe_Crotch_zmax" zEnd="BeamPipe_FirstSeparated_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Dnstream_inner_radius" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="Legs" name="QD0Link" zStart="BeamPipe_FirstSeparated_zmax" zEnd="BeamPipe_SecondSeparated_zmax" rStart="0">
+	<layer material="beam" thickness="BeamPipe_Dnstream_inner_radius" vis="VacVis"/>
+        <layer material="stainless_steel" thickness="BeamPipe_Iron_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="Legs" name="QD0" zStart="BeamPipe_SecondSeparated_zmax" zEnd="BeamPipe_QD0_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Dnstream_inner_radius" vis="VacVis"/>
+        <layer material="stainless_steel" thickness="BeamPipe_Iron_thickness" vis="BeamPipeVis"/>
+	<layer material="G4_Cu" thickness="3.5*mm" vis="BeamPipeVis"/>
+	<layer material="superconductor" thickness="6.0*mm" vis="BeamPipeVis"/>
+	<layer material="stainless_steel" thickness="8.0*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="Legs" name="QF1Link" zStart="BeamPipe_QD0_zmax" zEnd="BeamPipe_QF1_zmin" rStart="0">
+        <layer material="beam" thickness="BeamPipe_Dnstream_inner_radius" thicknessEnd="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+        <layer material="stainless_steel" thickness="BeamPipe_Iron_thickness" vis="BeamPipeVis"/>
+      </section>
+      <section type="Legs" name="QF1" zStart="BeamPipe_QF1_zmin" zEnd="BeamPipe_QF1_zmax" rStart="0">
+        <layer material="beam" thickness="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+        <layer material="stainless_steel" thickness="BeamPipe_Iron_thickness" vis="BeamPipeVis"/>
+	<layer material="G4_Cu" thickness="3.0*mm" vis="BeamPipeVis"/>
+        <layer material="superconductor" thickness="6.0*mm" vis="BeamPipeVis"/>
+        <layer material="stainless_steel" thickness="8.0*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="Legs" name="Farest" zStart="BeamPipe_QF1_zmax" zEnd="BeamPipe_end_z" rStart="0">
+        <layer material="beam" thickness="BeamPipe_QF1_inner_radius" vis="VacVis"/>
+        <layer material="stainless_steel" thickness="BeamPipe_Iron_thickness" vis="BeamPipeVis"/>
+      </section>
+
+      <!-- Magnets and their cooling, support -->
+      <section type="CenterSide" name="Magnet_1" zStart="1160*mm" zEnd="1900*mm" rStart="90*mm">
+        <layer material="superconductor" thickness="20*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="Magnet_2" zStart="1930*mm" zEnd="3964*mm" rStart="120*mm">
+        <layer material="superconductor" thickness="10*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="Magnet_3" zStart="3970*mm" zEnd="7000*mm" rStart="185*mm">
+        <layer material="superconductor" thickness="10*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_1" zStart="970*mm" zEnd="1110*mm" rStart="31*mm">
+        <layer material="stainless_steel" thickness="1.5*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_2" zStart="1110*mm" zEnd="1115*mm" rStart="50.0*mm">
+        <layer material="stainless_steel" thickness="91.25*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_3" zStart="1115*mm" zEnd="1900*mm" rStart="130.75*mm" rEnd="175*mm">
+        <layer material="stainless_steel" thickness="10.5*mm" thicknessEnd="65*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_4" zStart="1900*mm" zEnd="3800*mm" rStart="175*mm">
+        <layer material="stainless_steel" thickness="65*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_5" zStart="3800*mm" zEnd="3910*mm" rStart="175*mm">
+        <layer material="stainless_steel" thickness="135*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetShell_6" zStart="3910*mm" zEnd="7160*mm" rStart="240*mm">
+        <layer material="stainless_steel" thickness="70*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_1" zStart="1130*mm" zEnd="1135*mm" rStart="75*mm">
+        <layer material="stainless_steel" thickness="50*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_2i" zStart="1135*mm" zEnd="1925*mm" rStart="75*mm">
+        <layer material="stainless_steel" thickness="5*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_2o" zStart="1135*mm" zEnd="1900*mm" rStart="120*mm">
+        <layer material="stainless_steel" thickness="5*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_3l" zStart="1900*mm" zEnd="1905*mm" rStart="120*mm">
+        <layer material="stainless_steel" thickness="25*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_3r" zStart="1925*mm" zEnd="1930*mm" rStart="75*mm">
+        <layer material="stainless_steel" thickness="35*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_4i" zStart="1930*mm" zEnd="4000*mm" rStart="105*mm">
+        <layer material="stainless_steel" thickness="5*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_4o" zStart="1905*mm" zEnd="3940*mm" rStart="140*mm">
+        <layer material="stainless_steel" thickness="5*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_5l" zStart="3940*mm" zEnd="3945*mm" rStart="140*mm">
+        <layer material="stainless_steel" thickness="70*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_5r" zStart="4000*mm" zEnd="4005*mm" rStart="105*mm">
+        <layer material="stainless_steel" thickness="70*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_6i" zStart="4005*mm" zEnd="7050*mm" rStart="170*mm">
+        <layer material="stainless_steel" thickness="5*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_6o" zStart="3945*mm" zEnd="7050*mm" rStart="205*mm">
+        <layer material="stainless_steel" thickness="5*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetSupport_7" zStart="7050*mm" zEnd="7055*mm" rStart="170*mm">
+        <layer material="stainless_steel" thickness="40*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1l" zStart="1135*mm" zEnd="1160*mm" rStart="80*mm">
+        <layer material="lN2" thickness="40*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1i" zStart="1160*mm" zEnd="1900*mm" rStart="80*mm">
+        <layer material="lN2" thickness="10*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1o" zStart="1160*mm" zEnd="1900*mm" rStart="110*mm">
+        <layer material="lN2" thickness="10*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_1r" zStart="1900*mm" zEnd="1925*mm" rStart="80*mm">
+        <layer material="lN2" thickness="40*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2l" zStart="1905*mm" zEnd="1930*mm" rStart="120*mm">
+        <layer material="lN2" thickness="20*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2i" zStart="1925*mm" zEnd="3964*mm" rStart="110*mm">
+        <layer material="lN2" thickness="10*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2o" zStart="1930*mm" zEnd="3945*mm" rStart="130*mm">
+        <layer material="lN2" thickness="10*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2r1" zStart="3964*mm" zEnd="4000*mm" rStart="110*mm">
+        <layer material="lN2" thickness="65*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_2r2" zStart="3945*mm" zEnd="3964*mm" rStart="130*mm">
+        <layer material="lN2" thickness="45*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3l" zStart="3945*mm" zEnd="3970*mm" rStart="175*mm">
+        <layer material="lN2" thickness="30*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3i" zStart="3970*mm" zEnd="7000*mm" rStart="175*mm">
+        <layer material="lN2" thickness="10*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3o" zStart="3970*mm" zEnd="7000*mm" rStart="195*mm">
+        <layer material="lN2" thickness="10*mm" vis="BeamPipeVis"/>
+      </section>
+      <section type="CenterSide" name="MagnetCooling_3r" zStart="7000*mm" zEnd="7050*mm" rStart="175*mm">
+        <layer material="lN2" thickness="30*mm" vis="BeamPipeVis"/>
+      </section>
+    </detector>
+  </detectors>        
+</lccdd>

Detector/DetCEPCv4/compact/CepC_v4-onlyECAL.xml

@@ -47,14 +47,14 @@
   </limits>
   <include ref="display.xml"/>
   <!-- <include ref="Beampipe_o1_v01_01.xml"/> -->
-  <!-- <include ref="vxd07.xml"/> -->
+  <!-- <include ref="vxd07_01.xml"/> -->
   <!-- <include ref="ftd_simple_staggered_02.xml"/> -->
   <!-- <include ref="sit_simple_pixel_sensors_01.xml"/> -->
   <!-- <include ref="tpc10_01.xml"/> -->
   <!-- <include ref="set_simple_planar_sensors_01.xml"/> -->
   <include ref="SEcal05_siw_Barrel.xml"/>
   <include ref="SEcal05_siw_Endcaps.xml"/>
-  <include ref="SEcal05_siw_ECRing.xml"/>
+  <include ref="SEcal05_siw_ECRing_01.xml"/>
   <!-- <include ref="Hcal_Barrel_SD_v01.xml"/> -->
   <!-- <include ref="Hcal_Endcaps_SD_v01.xml"/> -->
   <!-- <include ref="Hcal_EndcapRing_SD_v01.xml"/> -->

Detector/DetCEPCv4/compact/CepC_v4-onlyTracker.xml

@@ -47,14 +47,14 @@
   </limits>
   <include ref="display.xml"/>
   <include ref="Beampipe_o1_v01_01.xml"/>
-  <include ref="vxd07.xml"/>
-  <include ref="ftd_cepc.xml"/>
+  <include ref="vxd07_01.xml"/>
+  <include ref="ftd_cepc_01.xml"/>
   <include ref="sit_simple_planar_sensors_01.xml"/>
   <include ref="tpc10_01.xml"/>
   <include ref="set_simple_planar_sensors_01.xml"/>
   <!--include ref="SEcal05_siw_Barrel.xml"/>
   <include ref="SEcal05_siw_Endcaps.xml"/>
-  <include ref="SEcal05_siw_ECRing.xml"/>
+  <include ref="SEcal05_siw_ECRing_01.xml"/>
   <include ref="Hcal_Barrel_SD_v01.xml"/>
   <include ref="Hcal_Endcaps_SD_v01.xml"/>
   <include ref="Hcal_EndcapRing_SD_v01.xml"/>
@@ -75,12 +75,13 @@
   <include ref="Field_AntiDID_Map_s.xml"/>
   <include ref="Field_FwdMagnets_Ideal_1000GeV.xml"/-->
 
-
   <fields>
-
-    <field name="MagnetFields_Constant" type="ConstantField" field="magnetic">
-      <strength x="0" y="0" z="3.0*tesla"/>
+    <field name="GlobalSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="Field_outer_nominal_value"
+           zmax="TPC_Ecal_Hcal_barrel_halfZ + Coil_extra_size"
+           outer_radius="Hcal_outer_radius + Coil_thickness/2">
     </field>
-
   </fields>
+
 </lccdd>

Detector/DetCEPCv4/compact/CepC_v4-onlyTrackerECAL.xml

+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="CepC_v04"
+        title="CepC detctor used for the optimisation"
+        author="C.D.Fu"
+        url="http://cepc.ihep.ac.cn"
+        status="experimental"
+        version="v04">
+    <comment>CepC detector simulation models used for detector optimisation </comment>
+  </info>
+  <includes>
+    <gdmlFile  ref="elements.xml"/>
+    <gdmlFile  ref="materials.xml"/>
+  </includes>
+  <define>
+    <include ref="top_defs_CepC_v04.xml"/>
+    <include ref="top_defs.xml"/>
+    <include ref="basic_defs.xml"/>
+    <include ref="envelope_defs.xml"/>
+    <include ref="tube_defs.xml"/>
+    <include ref="misc_defs.xml"/>
+    <include ref="tracker_defs.xml"/>
+    <include ref="fcal_defs.xml"/>
+    <include ref="ecal_defs.xml"/>
+    <include ref="hcal_defs.xml"/>
+    <include ref="yoke_defs.xml"/>
+    <include ref="services_defs.xml"/>
+    <include ref="detector_types.xml"/>
+    <include ref="limits.xml"/>
+    <!-- Readout slice in ecal for reconstruction -->
+    <constant name="Ecal_readout_segmentation_slice0" value="4"/>
+    <constant name="Ecal_readout_segmentation_slice1" value="10"/>
+    <!-- Readout slice in hcal for reconstruction -->
+    <constant name="Hcal_readout_segmentation_slice" value="3"/>
+  </define>
+  <limits>
+    <limitset name="cal_limits">
+      <limit name="step_length_max" particles="*" value="cal_steplimit_val" unit="cal_steplimit_unit" />
+    </limitset>
+    <limitset name="TPC_limits">
+      <limit name="step_length_max" particles="*" value="tpc_steplimit_val" unit="tpc_steplimit_unit" />
+    </limitset>
+    <limitset name="Tracker_limits">
+      <limit name="step_length_max" particles="*" value="tracker_steplimit_val" unit="tracker_steplimit_unit" />
+    </limitset>
+  </limits>
+  <include ref="display.xml"/>
+  <include ref="Beampipe_o1_v01_01.xml"/>
+  <include ref="vxd07_01.xml"/>
+  <include ref="ftd_cepc_01.xml"/>
+  <include ref="sit_simple_planar_sensors_01.xml"/>
+  <include ref="tpc10_01.xml"/>
+  <include ref="set_simple_planar_sensors_01.xml"/>
+  <include ref="SEcal05_siw_Barrel.xml"/>
+  <include ref="SEcal05_siw_Endcaps.xml"/>
+  <include ref="SEcal05_siw_ECRing_01.xml"/>
+  <!--include ref="Hcal_Barrel_SD_v01.xml"/>
+  <include ref="Hcal_Endcaps_SD_v01.xml"/>
+  <include ref="Hcal_EndcapRing_SD_v01.xml"/>
+  <include ref="Yoke05_Barrel.xml"/>
+  <include ref="Yoke05_Endcaps.xml"/>
+  <include ref="LumiCal.xml"/-->
+
+  <!--include ref="LHCal01.xml"/>
+  <include ref="BeamCal08.xml"/-->
+
+  <!--include ref="coil03.xml"/-->
+  <!--include ref="SServices00.xml"/-->
+  <plugins>
+    <plugin name="DD4hepVolumeManager"/>
+    <plugin name="InstallSurfaceManager"/>
+  </plugins>
+  <!--include ref="Field_Solenoid_Map_s_4.0T.xml"/>
+  <include ref="Field_AntiDID_Map_s.xml"/>
+  <include ref="Field_FwdMagnets_Ideal_1000GeV.xml"/-->
+
+
+  <fields>
+
+    <field name="MagnetFields_Constant" type="ConstantField" field="magnetic">
+      <strength x="0" y="0" z="3.0*tesla"/>
+    </field>
+
+  </fields>
+</lccdd>

Detector/DetCEPCv4/compact/CepC_v4-onlyVXD.xml

@@ -47,14 +47,14 @@
   </limits>
   <include ref="display.xml"/>
   <include ref="Beampipe_o1_v01_01.xml"/>
-  <include ref="vxd07.xml"/>
+  <include ref="vxd07_01.xml"/>
   <!--include ref="ftd_simple_staggered_02.xml"/>
   <include ref="sit_simple_pixel_sensors_01.xml"/>
   <include ref="tpc10_01.xml"/>
   <include ref="set_simple_planar_sensors_01.xml"/-->
   <!--include ref="SEcal05_siw_Barrel.xml"/>
   <include ref="SEcal05_siw_Endcaps.xml"/>
-  <include ref="SEcal05_siw_ECRing.xml"/>
+  <include ref="SEcal05_siw_ECRing_01.xml"/>
   <include ref="Hcal_Barrel_SD_v01.xml"/>
   <include ref="Hcal_Endcaps_SD_v01.xml"/>
   <include ref="Hcal_EndcapRing_SD_v01.xml"/>

Detector/DetCEPCv4/compact/CepC_v4-patch-BeamECRing.xml

+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="CepC_v04"
+        title="CepC detctor used for the optimisation"
+        author="C.D.Fu"
+        url="http://cepc.ihep.ac.cn"
+        status="experimental"
+        version="v04">
+    <comment>CepC detector simulation models used for detector optimisation </comment>
+  </info>
+  <includes>
+    <gdmlFile  ref="elements.xml"/>
+    <gdmlFile  ref="materials.xml"/>
+  </includes>
+  <define>
+    <include ref="top_defs_CepC_v04.xml"/>
+    <include ref="top_defs.xml"/>
+    <include ref="basic_defs.xml"/>
+    <include ref="envelope_defs.xml"/>
+    <include ref="tube_defs.xml"/>
+    <include ref="misc_defs.xml"/>
+    <include ref="tracker_defs.xml"/>
+    <include ref="fcal_defs.xml"/>
+    <include ref="ecal_defs.xml"/>
+    <include ref="hcal_defs.xml"/>
+    <include ref="yoke_defs.xml"/>
+    <include ref="services_defs.xml"/>
+    <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+    <include ref="limits.xml"/>
+    <!-- Readout slice in ecal for reconstruction -->
+    <constant name="Ecal_readout_segmentation_slice0" value="4"/>
+    <constant name="Ecal_readout_segmentation_slice1" value="10"/>
+    <!-- Readout slice in hcal for reconstruction -->
+    <constant name="Hcal_readout_segmentation_slice" value="3"/>
+  </define>
+  <materials>
+    <material name="G4_PARAFFIN">
+      <D type="density" value="0.93" unit="g/cm3" />
+       <fraction n="0.148605" ref="H" />
+       <fraction n="0.851395" ref="C" />
+    </material>
+    <material name="RPC2ECRMix" state="solid">
+      <D unit="g/cm3" value="Hcal_mix_density"/>
+      <composite n="Hcal_airgap_fraction" ref="Air"/>
+      <composite n="Hcal_graphite_fraction" ref="graphite"/>
+      <composite n="Hcal_mylar_fraction" ref="mylar"/>
+      <composite n="Hcal_g10_fraction" ref="g10"/>
+    </material>
+    <material name="ECCableMix" state="solid">
+      <D unit="g/cm3" value="0.2"/>
+      <composite n="0.001" ref="Air"/>
+      <composite n="0.666" ref="Cu"/>
+      <composite n="0.333" ref="g10"/>
+    </material>
+  </materials>
+  <limits>
+    <limitset name="cal_limits">
+      <limit name="step_length_max" particles="*" value="cal_steplimit_val" unit="cal_steplimit_unit" />
+    </limitset>
+    <limitset name="TPC_limits">
+      <limit name="step_length_max" particles="*" value="tpc_steplimit_val" unit="tpc_steplimit_unit" />
+    </limitset>
+    <limitset name="Tracker_limits">
+      <limit name="step_length_max" particles="*" value="tracker_steplimit_val" unit="tracker_steplimit_unit" />
+    </limitset>
+  </limits>
+  <include ref="display.xml"/>
+  <include ref="CepCBeamPipe_v01_01.xml"/>
+  <include ref="vxd07_02.xml"/>
+  <include ref="ftd_cepc_02.xml"/>
+  <include ref="sit_simple_planar_sensors_01.xml"/>
+  <include ref="tpc10_01.xml"/>
+  <include ref="set_simple_planar_sensors_01.xml"/>
+  <include ref="SEcal05_siw_Barrel.xml"/>
+  <include ref="SEcal05_siw_Endcaps.xml"/>
+  <include ref="SEcal05_siw_ECRing_02.xml"/>
+  <include ref="SHcalRpc01_Barrel_01.xml"/>
+  <include ref="SHcalRpc01_Endcaps_01.xml"/>
+  <include ref="SHcalRpc01_EndcapRing_01.xml"/>
+  <include ref="Yoke05_Barrel.xml"/>
+  <include ref="Yoke05_Endcaps.xml"/>
+  <include ref="coil03.xml"/>
+  <!--include ref="SServices00.xml"/-->
+  <plugins>
+    <plugin name="DD4hepVolumeManager"/>
+    <plugin name="InstallSurfaceManager"/>
+  </plugins>
+  <!--include ref="Field_Solenoid_Map_s_4.0T.xml"/>
+  <include ref="Field_AntiDID_Map_s.xml"/>
+  <include ref="Field_FwdMagnets_Ideal_1000GeV.xml"/-->
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="Coil_half_length"
+	   inner_radius="Hcal_outer_radius+Coil_thickness/2"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="Coil_half_length"
+	   inner_radius="Yoke_barrel_inner_radius"
+           outer_radius="Yoke_barrel_inner_radius+Field_outer_thickness">
+    </field>
+  </fields>
+</lccdd>

Detector/DetCEPCv4/compact/CepC_v4.xml

@@ -34,6 +34,15 @@
     <!-- Readout slice in hcal for reconstruction -->
     <constant name="Hcal_readout_segmentation_slice" value="3"/>
   </define>
+  <materials>
+    <material name="RPC2ECRMix" state="solid">
+      <D unit="g/cm3" value="Hcal_mix_density"/>
+      <composite n="Hcal_airgap_fraction" ref="Air"/>
+      <composite n="Hcal_graphite_fraction" ref="graphite"/>
+      <composite n="Hcal_mylar_fraction" ref="mylar"/>
+      <composite n="Hcal_g10_fraction" ref="g10"/>
+    </material>
+  </materials>
   <limits>
     <limitset name="cal_limits">
       <limit name="step_length_max" particles="*" value="cal_steplimit_val" unit="cal_steplimit_unit" />
@@ -47,25 +56,25 @@
   </limits>
   <include ref="display.xml"/>
   <include ref="Beampipe_o1_v01_01.xml"/>
-  <!--include ref="vxd07.xml"/>
-  <include ref="ftd_simple_staggered_02.xml"/>
-  <include ref="sit_simple_pixel_sensors_01.xml"/>
+  <include ref="vxd07_01.xml"/>
+  <include ref="ftd_cepc_01.xml"/>
+  <include ref="sit_simple_planar_sensors_01.xml"/>
   <include ref="tpc10_01.xml"/>
-  <include ref="set_simple_planar_sensors_01.xml"/-->
+  <include ref="set_simple_planar_sensors_01.xml"/>
   <include ref="SEcal05_siw_Barrel.xml"/>
   <include ref="SEcal05_siw_Endcaps.xml"/>
-  <include ref="SEcal05_siw_ECRing.xml"/>
-  <!--include ref="Hcal_Barrel_SD_v01.xml"/>
-  <include ref="Hcal_Endcaps_SD_v01.xml"/>
-  <include ref="Hcal_EndcapRing_SD_v01.xml"/>
+  <include ref="SEcal05_siw_ECRing_01.xml"/>
+  <include ref="SHcalRpc01_Barrel_01.xml"/>
+  <include ref="SHcalRpc01_Endcaps_01.xml"/>
+  <include ref="SHcalRpc01_EndcapRing_01.xml"/>
   <include ref="Yoke05_Barrel.xml"/>
   <include ref="Yoke05_Endcaps.xml"/>
-  <include ref="LumiCal.xml"/-->
+  <!--include ref="LumiCal.xml"/-->
 
   <!--include ref="LHCal01.xml"/>
   <include ref="BeamCal08.xml"/-->
 
-  <!--include ref="coil03.xml"/-->
+  <include ref="coil03.xml"/>
   <!--include ref="SServices00.xml"/-->
   <plugins>
     <plugin name="DD4hepVolumeManager"/>
@@ -74,4 +83,20 @@
   <!--include ref="Field_Solenoid_Map_s_4.0T.xml"/>
   <include ref="Field_AntiDID_Map_s.xml"/>
   <include ref="Field_FwdMagnets_Ideal_1000GeV.xml"/-->
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="Coil_half_length"
+	   inner_radius="Hcal_outer_radius+Coil_thickness/2"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="Coil_half_length"
+	   inner_radius="Yoke_barrel_inner_radius"
+           outer_radius="Yoke_barrel_inner_radius+Field_outer_thickness">
+    </field>
+  </fields>
 </lccdd>

Detector/DetCEPCv4/compact/Hcal_Barrel_SD_v01.xml

-<lccdd>
-
-  <detectors>
-    <detector name="HcalBarrel" type="Hcal_Barrel_SD_v01" id="ILDDetID_HCAL" readout="HCalBarrelRPCHits" vis="GreenVis" insideTrackingVolume="false" >
-      <comment>Hadron Calorimeter Barrel</comment>
-
-      <envelope vis="ILD_HCALVis">
-        <shape type="BooleanShape" operation="Subtraction" material="Air" >
-          <shape type="Cone" z="Hcal_half_length + env_safety/2" rmin1="0.0" rmax1="Hcal_outer_radius + env_safety" rmin2="0.0" rmax2="Hcal_outer_radius + env_safety"/>
-          <shape type="PolyhedraRegular"  numsides="Hcal_inner_symmetry" rmin="0.0"
-                 rmax="Hcal_inner_radius - env_safety" dz="2*(Hcal_half_length + env_safety)"/>
-        </shape>
-        <rotation x="0" y="0" z="90*deg-180*deg/Hcal_inner_symmetry"/>
-      </envelope>
-      <type_flags type=" DetType_CALORIMETER + DetType_BARREL + DetType_HADRONIC " />
-
-      <staves  material = "Steel304L"  vis="BlueVis"/>
-
-      <!-- The layer structure reference in the following paper-->
-      <!-- ???  -->
-      <layer repeat="HcalBarrelSD_nlayers" vis="SeeThrough">
-        <slice material = "Steel304L"      thickness = "HcalSD_radiator_thickness"                    vis="BlueVis"   />
-        <slice material = "Air"            thickness = "HcalSD_airgap_thickness"                      vis="WhiteVis"   />
-        <slice material = "Steel304L"      thickness = "HcalSD_steel_casette_thickness"               vis="BlueVis"   />
-        <slice material = "epoxy"          thickness = "HcalSD_electronics_mask_thickness"            vis="GreenVis" />
-        <slice material = "PCB"            thickness = "HcalSD_PCB_thickness"                         vis="CyanVis" />
-        <slice material = "mylar"          thickness = "HcalSD_mylar_anode_thickness"                 vis="MagentaVis" />
-        <slice material = "graphite"       thickness = "HcalSD_graphite_anode_thickness"              vis="Invisible" />
-        <slice material = "FloatGlass"     thickness = "HcalSD_glass_anode_thickness"                 vis="RedVis" />
-        <slice material = "RPCGAS2"        thickness = "HcalSD_sensitive_gas_gap"   sensitive = "yes"   vis="YellowVis" />
-        <slice material = "FloatGlass"     thickness = "HcalSD_glass_cathode_thickness"               vis="RedVis" />
-        <slice material = "graphite"       thickness = "HcalSD_graphite_cathode_thickness"            vis="Invisible" />
-        <slice material = "mylar"          thickness = "HcalSD_mylar_cathode_thickness"               vis="MagentaVis" />
-        <slice material = "Steel304L"      thickness = "HcalSD_steel_casette_thickness"               vis="BlueVis"   />
-        <slice material = "Air"            thickness = "HcalSD_airgap_thickness"                      vis="WhiteVis"   />
-      </layer>
-    </detector>
-  </detectors>
-
-  <readouts>
-    <readout name="HCalBarrelRPCHits">
-      <segmentation type="CartesianGridXY" grid_size_x="HcalSD_cells_size" grid_size_y="HcalSD_cells_size"/>
-      <id>system:5,module:3,stave:3,tower:5,layer:6,slice:4,x:32:-16,y:-16</id>
-    </readout>
-  </readouts>
-
-</lccdd>

Detector/DetCEPCv4/compact/Hcal_EndcapRing_SD_v01.xml

-<lccdd>
-
-  <detectors>
-    <detector name="HcalRing" type="Hcal_EndcapRing_SD_v01" id="ILDDetID_HCAL_RING" readout="HCalECRingRPCHits" vis="SeeThrough" insideTrackingVolume="false" >
-      <comment>Hadron Calorimeter EndcapRing</comment>
-
-      <envelope vis="ILD_HCALVis">
-        <shape type="BooleanShape" operation="Subtraction" material="Air">
-          <shape type="BooleanShape" operation="Intersection" material="Air">
-            <shape type="Box" dx="HcalEndcapRing_outer_radius + 2.0*env_safety" dy="HcalEndcapRing_outer_radius + 2.0*env_safety"
-                   dz="HcalEndcapRing_max_z + 2.0*env_safety"/> <!--Box defined the coordinate system-->
-            <shape type="PolyhedraRegular" numsides="HcalEndcapRingSD_inner_symmetry" rmin="HcalEndcapRing_inner_radius - env_safety"
-                   rmax="HcalEndcapRing_outer_radius + env_safety" dz="2.0*HcalEndcapRing_max_z + env_safety" material="Air"/>
-            <rotation x="0" y="0" z="90*deg-180*deg/HcalEndcapRingSD_inner_symmetry"/>
-          </shape>
-
-          <shape type="Box" dx="HcalEndcapRing_outer_radius + 2.0*env_safety" dy="HcalEndcapRing_outer_radius + 2.0*env_safety"
-                 dz="HcalEndcapRing_min_z - env_safety"/>
-        </shape>
-      </envelope>
-
-      <type_flags type=" DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC + DetType_AUXILIARY " />
-
-      <!-- absorber material
-        -->
-      <staves  material = "Steel304L"  vis="GreenVis"/>
-      <material name="Steel304L"/>
-
-      <layer repeat="HcalEndcapRingSD_nlayers" vis="SeeThrough">
-        <slice material = "Steel304L"      thickness = "HcalSD_radiator_thickness"                    vis="BlueVis"   />
-        <slice material = "Air"            thickness = "HcalSD_airgap_thickness"                      vis="WhiteVis"   />
-        <slice material = "Steel304L"      thickness = "HcalSD_steel_casette_thickness"               vis="BlueVis"   />
-        <slice material = "epoxy"          thickness = "HcalSD_electronics_mask_thickness"            vis="GreenVis" />
-        <slice material = "PCB"            thickness = "HcalSD_PCB_thickness"                         vis="CyanVis" />
-        <slice material = "mylar"          thickness = "HcalSD_mylar_anode_thickness"                 vis="MagentaVis" />
-        <slice material = "graphite"       thickness = "HcalSD_graphite_anode_thickness"              vis="Invisible" />
-        <slice material = "FloatGlass"     thickness = "HcalSD_glass_anode_thickness"                 vis="RedVis" />
-        <slice material = "RPCGAS2"        thickness = "HcalSD_sensitive_gas_gap"  sensitive = "yes"   vis="YellowVis" />
-        <slice material = "FloatGlass"     thickness = "HcalSD_glass_cathode_thickness"               vis="RedVis" />
-        <slice material = "graphite"       thickness = "HcalSD_graphite_cathode_thickness"            vis="Invisible" />
-        <slice material = "mylar"          thickness = "HcalSD_mylar_cathode_thickness"               vis="MagentaVis" />
-        <slice material = "Steel304L"      thickness = "HcalSD_steel_casette_thickness"               vis="BlueVis"   />
-        <slice material = "Air"            thickness = "HcalSD_airgap_thickness"                      vis="WhiteVis"   />
-      </layer>
-    </detector>
-  </detectors>
-
-  <readouts>
-    <readout name="HCalECRingRPCHits">
-      <segmentation type="CartesianGridXY" grid_size_x="HcalSD_cells_size" grid_size_y="HcalSD_cells_size"/>
-      <id>system:5,module:3,stave:4,tower:3,layer:6,x:32:-16,y:-16</id>
-    </readout>
-  </readouts>
-
-</lccdd>
-

Detector/DetCEPCv4/compact/Hcal_Endcaps_SD_v01.xml

-<lccdd>
-
-<detectors>
-<detector id="ILDDetID_HCAL_ENDCAP" name="HcalEndcap" type="Hcal_Endcaps_SD_v01" readout="HCalEndcapRPCHits"  vis="SeeThrough" calorimeterType="HAD_ENDCAP">
- <comment>Hadron Calorimeter Endcap</comment>
-
-
-    <envelope vis="ILD_HCALVis">    
-      <shape type="BooleanShape" operation="Subtraction" material="Air"><!--2. create center box hole -->
-        <shape type="BooleanShape" operation="Subtraction" material="Air"><!--1. create Endcaps envelope -->
-          <shape type="Tube" rmin="0.0" rmax="HcalEndcap_outer_radius + env_safety" dz="HcalEndcap_max_z + env_safety"/>
-          <shape type="Tube" rmin="0.0" rmax="HcalEndcap_outer_radius + 2.0*env_safety" dz="HcalEndcap_min_z - env_safety"/>
-        </shape>
-        <shape type="Box" dx="HcalEndcap_inner_radius - env_safety" dy="HcalEndcap_inner_radius - env_safety" 
-               dz="HcalEndcap_max_z + 2.0*env_safety"/>
-      </shape>
-      <rotation x="0" y="0" z="0"/>
-    </envelope>
-
-    <type_flags type=" DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC " />
-    <material name="Steel304L"/><!-- radiator and the thickness has been defined in the main xml file-->
-    <staves  material = "Steel235"  vis="SeeThrough"/>
-
-
-      <!-- slice: from inner  to outer -->  
-    <layer repeat="HcalEndcapSD_nlayers" vis="SeeThrough">  
-        <slice material = "Steel304L"      thickness = "HcalSD_radiator_thickness"                    vis="BlueVis"   />   
-        <slice material = "Air"            thickness = "HcalSD_airgap_thickness"                      vis="WhiteVis"  /> 
-        <slice material = "Steel304L"      thickness = "HcalSD_steel_casette_thickness"               vis="BlueVis"   />
-        <slice material = "epoxy"          thickness = "HcalSD_electronics_mask_thickness"            vis="GreenVis"  />
-        <slice material = "PCB"            thickness = "HcalSD_PCB_thickness"                         vis="CyanVis"   />
-        <slice material = "mylar"          thickness = "HcalSD_mylar_anode_thickness"                 vis="MagentaVis"/>
-        <slice material = "graphite"       thickness = "HcalSD_graphite_anode_thickness"              vis="Invisible" />
-        <slice material = "FloatGlass"     thickness = "HcalSD_glass_anode_thickness"                 vis="RedVis"    />
-        <slice material = "RPCGAS2"        thickness = "HcalSD_sensitive_gas_gap"   sensitive = "yes"   vis="YellowVis" />
-        <slice material = "FloatGlass"     thickness = "HcalSD_glass_cathode_thickness"               vis="RedVis"    />
-        <slice material = "graphite"       thickness = "HcalSD_graphite_cathode_thickness"            vis="Invisible" />
-        <slice material = "mylar"          thickness = "HcalSD_mylar_cathode_thickness"               vis="MagentaVis"/>
-        <slice material = "Steel304L"      thickness = "HcalSD_steel_casette_thickness"               vis="BlueVis"   /> 
-        <slice material = "Air"            thickness = "HcalSD_airgap_thickness"                      vis="WhiteVis"  />  
-    </layer>
-
-</detector>
-</detectors>
-
-<readouts>
-  <readout name="HCalEndcapRPCHits">
-    <segmentation type="CartesianGridXY" grid_size_x="HcalSD_cells_size" grid_size_y="HcalSD_cells_size" offset_x="HcalSD_cells_size/2.0" offset_y="HcalSD_cells_size/2.0" />
-    <id>system:5,module:3,stave:3,tower:5,layer:6,x:32:-16,y:-16</id>
-  </readout>
-</readouts>
-
-</lccdd>

Detector/DetCEPCv4/compact/README.md

@@ -20,10 +20,10 @@ The following CEPC_v4 detector models are available in CEPCSW
          - TPC_outer_radius = 1808*mm
  - EndcapTracker
          - with silicon pestals (FTDPixel + FTDStrip)
- - Ecal (un-implemented)
+ - Ecal
          - with si-W calorimeter
- - Hcal (un-implemented)
-         - with scintillator **and** RPC readout
-         - creates two sets of hit collections
+ - Hcal
+         - with RPC readout
+         - creates three sets of hit collections
  - compact files:
          - only Tracker [./CEPC_v4.xml](./CEPC_v4.xml)

Detector/DetCEPCv4/compact/SEcal05_siw_ECRing.xml → Detector/DetCEPCv4/compact/SEcal05_siw_ECRing_01.xml

@@ -51,7 +51,10 @@
 
   <readouts>
     <readout name="EcalEndcapRingCollection">
-      <segmentation type="CartesianGridXY" grid_size_x="Ecal_cells_size" grid_size_y="Ecal_cells_size"/>
+
+      <segmentation type="CartesianGridXY" grid_size_x="Ecal_cells_size" grid_size_y="Ecal_cells_size"
+		    offset_x="-0.5*Ecal_ECRing_Siplate_Size+0.5*Ecal_cells_size" offset_y="-0.5*Ecal_ECRing_Siplate_Size+0.5*Ecal_cells_size"/>
+
       <id>system:5,module:3,stave:4,tower:3,layer:6,x:32:-16,y:-16</id>
     </readout>
   </readouts>