Skip to content
Snippets Groups Projects
Commit 77cbf1cd authored by lintao@ihep.ac.cn's avatar lintao@ihep.ac.cn
Browse files

Merge branch 'master' into 'master' 

OTKEndCap is added

See merge request !81
parents a11914c4 3c987cfa
No related branches found
No related tags found
1 merge request!81OTKEndCap is added
Pipeline #12229 passed with stage
Stage:
    in 9 minutes and 26 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing
    with 626 additions and 2 deletions
    Detector/DetCRD/CMakeLists.txt
    + 2
    − 1
    View file @ 77cbf1cd
    ...@@ -20,7 +20,8 @@ gaudi_add_module(DetCRD ...@@ -20,7 +20,8 @@ gaudi_add_module(DetCRD
    src/Tracker/SiTrackerStaggeredLadder_v01_geo.cpp src/Tracker/SiTrackerStaggeredLadder_v01_geo.cpp
    src/Tracker/TPC_Simple_o1_v01.cpp src/Tracker/TPC_Simple_o1_v01.cpp
    src/Tracker/TPC_ModularEndcap_o1_v01.cpp src/Tracker/TPC_ModularEndcap_o1_v01.cpp
    src/Tracker/SiTracker_otkbarrel_v01_geo.cpp src/Tracker/SiTracker_otkbarrel_v01_geo.cpp
    src/Tracker/SiTracker_otkendcap_v01_geo.cpp
    LINK ${DD4hep_COMPONENT_LIBRARIES} LINK ${DD4hep_COMPONENT_LIBRARIES}
    ) )
    ......
    Detector/DetCRD/compact/CRD_common_v01/OTKEndCap_v01_01.xml 0 → 100644
    + 96
    − 0
    View file @ 77cbf1cd
    <lccdd>
    <info name="OTKEndCap_v01_01"
    title="CepC OTKEndCap"
    author="D.Yu, "
    url="http://cepc.ihep.ac.cn"
    contact="yudian2002@sjtu.edu.cn"
    status="developing"
    version="v01">
    <!-- OTKEndCap stands for outer tracker endcap, OTK_EndCap -->
    </info>
    <define>
    <constant name="OTKEndCap_total_sections" value="10" />
    <constant name="OTKEndCap_r0" value="400*mm" />
    <constant name="OTKEndCap_r1" value="540*mm" />
    <constant name="OTKEndCap_r2" value="680*mm" />
    <constant name="OTKEndCap_r3" value="820*mm" />
    <constant name="OTKEndCap_r4" value="960*mm" />
    <constant name="OTKEndCap_r5" value="1100*mm" />
    <constant name="OTKEndCap_r6" value="1240*mm" />
    <constant name="OTKEndCap_r7" value="1380*mm" />
    <constant name="OTKEndCap_r8" value="1520*mm" />
    <constant name="OTKEndCap_r9" value="1660*mm" />
    <constant name="OTKEndCap_r10" value="1800*mm" />
    <constant name="OTKEndCap_inner_radius" value="OTKEndCap_r0" />
    <constant name="OTKEndCap_outer_radius" value="OTKEndCap_r10" />
    <constant name="OTKEndCap_half_length" value="2900*mm" />
    <constant name="OTKEndCap_piece_deg" value="8" /><!-- variable OTKEndCap_piece_deg needs no dimension -->
    <constant name="OTKEndCap_piece_num" value="24" />
    <constant name="OTKEndCap_asic_num_0" value="5" />
    <constant name="OTKEndCap_asic_num_1" value="7" />
    <constant name="OTKEndCap_asic_num_2" value="9" />
    <constant name="OTKEndCap_asic_num_3" value="11" />
    <constant name="OTKEndCap_asic_num_4" value="13" />
    <constant name="OTKEndCap_asic_num_5" value="15" />
    <constant name="OTKEndCap_asic_num_6" value="17" />
    <constant name="OTKEndCap_asic_num_7" value="19" />
    <constant name="OTKEndCap_asic_num_8" value="21" />
    <constant name="OTKEndCap_asic_num_9" value="23" />
    <constant name="OTKEndCap_module_num_0" value="1" />
    <constant name="OTKEndCap_module_num_1" value="1" />
    <constant name="OTKEndCap_module_num_2" value="1" />
    <constant name="OTKEndCap_module_num_3" value="1" />
    <constant name="OTKEndCap_module_num_4" value="1" />
    <constant name="OTKEndCap_module_num_5" value="2" />
    <constant name="OTKEndCap_module_num_6" value="2" />
    <constant name="OTKEndCap_module_num_7" value="2" />
    <constant name="OTKEndCap_module_num_8" value="2" />
    <constant name="OTKEndCap_module_num_9" value="2" />
    <constant name="OTKEndCap_layer_thickness" value="25*mm" />
    <constant name="OTKEndCap_layer0_zpos" value="2850*mm" />
    <constant name="OTKEndCap_layer1_zpos" value="2875*mm" />
    <constant name="OTKEndCap_support_thickness" value="1*mm" />
    <constant name="OTKEndCap_sensor_thickness" value="500*um" />
    <constant name="OTKEndCap_sensor_gap" value="0.1*mm" />
    <constant name="OTKEndCap_sensor_dead_width" value="0.001*mm" /><!-- do not set it to 0 -->
    <constant name="OTKEndCap_pcb_thickness" value="500*um" />
    <constant name="OTKEndCap_pcb_rlength" value="10*mm" />
    <constant name="OTKEndCap_pcb_rgap" value="10*mm" />
    <constant name="OTKEndCap_asic_thickness" value="500*um" />
    <constant name="OTKEndCap_asic_width" value="6*mm" />
    <constant name="OTKEndCap_asic_rlength" value="6*mm" />
    <constant name="OTKEndCap_asic_rgap" value="12*mm" />
    </define>
    <detectors>
    <detector id="DetID_OTKEndCap" name="OTKEndCap" type="SiTracker_otkendcap_v01" vis="OTKEndCapVis" readout="OTKEndCapCollection" insideTrackingVolume="true">
    <envelope>
    <shape type="BooleanShape" operation="Union" material="Air" >
    <shape type="Tube" rmin="OTKEndCap_inner_radius" rmax="OTKEndCap_outer_radius" dz="OTKEndCap_half_length" />
    </shape>
    </envelope>
    <display support="WhiteVis" sens_env="SeeThrough" sens="GrayVis" deadsensor="GreenVis"
    pcb="GreenVis" asic="YellowVis"/>
    <type_flags type="DetType_TRACKER + DetType_ENDCAP + DetType_STRIP "/>
    <global sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV"/>
    <support thickness="OTKEndCap_support_thickness" inner_radius="OTKEndCap_inner_radius" outer_radius="OTKEndCap_outer_radius" mat="CarbonFiber"/>
    <layer id="0" thickness="OTKEndCap_layer_thickness" zpos="OTKEndCap_layer0_zpos">
    <sensor gap="OTKEndCap_sensor_gap" thickness="OTKEndCap_sensor_thickness" dead_width="OTKEndCap_sensor_dead_width" mat="G4_Si"/>
    <pcb thickness="OTKEndCap_pcb_thickness" rlength="OTKEndCap_pcb_rlength" rgap="OTKEndCap_pcb_rgap" mat="epoxy"/>
    <asic thickness="OTKEndCap_asic_thickness" width="OTKEndCap_asic_width" rlength="OTKEndCap_asic_rlength" rgap="OTKEndCap_asic_rgap" mat="G4_Si"/>
    </layer>
    <layer id="1" thickness="OTKEndCap_layer_thickness" zpos="OTKEndCap_layer1_zpos">
    <sensor gap="OTKEndCap_sensor_gap" thickness="OTKEndCap_sensor_thickness" dead_width="OTKEndCap_sensor_dead_width" mat="G4_Si"/>
    <pcb thickness="OTKEndCap_pcb_thickness" rlength="OTKEndCap_pcb_rlength" rgap="OTKEndCap_pcb_rgap" mat="epoxy"/>
    <asic thickness="OTKEndCap_asic_thickness" width="OTKEndCap_asic_width" rlength="OTKEndCap_asic_rlength" rgap="OTKEndCap_asic_rgap" mat="G4_Si"/>
    </layer>
    </detector>
    </detectors>
    <readouts>
    <readout name="OTKEndCapCollection">
    <id>system:5,side:-2,layer:9,module:8,active:8,sensor:8</id>
    </readout>
    </readouts>
    </lccdd>
    \ No newline at end of file
    Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
    + 2
    − 1
    View file @ 77cbf1cd
    ...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
    <constant name="DetID_TPC" value=" 4"/> <constant name="DetID_TPC" value=" 4"/>
    <constant name="DetID_SET" value=" 5"/> <constant name="DetID_SET" value=" 5"/>
    <constant name="DetID_ETD" value=" 6"/> <constant name="DetID_ETD" value=" 6"/>
    <constant name="DetID_OTKBarrel" value=" 8"/> <constant name="DetID_OTKBarrel" value=" 8"/>
    <constant name="DetID_OTKEndCap" value=" 9"/>
    <constant name="DetID_ECAL" value=" 20"/> <constant name="DetID_ECAL" value=" 20"/>
    <constant name="DetID_ECAL_PLUG" value=" 21"/> <constant name="DetID_ECAL_PLUG" value=" 21"/>
    ......
    Detector/DetCRD/src/Tracker/SiTracker_otkendcap_v01_geo.cpp 0 → 100644
    + 516
    − 0
    View file @ 77cbf1cd
    This diff is collapsed.
    Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
    + 3
    − 0
    View file @ 77cbf1cd
    ...@@ -114,6 +114,7 @@ Edm4hepWriterAnaElemTool::EndOfEventAction(const G4Event* anEvent) { ...@@ -114,6 +114,7 @@ Edm4hepWriterAnaElemTool::EndOfEventAction(const G4Event* anEvent) {
    auto tpccols = m_TPCCol.createAndPut(); auto tpccols = m_TPCCol.createAndPut();
    auto setcols = m_SETCol.createAndPut(); auto setcols = m_SETCol.createAndPut();
    auto otkbarrelcols = m_OTKBarrelCol.createAndPut(); auto otkbarrelcols = m_OTKBarrelCol.createAndPut();
    auto otkendcapcols = m_OTKEndCapCol.createAndPut();
    auto ecalbarrelcol = m_EcalBarrelCol.createAndPut(); auto ecalbarrelcol = m_EcalBarrelCol.createAndPut();
    auto ecalbarrelcontribcols = m_EcalBarrelContributionCol.createAndPut(); auto ecalbarrelcontribcols = m_EcalBarrelContributionCol.createAndPut();
    ...@@ -191,6 +192,8 @@ Edm4hepWriterAnaElemTool::EndOfEventAction(const G4Event* anEvent) { ...@@ -191,6 +192,8 @@ Edm4hepWriterAnaElemTool::EndOfEventAction(const G4Event* anEvent) {
    tracker_col_ptr = setcols; tracker_col_ptr = setcols;
    } else if (collect->GetName() == "OTKBarrelCollection") { } else if (collect->GetName() == "OTKBarrelCollection") {
    tracker_col_ptr = otkbarrelcols; tracker_col_ptr = otkbarrelcols;
    } else if (collect->GetName() == "OTKEndCapCollection") {
    tracker_col_ptr = otkendcapcols;
    } else if (collect->GetName() == "CaloHitsCollection") { } else if (collect->GetName() == "CaloHitsCollection") {
    calo_col_ptr = calorimetercols; calo_col_ptr = calorimetercols;
    calo_contrib_col_ptr = calocontribcols; calo_contrib_col_ptr = calocontribcols;
    ......
    Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
    + 2
    − 0
    View file @ 77cbf1cd
    ...@@ -74,6 +74,8 @@ private: ...@@ -74,6 +74,8 @@ private:
    Gaudi::DataHandle::Writer, this}; Gaudi::DataHandle::Writer, this};
    DataHandle<edm4hep::SimTrackerHitCollection> m_OTKBarrelCol{"OTKBarrelCollection", DataHandle<edm4hep::SimTrackerHitCollection> m_OTKBarrelCol{"OTKBarrelCollection",
    Gaudi::DataHandle::Writer, this}; Gaudi::DataHandle::Writer, this};
    DataHandle<edm4hep::SimTrackerHitCollection> m_OTKEndCapCol{"OTKEndCapCollection",
    Gaudi::DataHandle::Writer, this};
    // Ecal // Ecal
    DataHandle<edm4hep::SimCalorimeterHitCollection> m_EcalBarrelCol{"EcalBarrelCollection", DataHandle<edm4hep::SimCalorimeterHitCollection> m_EcalBarrelCol{"EcalBarrelCollection",
    ......
    Simulation/DetSimAna/src/ExampleAnaElemTool.cpp
    + 3
    − 0
    View file @ 77cbf1cd
    ...@@ -45,6 +45,7 @@ ExampleAnaElemTool::EndOfEventAction(const G4Event* anEvent) { ...@@ -45,6 +45,7 @@ ExampleAnaElemTool::EndOfEventAction(const G4Event* anEvent) {
    auto tpccols = m_TPCCol.createAndPut(); auto tpccols = m_TPCCol.createAndPut();
    auto setcols = m_SETCol.createAndPut(); auto setcols = m_SETCol.createAndPut();
    auto otkbarrelcols = m_OTKBarrelCol.createAndPut(); auto otkbarrelcols = m_OTKBarrelCol.createAndPut();
    auto otkendcapcols = m_OTKEndCapCol.createAndPut();
    // readout defined in DD4hep // readout defined in DD4hep
    auto lcdd = &(dd4hep::Detector::getInstance()); auto lcdd = &(dd4hep::Detector::getInstance());
    ...@@ -95,6 +96,8 @@ ExampleAnaElemTool::EndOfEventAction(const G4Event* anEvent) { ...@@ -95,6 +96,8 @@ ExampleAnaElemTool::EndOfEventAction(const G4Event* anEvent) {
    tracker_col_ptr = setcols; tracker_col_ptr = setcols;
    } else if (collect->GetName() == "OTKBarrelCollection") { } else if (collect->GetName() == "OTKBarrelCollection") {
    tracker_col_ptr = otkbarrelcols; tracker_col_ptr = otkbarrelcols;
    } else if (collect->GetName() == "OTKEndCapCollection") {
    tracker_col_ptr = otkendcapcols;
    } else if (collect->GetName() == "CaloHitsCollection") { } else if (collect->GetName() == "CaloHitsCollection") {
    calo_col_ptr = calorimetercols; calo_col_ptr = calorimetercols;
    } else { } else {
    ......
    Simulation/DetSimAna/src/ExampleAnaElemTool.h
    + 2
    − 0
    View file @ 77cbf1cd
    ...@@ -63,6 +63,8 @@ private: ...@@ -63,6 +63,8 @@ private:
    Gaudi::DataHandle::Writer, this}; Gaudi::DataHandle::Writer, this};
    DataHandle<plcio::SimTrackerHitCollection> m_OTKBarrelCol{"OTKBarrelCollection", DataHandle<plcio::SimTrackerHitCollection> m_OTKBarrelCol{"OTKBarrelCollection",
    Gaudi::DataHandle::Writer, this}; Gaudi::DataHandle::Writer, this};
    DataHandle<edm4hep::SimTrackerHitCollection> m_OTKEndCapCol{"OTKEndCapCollection",
    Gaudi::DataHandle::Writer, this};
    }; };
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment