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

Added layers

parent 63318e18
No related branches found
No related tags found
1 merge request!32Resolve "Implement ce_GEM"
Pipeline #7960 passed with stages
in 2 minutes and 26 seconds
......@@ -19,7 +19,7 @@
<dimensions rmin="ce_GEM_rmin" rmax="ce_GEM_rmax" length="ce_GEM_length"/>
<position x="ce_GEM_x_pos" y="ce_GEM_y_pos" z="ce_GEM_z_pos"/>
<layer repeat="ce_GEM_layer" vis="ce_GEM_layerVis">
<slice name="Ar10C02_slice" material="Ar10CO2" sensitive="true"/>
<slice name="Ar10CO2_slice" material="Ar10CO2" thickness="ce_GEM_layer_thickness" sensitive="true"/>
</layer>
</detector>
</detectors>
......
......@@ -538,13 +538,14 @@
ce_GEM Parameters
------------------
</comment>
<constant name="ce_GEM_rmin" value="0.0 * cm"/>
<constant name="ce_GEM_rmax" value="45.0 * cm + 50.0 * cm"/>
<constant name="ce_GEM_length" value="30.0 * cm"/>
<constant name="ce_GEM_x_pos" value="0.0 * cm"/>
<constant name="ce_GEM_y_pos" value="0.0 * cm"/>
<constant name="ce_GEM_z_pos" value="-SolenoidLength/2.0 + ce_GEM_length/2.0"/>
<constant name="ce_GEM_layer" value="8"/>
<constant name="ce_GEM_rmin" value="0.0 * cm"/>
<constant name="ce_GEM_rmax" value="45.0 * cm + 50.0 * cm"/>
<constant name="ce_GEM_length" value="30.0 * cm"/>
<constant name="ce_GEM_x_pos" value="0.0 * cm"/>
<constant name="ce_GEM_y_pos" value="0.0 * cm"/>
<constant name="ce_GEM_z_pos" value="-SolenoidLength/2.0 + ce_GEM_length/2.0"/>
<constant name="ce_GEM_layer" value="8"/>
<constant name="ce_GEM_layer_thickness" value="1.0 * cm"/>
</define>
......@@ -54,6 +54,7 @@
<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="ce_GEMVis" alpha="0.1" r= "0.1" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="cb_GEM_layerVis" alpha="0.8" r= "0.8" g="0.4" b="0.3" showDaughters="true" visible="true"/>
<comment>
Deprecated colors.
......
......@@ -31,25 +31,28 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
xml_comp_t x_slice = x_layer.child(_U(slice));
Material slice_mat = desc.material(x_slice.materialStr());
double layerSizeZ = x_slice.thickness();
double layerRIn;
double layerROut;
double layerPosZ;
// 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);
//}
for(int i = 0; i < repeat; i++) {
layerRIn = RIn + 1.0 * cm + ((double)i * 0.5) * cm;
layerROut = ROut - 25.0 * cm + ((double)i * 2.0) * cm;
layerPosZ = SizeZ / 2.0 - 5.0 * cm - ((double)i * 3.0) * cm;
layerSizeZ = 1.0 * cm;
string logic_layer_name = detName + _toString(i, "_Logic_lay_%d");
Volume layerVol(logic_layer_name,Tube(layerRIn, layerROut, layerSizeZ / 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, layerPosZ);
PlacedVolume layerPV = detVol.placeVolume(layerVol, layer_pos);
layerPV.addPhysVolID("layer", i+1);
}
DetElement det(detName, detID);
Volume motherVol = desc.pickMotherVolume(det);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment