Skip to content
Snippets Groups Projects
Commit 32add61e authored by Jihee Kim's avatar Jihee Kim
Browse files

Added Si layers and defined global parameters

parent f3cf8d06
Branches
Tags
1 merge request!30Resolve "Implement cb_CTD_SI"
Pipeline #7886 failed
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
</display> </display>
<detectors> <detectors>
<detector id="cb_CTD_Si_ID" name="cb_CTD_Si" type="cb_CTD_Si" readout="cb_CTD_Si_Hits" vis="cb_CTD_SiVis" insideTrackingVloume="true"> <detector id="cb_CTD_Si_ID" name="cb_CTD_Si" type="cb_CTD_Si" readout="cb_CTD_Si_Hits" vis="cb_CTDVis" insideTrackingVloume="true">
<dimensions rmin="cb_CTD_Si_rmin" rmax="cb_CTD_Si_rmax" length="cb_CTD_Si_length" zmax="cb_CTD_Si_zmax" gap="cb_CTD_Si_gap"/> <dimensions rmin="cb_CTD_rmin" rmax="cb_CTD_rmax" length="cb_CTD_length" zmax="cb_CTD_zmax" gap="cb_CTD_Si_gap"/>
<layer repeat="cb_CTD_Si_layer" vis="cb_CTD_Si_layerVis"> <layer repeat="cb_CTD_Si_layer" vis="cb_CTD_Si_layerVis">
<slice name="Silicon_slice" material="Si" sensitive="true"/> <slice name="Silicon_slice" material="Si" sensitive="true"/>
</layer> </layer>
......
...@@ -321,22 +321,23 @@ ...@@ -321,22 +321,23 @@
<constant name="SiliconTrackerOuterBarrelLength" value="SolenoidLength/2.0"/> <constant name="SiliconTrackerOuterBarrelLength" value="SolenoidLength/2.0"/>
<comment> <comment>
---------------------------- -------------------------------
Central Barrel Tracker - Si Central Barrel Tracker - Global
---------------------------- -------------------------------
</comment> </comment>
<constant name="cb_CTD_Si_rmin" value="21.0 * cm"/> <constant name="cb_CTD_rmin" value="21.0 * cm"/>
<constant name="cb_CTD_Si_rmax" value="80.0 * cm"/> <constant name="cb_CTD_rmax" value="80.0 * cm"/>
<constant name="cb_CTD_Si_zmax" value="200.0 * cm"/> <constant name="cb_CTD_zmax" value="200.0 * cm"/>
<comment> Original Global parameter </comment> <comment> Original Global parameter </comment>
<!-- <!--
<constant name="cb_CTD_Si_zmax" value="120.0 * cm"/> <constant name="cb_CTD_zmax" value="120.0 * cm"/>
--> -->
<constant name="cb_CTD_Si_length" value="SolenoidLength - cb_CTD_Si_zmax"/> <constant name="cb_CTD_length" value="SolenoidLength - cb_CTD_zmax"/>
<comment> After fix cb_Solenoid parameters </comment> <comment> After fix cb_Solenoid parameters </comment>
<!-- <!--
<constant name="cb_CTD_Si_length" value="cb_Solenoid_z - cb_CTD_Si_zmax"/> <constant name="cb_CTD_length" value="cb_Solenoid_z - cb_CTD_zmax"/>
--> -->
<comment> Si layer opiton </comment>
<constant name="cb_CTD_Si_gap" value="5.0 * cm"/> <constant name="cb_CTD_Si_gap" value="5.0 * cm"/>
<constant name="cb_CTD_Si_layer" value="15"/> <constant name="cb_CTD_Si_layer" value="15"/>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<vis name="cb_SolenoidVis" alpha="0.4" r= "0.1" g="0.0" b="0.1" showDaughters="true" visible="true"/> <vis name="cb_SolenoidVis" alpha="0.4" r= "0.1" g="0.0" b="0.1" showDaughters="true" visible="true"/>
<vis name="ffi_ZDCVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/> <vis name="ffi_ZDCVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="ffi_ZDCmoduleVis" alpha="1.0" r= "0.1" g="1.0" b="0.9" showDaughters="true" visible="true"/> <vis name="ffi_ZDCmoduleVis" alpha="1.0" r= "0.1" g="1.0" b="0.9" showDaughters="true" visible="true"/>
<vis name="cb_CTD_SiVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/> <vis name="cb_CTDVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="cb_CTD_Si_layerVis" alpha="1.0" r= "0.9" g="1.0" b="0.1" showDaughters="true" visible="true"/> <vis name="cb_CTD_Si_layerVis" alpha="1.0" r= "0.9" g="1.0" b="0.1" showDaughters="true" visible="true"/>
<comment> <comment>
......
...@@ -26,11 +26,41 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens) ...@@ -26,11 +26,41 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
Volume detVol("cb_CTD_GVol_Logic", cb_CTD_GVol_Solid, Vacuum); Volume detVol("cb_CTD_GVol_Logic", cb_CTD_GVol_Solid, Vacuum);
detVol.setVisAttributes(desc.visAttributes(x_det.visStr())); detVol.setVisAttributes(desc.visAttributes(x_det.visStr()));
// Construct Silicon Layers
xml_comp_t x_layer = x_det.child(_U(layer));
const int repeat = x_layer.repeat();
xml_comp_t x_slice = x_layer.child(_U(slice));
Material slice_mat = desc.material(x_slice.materialStr());
double layerRIn[100];
double layerROut[100];
// Loop over layers
for(int i = 0; i < repeat; i++) {
layerRIn[i] = RIn + (SiLayerGap * i);
layerROut[i] = RIn + (0.01 + SiLayerGap * i);
if (layerROut[i] > ROut)
continue;
string logic_layer_name = detName + _toString(i, "_Logic_lay_%d");
Volume layerVol(logic_layer_name,Tube(layerRIn[i], layerROut[i], SizeZ / 2.0, 0.0, 360.0 * deg), slice_mat);
layerVol.setVisAttributes(desc,x_layer.visStr());
sens.setType("tracker");
layerVol.setSensitiveDetector(sens);
Position layer_pos = Position(0.0, 0.0, 0.0);
PlacedVolume layerPV = detVol.placeVolume(layerVol, layer_pos);
layerPV.addPhysVolID("layer", i+1);
}
DetElement det(detName, detID); DetElement det(detName, detID);
Volume motherVol = desc.pickMotherVolume(det); Volume motherVol = desc.pickMotherVolume(det);
Transform3D tr(RotationZYX(0.0, 0.0, 0.0), Position(0.0, 0.0, 0.0)); Transform3D tr(RotationZYX(0.0, 0.0, 0.0), Position(0.0, 0.0, 0.0));
PlacedVolume detPV = motherVol.placeVolume(detVol, tr); PlacedVolume detPV = motherVol.placeVolume(detVol, tr);
detPV.addPhysVolID("system", detID); detPV.addPhysVolID("system", detID);
detPV.addPhysVolID("barrel", 1);
det.setPlacement(detPV); det.setPlacement(detPV);
return det; return det;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment