Commit 651ea2d4 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Adding sub assembly for each layer.

parent 7bcba289
......@@ -214,9 +214,21 @@ def run():
#seq, act = geant4.setupDetector('HeavyGasCherenkov','PhotoMultiplierSDAction')
#act.adopt(f3)
seq, act = geant4.setupTracker('SiTrackerBarrel')
seq, act = geant4.setupTracker('SiTrackerEndcapP')
seq, act = geant4.setupTracker('SiTrackerEndcapN')
seq, act = geant4.setupTracker('SiTrackerBarrel_Layer1')
seq, act = geant4.setupTracker('SiTrackerEndcapP_Layer1')
seq, act = geant4.setupTracker('SiTrackerEndcapN_Layer1')
seq, act = geant4.setupTracker('SiTrackerBarrel_Layer2')
seq, act = geant4.setupTracker('SiTrackerEndcapP_Layer2')
seq, act = geant4.setupTracker('SiTrackerEndcapN_Layer2')
seq, act = geant4.setupTracker('SiTrackerBarrel_Layer3')
seq, act = geant4.setupTracker('SiTrackerEndcapP_Layer3')
seq, act = geant4.setupTracker('SiTrackerEndcapN_Layer3')
seq, act = geant4.setupTracker('SiTrackerBarrel_Layer4')
seq, act = geant4.setupTracker('SiTrackerEndcapP_Layer4')
seq, act = geant4.setupTracker('SiTrackerEndcapN_Layer4')
seq, act = geant4.setupTracker('SiTrackerBarrel_Layer5')
seq, act = geant4.setupTracker('SiTrackerEndcapP_Layer5')
seq, act = geant4.setupTracker('SiTrackerEndcapN_Layer5')
#seq, act = geant4.setupTracker('SiVertexBarrel')
#seq, act = geant4.setupTracker('SiTrackerForward')
#seq, act = geant4.setupCalorimeter('EcalBarrel')
......
......@@ -103,6 +103,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
double layer_rmax = l_env.attr<double>(_Unicode(rmax));
double layer_length = l_env.attr<double>(_Unicode(length));
double layer_zstart = l_env.attr<double>(_Unicode(zstart));
//printout(INFO,"ROOTGDMLParse","+++ Read geometry from GDML file file:%s",input.c_str());
std::cout << "SiTracker Endcap layer " << l_id << " zstart = " << layer_zstart/dd4hep::mm << "mm ( " << layer_length/dd4hep::mm << " mm thick )\n";
//Assembly layer_assembly(layer_name);
......
......@@ -106,17 +106,17 @@
</display>
<!--
<include ref="topside/vertex_tracker.xml"/>
-->
<include ref="topside/beampipe.xml"/>
<include ref="topside/vertex_tracker.xml"/>
<include ref="topside/silicon_tracker.xml"/>
<include ref="topside/ecal.xml"/>
<include ref="topside/hcal.xml"/>
<include ref="topside/solenoid.xml"/>
<include ref="topside/topside_rich.xml"/>
<include ref="topside/roman_pots.xml"/>
<include ref="eic/forward_ion_beamline.xml"/>
<!--
<include ref="eic/forward_ion_beamline.xml"/>
-->
<detectors>
......
This diff is collapsed.
......@@ -29,25 +29,53 @@
<comment> Silicon Vertex Tracker
SiVertex subsystem ID: 2
Barrel subassembly ID: 121
EndcapP subassembly ID: 122
EndcapN subassembly ID: 123
Layer 1 subassembly ID: 121
Layer 2 subassembly ID: 122
Layer 3 subassembly ID: 123
Layer 4 subassembly ID: 124
Layer 5 subassembly ID: 125
</comment>
<constant name="SiVertexSubAssembly_ID" value="2"/>
<constant name="SiVertexBarrel_ID" value="121"/>
<constant name="SiVertexEndcapP_ID" value="122"/>
<constant name="SiVertexEndcapN_ID" value="123"/>
<constant name="SiVertexSubAssemblyLayer1_ID" value="121"/>
<constant name="SiVertexSubAssemblyLayer2_ID" value="122"/>
<constant name="SiVertexSubAssemblyLayer3_ID" value="123"/>
<constant name="SiVertexSubAssemblyLayer4_ID" value="124"/>
<constant name="SiVertexSubAssemblyLayer5_ID" value="125"/>
<comment> Silicon Tracker System
SiTracker subsystem ID: 3
Barrel subassembly ID: 131
EndcapP subassembly ID: 132
EndcapN subassembly ID: 133
Layer 1 subassembly ID: 121
Layer 2 subassembly ID: 122
Layer 3 subassembly ID: 123
Layer 4 subassembly ID: 124
Layer 5 subassembly ID: 125
</comment>
<constant name="SiTrackerSubAssembly_ID" value="3"/>
<constant name="SiTrackerBarrel_ID" value="131"/>
<constant name="SiTrackerEndcapP_ID" value="132"/>
<constant name="SiTrackerEndcapN_ID" value="133"/>
<constant name="SiTrackerSubAssemblyLayer1_ID" value="131"/>
<constant name="SiTrackerSubAssemblyLayer2_ID" value="132"/>
<constant name="SiTrackerSubAssemblyLayer3_ID" value="133"/>
<constant name="SiTrackerSubAssemblyLayer4_ID" value="134"/>
<constant name="SiTrackerSubAssemblyLayer5_ID" value="135"/>
<constant name="SiTrackerBarrel_Layer1_ID" value="51"/>
<constant name="SiTrackerEndcapP_Layer1_ID" value="52"/>
<constant name="SiTrackerEndcapN_Layer1_ID" value="53"/>
<constant name="SiTrackerBarrel_Layer2_ID" value="54"/>
<constant name="SiTrackerEndcapP_Layer2_ID" value="55"/>
<constant name="SiTrackerEndcapN_Layer2_ID" value="56"/>
<constant name="SiTrackerBarrel_Layer3_ID" value="57"/>
<constant name="SiTrackerEndcapP_Layer3_ID" value="58"/>
<constant name="SiTrackerEndcapN_Layer3_ID" value="59"/>
<constant name="SiTrackerBarrel_Layer4_ID" value="60"/>
<constant name="SiTrackerEndcapP_Layer4_ID" value="61"/>
<constant name="SiTrackerEndcapN_Layer4_ID" value="62"/>
<constant name="SiTrackerBarrel_Layer5_ID" value="63"/>
<constant name="SiTrackerEndcapP_Layer5_ID" value="64"/>
<constant name="SiTrackerEndcapN_Layer5_ID" value="65"/>
<comment> Unused ID: 4 </comment>
......
Markdown is supported
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