diff --git a/Detector/DetCEPCv4/src/tracker/SIT_Simple_Pixel_geo.cpp b/Detector/DetCEPCv4/src/tracker/SIT_Simple_Pixel_geo.cpp
index 01bd3572b8d3fdf99fd4068d8f14999ea8fa31ea..51aaaabe534bcf50aac95705ae7b7b4126a3e297 100644
--- a/Detector/DetCEPCv4/src/tracker/SIT_Simple_Pixel_geo.cpp
+++ b/Detector/DetCEPCv4/src/tracker/SIT_Simple_Pixel_geo.cpp
@@ -126,7 +126,11 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
dd4hep::Material sensitiveMat = theDetector.material(db->fetchString("sensitive_mat"));
dd4hep::Material supportMat = theDetector.material(db->fetchString("support_mat"));
-
+ db = XMLHandlerDB( x_det.child( _Unicode( display ) ) ) ;
+ std::string ladderVis = db->fetchString("ladder");
+ std::string supportVis = db->fetchString("support");
+ std::string sensEnvVis = db->fetchString("sens_env");
+ std::string sensVis = db->fetchString("sens");
// // // setup the encoder
// // UTIL::BitField64 encoder( LCTrackerCellID::encoding_string() ) ;
@@ -286,7 +290,7 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
layer_geom.ladder_width / 2.0,
layer_geom.half_z);
- dd4hep::Volume sitLadderLogical( dd4hep::_toString( layer_id,"SIT_LadderLogical_%02d"), sitLadderSolid, air ) ;
+ dd4hep::Volume sitLadderLogical( name + dd4hep::_toString( layer_id,"_LadderLogical_%02d"), sitLadderSolid, air ) ;
// now create an envelope volume to represent the sensitive area, which will be divided up into individual sensors
@@ -295,7 +299,7 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
layer_geom.half_z);
//fixme: material ??? Volume sitSenEnvelopeLogical( _toString( layer_id,"SIT_SenEnvelopeLogical_%02d"), sitSenEnvelopeSolid, sensitiveMat ) ;
- dd4hep::Volume sitSenEnvelopeLogical( dd4hep::_toString( layer_id,"SIT_SenEnvelopeLogical_%02d"),
+ dd4hep::Volume sitSenEnvelopeLogical( name + dd4hep::_toString( layer_id,"_SenEnvelopeLogical_%02d"),
sitSenEnvelopeSolid, air ) ;
// create the sensor volumes and place them in the senstive envelope volume
@@ -304,7 +308,7 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
layer_geom.ladder_width / 2.0,
(layer_geom.sensor_length / 2.0 ) - 1.e-06 * dd4hep::mm ); // added tolerance to avoid false overlap detection
- dd4hep::Volume sitSenLogical( dd4hep::_toString( layer_id,"SIT_SenLogical_%02d"), sitSenSolid,sensitiveMat ) ;
+ dd4hep::Volume sitSenLogical( name + dd4hep::_toString( layer_id,"_SenLogical_%02d"), sitSenSolid,sensitiveMat ) ;
sitSenLogical.setSensitiveDetector(sens);
@@ -371,10 +375,10 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
pvV[isensor] = pv ;
}
- sit.setVisAttributes(theDetector, "SeeThrough", sitLadderLogical ) ;
- sit.setVisAttributes(theDetector, "SeeThrough", sitSenEnvelopeLogical ) ;
+ sit.setVisAttributes(theDetector, ladderVis, sitLadderLogical ) ;
+ sit.setVisAttributes(theDetector, sensEnvVis, sitSenEnvelopeLogical ) ;
- sit.setVisAttributes(theDetector, "BlueVis", sitSenLogical ) ;
+ sit.setVisAttributes(theDetector, sensVis, sitSenLogical ) ;
// encoder.reset() ; // reset to 0
@@ -398,10 +402,10 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
layer_geom.ladder_width / 2.0,
layer_geom.half_z);
- Volume sitSupLogical( _toString( layer_id,"SIT_SupLogical_%02d"), sitSupSolid, supportMat ) ;
+ Volume sitSupLogical( name + _toString( layer_id,"_SupLogical_%02d"), sitSupSolid, supportMat ) ;
- sit.setVisAttributes(theDetector, "RedVis", sitSupLogical ) ;
+ sit.setVisAttributes(theDetector, supportVis, sitSupLogical ) ;
pv = sitLadderLogical.placeVolume( sitSupLogical, Transform3D( RotationY( 0.),
@@ -472,6 +476,10 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& theDetector, xml_h e, dd4h
//--------------------------------------
sit.setVisAttributes( theDetector, x_det.visStr(), envelope );
+
+ if ( x_det.hasAttr(_U(combineHits)) ) {
+ sit.setCombineHits(x_det.attr<bool>(_U(combineHits)),sens);
+ }
return sit;
}
diff --git a/Detector/DetCRD/compact/CRD_common_v01/FTD_SkewRing_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/FTD_SkewRing_v01_01.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bb9f361b4ae675201e9a5aeb4d35ab4ead476576
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v01/FTD_SkewRing_v01_01.xml
@@ -0,0 +1,54 @@
+<lccdd>
+ <define>
+ <constant name="SiliconThickness" value="0.2*mm"/>
+ <constant name="SupportThickness" value="1.0*mm"/>
+ <constant name="ModuleZGap" value="1.0*mm"/>
+ <constant name="ModuleRPhiGap" value="-10*mm"/>
+ </define>
+
+ <detectors>
+ <detector id="DetID_FTD" name="FTD" type="SiTrackerSkewRing_v01" vis="FTDVis" readout="FTDCollection" insideTrackingVolume="true" reflect="true">
+ <envelope>
+ <shape type="Assembly"/>
+ </envelope>
+
+ <type_flags type="DetType_TRACKER + DetType_ENDCAP + DetType_PIXEL "/>
+
+ <reconstruction strip_width="0.05*mm" strip_length="92*mm" strip_pitch="0" strip_angle="0"/>
+
+ <layer id="0" z="SiTracker_endcap_z1" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z1*tan(acos(Global_endcap_costheta))*cos(pi/16)" outer_r="SiTracker_endcap_outer_radius1"
+ phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="16" vis="SeeThrough">
+ <component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+ <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+ </layer>
+ <layer id="1" z="SiTracker_endcap_z2" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z2*tan(acos(Global_endcap_costheta))*cos(pi/16)" outer_r="SiTracker_endcap_outer_radius2"
+ phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="16" vis="SeeThrough">
+ <component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+ <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+ </layer>
+ <layer id="2" z="SiTracker_endcap_z3" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z3*tan(acos(Global_endcap_costheta))*cos(pi/16)" outer_r="SiTracker_endcap_outer_radius3"
+ phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="16" vis="SeeThrough">
+ <component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+ <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+ </layer>
+ <layer id="3" z="SiTracker_endcap_z4" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z4*tan(acos(Global_endcap_costheta))*cos(pi/16)" outer_r="SiTracker_endcap_outer_radius4"
+ phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="16" vis="SeeThrough">
+ <component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+ <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+ </layer>
+ <layer id="4" z="SiTracker_endcap_z5" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z5*tan(acos(Global_endcap_costheta))*cos(pi/16)" outer_r="SiTracker_endcap_outer_radius5"
+ phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="16" vis="SeeThrough">
+ <component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+ <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+ </layer>
+
+ </detector>
+ </detectors>
+
+ <readouts>
+ <readout name="FTDCollection">
+ <id>system:5,side:-2,layer:9,module:8,sensor:8</id>
+ </readout>
+ </readouts>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v01/FTD_SkewRing_v01_02.xml b/Detector/DetCRD/compact/CRD_common_v01/FTD_SkewRing_v01_02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..198426b4266fdfe0cfcdf4e530b2b83162e3dc0a
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v01/FTD_SkewRing_v01_02.xml
@@ -0,0 +1,49 @@
+<lccdd>
+ <define>
+ <constant name="SiliconThickness" value="0.2*mm"/>
+ <constant name="SupportThickness" value="1.0*mm"/>
+ <constant name="ModuleZGap" value="1.0*mm"/>
+ <constant name="ModuleRPhiGap" value="-10*mm"/>
+ </define>
+
+ <detectors>
+ <detector id="DetID_FTD" name="FTD" type="SiTrackerSkewRing_v01" vis="FTDVis" readout="FTDCollection" insideTrackingVolume="true" reflect="true">
+ <envelope>
+ <shape type="Assembly"/>
+ </envelope>
+
+ <type_flags type="DetType_TRACKER + DetType_ENDCAP + DetType_PIXEL "/>
+
+ <reconstruction strip_width="0.05*mm" strip_length="92*mm" strip_pitch="0" strip_angle="0"/>
+
+ <layer id="0" z="SiTracker_endcap_z1" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z1*tan(acos(Global_endcap_costheta))*cos(pi/16)" outer_r="SiTracker_endcap_outer_radius1"
+ phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="16" vis="SeeThrough">
+ <component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+ <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+ </layer>
+ <layer id="1" z="SiTracker_endcap_z2" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z2*tan(acos(Global_endcap_costheta))*cos(pi/16)" outer_r="SiTracker_endcap_outer_radius2"
+ phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="16" vis="SeeThrough">
+ <component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+ <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+ </layer>
+ <layer id="2" z="SiTracker_endcap_z3" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z3*tan(acos(Global_endcap_costheta))*cos(pi/16)" outer_r="SiTracker_endcap_outer_radius3"
+ phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="16" vis="SeeThrough">
+ <component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+ <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+ </layer>
+ <layer id="3" z="SiTracker_endcap_z4" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z4*tan(acos(Global_endcap_costheta))*cos(pi/16)" outer_r="SiTracker_endcap_outer_radius4"
+ phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="16" vis="SeeThrough">
+ <component material="G4_Si" thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+ <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+ </layer>
+
+ </detector>
+ </detectors>
+
+ <readouts>
+ <readout name="FTDCollection">
+ <id>system:5,side:-2,layer:9,module:8,sensor:8</id>
+ </readout>
+ </readouts>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePixel_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePixel_v01_01.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f40a2f2286171dcc90791c7613c29d34afde7c95
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePixel_v01_01.xml
@@ -0,0 +1,43 @@
+<lccdd>
+ <define>
+ <!--0.17mm silicon + 1.0mm carbon -> 0.65% of X0-->
+ <constant name="SET_sensitive_thickness" value="0.17*mm"/>
+ <constant name="SET_support_thickness" value="1.0*mm"/>
+ <constant name="SET_sensor_length" value="92*mm"/>
+ <constant name="SET_ladder_number" value="2*pi*SET_inner_radius/SIT_sensor_length"/>
+ <constant name="SET_outer_radius" value="(SET_inner_radius+SET_sensitive_thickness+SET_support_thickness)/cos(pi/SET_ladder_number) + env_safety"/>
+ <constant name="SET_half_length" value="OuterTracker_half_length"/>
+ <!--constant name="SET_distance_from_tpc" value="SET_inner_radius-OuterTracker_outer_radius+0.5*SET_sensitive_thickness"/-->
+ </define>
+
+ <detectors>
+ <!--detector id="DetID_SET" name="SET" type="SET_Simple_Planar" vis="SETVis" readout="SETCollection" insideTrackingVolume="true"-->
+ <detector id="DetID_SET" name="SET" type="SIT_Simple_Pixel" vis="SETVis" readout="SETCollection" insideTrackingVolume="true">
+ <envelope>
+ <shape type="Tube" rmin="SET_inner_radius" rmax="SET_outer_radius" dz="SET_half_length" material = "Air" />
+ </envelope>
+
+ <type_flags type="DetType_TRACKER + DetType_BARREL + DetType_PIXEL "/>
+
+ <reconstruction strip_width="0." strip_length="0." strip_pitch="0." strip_angle="0*deg" />
+
+ <global sensitive_thickness="SET_sensitive_thickness" support_thickness="SET_support_thickness" sensor_length="SIT_sensor_length" sensitive_mat="G4_Si"
+ support_mat="G4_C" sensitive_threshold_KeV="64*keV" />
+ <display ladder="SeeThrough" support="SETSupportVis" sens_env="SeeThrough" sens="SETSensitiveVis" />
+
+ <!--layer layer_id="0" sensitive_distance_from_tpc="SET_distance_from_tpc" coverage_of_TPC_Ecal_Hcal_barrel="1.0"
+ n_ladders="SET_ladder_number" ladder_clearance="0.1*mm" faces_IP="1" /-->
+ <layer layer_id="0" sensitive_radius="SET_inner_radius+0.5*SET_sensitive_thickness" n_sensors_per_ladder="SET_half_length*2/SIT_sensor_length"
+ n_ladders="SET_ladder_number" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="0" />
+ </detector>
+ </detectors>
+
+ <readouts>
+ <readout name="SETCollection">
+ <id>system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2</id>
+ </readout>
+ </readouts>
+
+
+</lccdd>
+
diff --git a/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_01.xml
index 82071ac2591c17718373cb53e88abbb6313702bd..1c9ec38ccd46841dde89ef090ab4ab9dee316751 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/SET_SimplePlanar_v01_01.xml
@@ -1,34 +1,31 @@
<lccdd>
<define>
- <constant name="SET_inner_radius" value="OuterTracker_outer_radius + env_safety"/>
- <constant name="SET_outer_radius" value="Ecal_barrel_inner_radius - env_safety "/>
- <constant name="SET_half_length" value="DC_half_length"/>
+ <!--0.17mm silicon + 1.0mm carbon -> 0.65% of X0-->
+ <constant name="SET_sensitive_thickness" value="0.17*mm"/>
+ <constant name="SET_support_thickness" value="1.0*mm"/>
+ <constant name="SET_ladder_number" value="24"/>
+ <constant name="SET_outer_radius" value="(SET_inner_radius+SET_sensitive_thickness*2+SET_support_thickness*2)/cos(pi/SET_ladder_number) + env_safety"/>
+ <constant name="SET_half_length" value="OuterTracker_half_length"/>
+ <constant name="SET_distance_from_tpc" value="SET_inner_radius-OuterTracker_outer_radius+0.5*SET_sensitive_thickness"/>
</define>
<detectors>
<detector id="DetID_SET" name="SET" type="SET_Simple_Planar" vis="SETVis" readout="SETCollection" insideTrackingVolume="true">
- <envelope vis="SETVis">
- <shape type="Tube" rmin="SET_inner_radius" rmax="SET_outer_radius" dz="SET_half_length" material = "Air" />
+ <envelope>
+ <shape type="Tube" rmin="SET_inner_radius" rmax="SET_outer_radius" dz="SET_half_length" material = "Air" />
</envelope>
<type_flags type="DetType_TRACKER + DetType_BARREL + DetType_STRIP "/>
- <!-- database : set_simple_planar_sensors_01 -->
-
- <!-- SQL command: "select * from extended_reconstruction_parameters;" -->
<reconstruction strip_width="0.0125*mm" strip_length="92*mm" strip_pitch="0.05*mm" strip_angle="7*deg" />
- <!-- SQL command: "select * from global;" -->
- <global sensitive_thickness="0.2*mm" support_thickness="1*mm" sensor_length="92*mm" sensitive_mat="G4_Si"
+ <global sensitive_thickness="SET_sensitive_thickness" support_thickness="SET_support_thickness" sensor_length="92*mm" sensitive_mat="G4_Si"
support_mat="G4_C" sensitive_threshold_KeV="64*keV" />
- <!-- SQL command: "select * from set_layers;" -->
-
- <layer layer_id="0" sensitive_distance_from_tpc="3*mm" coverage_of_TPC_Ecal_Hcal_barrel="0.98"
- n_ladders="24" ladder_clearance="0.1*mm" faces_IP="1" />
-
- <layer layer_id="1" sensitive_distance_from_tpc="5.5*mm" coverage_of_TPC_Ecal_Hcal_barrel="0.98"
- n_ladders="24" ladder_clearance="0.1*mm" faces_IP="0" />
+ <layer layer_id="0" sensitive_distance_from_tpc="SET_distance_from_tpc" coverage_of_TPC_Ecal_Hcal_barrel="1.0"
+ n_ladders="SET_ladder_number" ladder_clearance="0.1*mm" faces_IP="1" />
+ <layer layer_id="1" sensitive_distance_from_tpc="SET_distance_from_tpc+SET_support_thickness*2+SET_sensitive_thickness" coverage_of_TPC_Ecal_Hcal_barrel="1.0"
+ n_ladders="SET_ladder_number" ladder_clearance="0.1*mm" faces_IP="0" />
</detector>
diff --git a/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_01.xml
index 02a49d5eaa5a5fd32f68e2d51987d7c64505680f..92dd20c92d72dea5686e258a334253743347ec86 100644
--- a/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_01.xml
+++ b/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_01.xml
@@ -1,42 +1,46 @@
<lccdd>
<define>
- <constant name="SIT_sensitive_thickness" value="0.2*mm"/>
- <constant name="SIT_inner_radius" value="SIT1_inner_radius"/>
+ <!--0.17mm silicon + 1.0mm carbon -> 0.65% of X0-->
+ <constant name="SIT_sensitive_thickness" value="0.17*mm"/>
+ <constant name="SIT_support_thickness" value="1*mm"/>
+ <constant name="SIT_sensor_length" value="92*mm"/>
+ <!--constant name="SIT_inner_radius" value="SIT1_inner_radius"/>
<constant name="SIT_inner_radius_1" value="SIT_inner_radius + env_safety"/>
<constant name="SIT_outer_radius_1" value="SIT_inner_radius_1/cos(pi/8)"/>
<constant name="SIT_inner_radius_2" value="SIT2_inner_radius"/>
<constant name="SIT_outer_radius" value="OuterTracker_inner_radius"/>
<constant name="SIT_half_length" value="SIT2_half_length"/>
<constant name="SIT_half_length_1" value="SIT1_half_length"/>
- <constant name="SIT_layer_gap" value="2.5*mm"/>
+ <constant name="SIT_layer_gap" value="2.5*mm"/-->
</define>
<detectors>
- <detector id="DetID_SIT" name="SIT" type="SIT_Simple_Planar" vis="SITVis" readout="SITCollection" insideTrackingVolume="true">
- <envelope vis="SeeThrough">
- <shape type="BooleanShape" operation="Union" material="Air" >
+ <detector id="DetID_SIT" name="SIT" type="SIT_Simple_Pixel" vis="SITVis" readout="SITCollection" insideTrackingVolume="true">
+ <envelope>
+ <shape type="Assembly"/>
+ <!--shape type="BooleanShape" operation="Union" material="Air" >
<shape type="Tube" rmin="SIT_inner_radius" rmax="SIT_outer_radius_1" dz="SIT_half_length_1" />
<shape type="Tube" rmin="SIT_inner_radius_2" rmax="SIT_outer_radius" dz="SIT_half_length" />
- </shape>
+ </shape-->
</envelope>
- <type_flags type="DetType_TRACKER + DetType_BARREL + DetType_STRIP "/>
+ <type_flags type="DetType_TRACKER + DetType_BARREL + DetType_PIXEL "/>
- <!-- database : sit_simple_planar_sensors_03 -->
-
- <!-- SQL command: "select * from extended_reconstruction_parameters;" -->
- <reconstruction strip_width="0." strip_length="92*mm" strip_pitch="0." strip_angle="0*deg" />
+ <reconstruction strip_width="0." strip_length="0." strip_pitch="0." strip_angle="0*deg" />
- <!-- SQL command: "select * from global;" -->
- <global sensitive_thickness="SIT_sensitive_thickness" support_thickness="1*mm" sensor_length="92*mm"
+ <global sensitive_thickness="SIT_sensitive_thickness" support_thickness="SIT_support_thickness" sensor_length="SIT_sensor_length"
sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV" />
+ <display ladder="SeeThrough" support="SITSupportVis" sens_env="SeeThrough" sens="SITSensitiveVis" />
- <!-- SQL command: "select * from sit_layers;" -->
- <layer layer_id="0" sensitive_radius="SIT_inner_radius_1+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="8" n_ladders="10"
- ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="1" is_SIT2="0" />
+ <layer layer_id="0" sensitive_radius="SIT1_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT1_half_length*2/SIT_sensor_length"
+ n_ladders="2*pi*SIT1_inner_radius/SIT_sensor_length" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="1" is_SIT2="0" />
+ <layer layer_id="1" sensitive_radius="SIT2_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT2_half_length*2/SIT_sensor_length"
+ n_ladders="2*pi*SIT2_inner_radius/SIT_sensor_length" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="1" />
+ <layer layer_id="2" sensitive_radius="SIT3_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT3_half_length*2/SIT_sensor_length"
+ n_ladders="2*pi*SIT3_inner_radius/SIT_sensor_length" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="0" />
+ <layer layer_id="3" sensitive_radius="SIT4_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT4_half_length*2/SIT_sensor_length"
+ n_ladders="2*pi*SIT4_inner_radius/SIT_sensor_length" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="0" />
- <layer layer_id="1" sensitive_radius="SIT_inner_radius_2+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="48" n_ladders="16"
- ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="1" />
</detector>
</detectors>
diff --git a/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_02.xml b/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01b0759976b96223fb1938c4679d728d386891d3
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v01/SIT_SimplePixel_v01_02.xml
@@ -0,0 +1,51 @@
+<lccdd>
+ <define>
+ <!--0.17mm silicon + 1.0mm carbon -> 0.65% of X0-->
+ <constant name="SIT_sensitive_thickness" value="0.17*mm"/>
+ <constant name="SIT_support_thickness" value="1*mm"/>
+ <constant name="SIT_sensor_length" value="92*mm"/>
+ <!--constant name="SIT_inner_radius" value="SIT1_inner_radius"/>
+ <constant name="SIT_inner_radius_1" value="SIT_inner_radius + env_safety"/>
+ <constant name="SIT_outer_radius_1" value="SIT_inner_radius_1/cos(pi/8)"/>
+ <constant name="SIT_inner_radius_2" value="SIT2_inner_radius"/>
+ <constant name="SIT_outer_radius" value="OuterTracker_inner_radius"/>
+ <constant name="SIT_half_length" value="SIT2_half_length"/>
+ <constant name="SIT_half_length_1" value="SIT1_half_length"/>
+ <constant name="SIT_layer_gap" value="2.5*mm"/-->
+ </define>
+
+ <detectors>
+ <detector id="DetID_SIT" name="SIT" type="SIT_Simple_Pixel" vis="SITVis" readout="SITCollection" insideTrackingVolume="true">
+ <envelope>
+ <shape type="Assembly"/>
+ <!--shape type="BooleanShape" operation="Union" material="Air" >
+ <shape type="Tube" rmin="SIT_inner_radius" rmax="SIT_outer_radius_1" dz="SIT_half_length_1" />
+ <shape type="Tube" rmin="SIT_inner_radius_2" rmax="SIT_outer_radius" dz="SIT_half_length" />
+ </shape-->
+ </envelope>
+
+ <type_flags type="DetType_TRACKER + DetType_BARREL + DetType_PIXEL "/>
+
+ <reconstruction strip_width="0." strip_length="0." strip_pitch="0." strip_angle="0*deg" />
+
+ <global sensitive_thickness="SIT_sensitive_thickness" support_thickness="SIT_support_thickness" sensor_length="SIT_sensor_length"
+ sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV" />
+ <display ladder="SeeThrough" support="SITSupportVis" sens_env="SeeThrough" sens="SITSensitiveVis" />
+
+ <layer layer_id="0" sensitive_radius="SIT1_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT1_half_length*2/SIT_sensor_length"
+ n_ladders="2*pi*SIT1_inner_radius/SIT_sensor_length" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="1" is_SIT2="0" />
+ <layer layer_id="1" sensitive_radius="SIT2_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT2_half_length*2/SIT_sensor_length"
+ n_ladders="2*pi*SIT2_inner_radius/SIT_sensor_length" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="1" />
+ <layer layer_id="2" sensitive_radius="SIT3_inner_radius+0.5*SIT_sensitive_thickness" n_sensors_per_ladder="SIT3_half_length*2/SIT_sensor_length"
+ n_ladders="2*pi*SIT3_inner_radius/SIT_sensor_length" ladder_clearance="0.1*mm" faces_IP="1" is_SIT1="0" is_SIT2="0" />
+
+ </detector>
+ </detectors>
+
+ <readouts>
+ <readout name="SITCollection">
+ <id>system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2</id>
+ </readout>
+ </readouts>
+
+</lccdd>
diff --git a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
index 06822bb910b8138d387f1a85e24aebf690941e8b..88d71d3c05c70a4e57d64454cc8f2ed7847d44e3 100644
--- a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
+++ b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.cpp
@@ -3,6 +3,7 @@
#include "EventSeeder/IEventSeeder.h"
#include "TrackSystemSvc/ITrackSystemSvc.h"
#include "DataHelper/Navigation.h"
+#include "DataHelper/TrackerHitHelper.h"
#include "edm4hep/MCParticle.h"
#include "edm4hep/TrackerHit.h"
//#include "edm4hep/TrackerHitPlane.h"
@@ -420,7 +421,7 @@ int SiliconTrackingAlg::InitialiseFTD() {
}
catch ( GaudiException &e ) {
debug() << "Collection " << _inFTDPixelColHdl.fullKey() << " is unavailable in event " << _nEvt << endmsg;
- success = 0;
+ //success = 0;
}
if(hitFTDPixelCol){
@@ -520,7 +521,7 @@ int SiliconTrackingAlg::InitialiseFTD() {
}
catch ( GaudiException &e ) {
debug() << "Collection " << _inFTDSpacePointColHdl.fullKey() << " is unavailable in event " << _nEvt << endmsg;
- success = 0;
+ //success = 0;
}
const edm4hep::TrackerHitCollection* rawHitCol = nullptr;
@@ -626,6 +627,8 @@ int SiliconTrackingAlg::InitialiseFTD() {
}
}
+ if(hitFTDPixelCol==nullptr&&hitFTDSpacePointCol==nullptr) success = 0;
+
debug() << "FTD initialized" << endmsg;
return success;
}
@@ -771,7 +774,6 @@ int SiliconTrackingAlg::InitialiseVTX() {
// v) Must be standard TrackerHit
//const edm4hep::ConstTrackerHit trkhit = hitSITCol->at(ielem);
-
int layer = getLayerID(trkhit);
// VXD and SIT are treated as one system so SIT layers start from _nLayersVTX
@@ -2671,7 +2673,7 @@ void SiliconTrackingAlg::FinalRefit(edm4hep::TrackCollection* trk_col) {
// check if the hit has been rejected as being on the same layer and further from the helix lh==0
if (lh[i] == 1) {
edm4hep::ConstTrackerHit trkHit = hitVec[i]->getTrackerHit();
- debug() << "TrackerHit " << i << " address = " << trkHit << endmsg;
+ debug() << "TrackerHit " << i << " id = " << trkHit.id() << endmsg;
nFit++;
if(trkHit.isAvailable()) {
trkHits.push_back(trkHit);
@@ -2791,7 +2793,7 @@ void SiliconTrackingAlg::FinalRefit(edm4hep::TrackCollection* trk_col) {
marlinTrk->getHitsInFit(hits_in_fit);
for ( unsigned ihit = 0; ihit < hits_in_fit.size(); ++ihit) {
- debug() << "Hit address=" << hits_in_fit[ihit].first << endmsg;
+ debug() << "Hit id =" << hits_in_fit[ihit].first.id() << endmsg;
edm4hep::ConstTrackerHit trk = hits_in_fit[ihit].first;
all_hits.push_back(trk);//hits_in_fit[ihit].first);
}