Skip to content
Snippets Groups Projects
Commit 289dab64 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Added parameterized forward ion TRD 

 - Currently just a volume  containing air.
parent 06059bcf
No related branches found
No related tags found
1 merge request!43Resolve "Implement ci_TRD"
Pipeline #8174 passed with stages
Stage: config
    Stage: build
      Stage: docs
        Stage: test
          Stage: finalize
            in 2 minutes and 32 seconds
            Hide whitespace changes
            Inline Side-by-side
            compact/definitions.xml
            + 33
            − 14
            View file @ 289dab64
            ...@@ -130,9 +130,24 @@ ...@@ -130,9 +130,24 @@
            (75-99) Reserved IDs (75-99) Reserved IDs
            =================== ===================
            Unused IDs: 75-99 Unused IDs: 75-89
            TBD TBD
            </comment> </comment>
            <comment>
            ======================
            (90-99) Barrel PID IDs
            ======================
            DIRC subsystem ID: 90
            Barrel TRD subsystem ID: 91
            Barrel TOF subsystem ID: 92
            Unused IDs: 93-99
            </comment>
            <constant name="BarrelDIRC_ID" value="90"/>
            <constant name="BarrelTRD_ID" value="91"/>
            <constant name="BarrelTOF_ID" value="92"/>
            <comment> <comment>
            ===================================== =====================================
            ...@@ -179,11 +194,12 @@ ...@@ -179,11 +194,12 @@
            Forwardtracking ID: 120 Forwardtracking ID: 120
            Forward RICH ID: 121 Forward RICH ID: 121
            Unused IDs: 123-129 Unused IDs: 124-129
            </comment> </comment>
            <constant name="ForwardTracking_ID" value="120"/> <constant name="ForwardTracking_ID" value="120"/>
            <constant name="ForwardRICH_ID" value="121"/> <constant name="ForwardRICH_ID" value="121"/>
            <constant name="ci_GEM_id" value="122"/> <constant name="ci_GEM_id" value="122"/>
            <constant name="ForwardTRD_ID" value="123"/>
            <comment> <comment>
            ===================================== =====================================
            ...@@ -281,18 +297,21 @@ ...@@ -281,18 +297,21 @@
            These are needed here to compute the dependent parameters. These are needed here to compute the dependent parameters.
            </comment> </comment>
            <constant name="RICHLength" value="1.1*m"/> <constant name="ForwardRICH_length" value="1.1*m"/>
            <constant name="TRDLength" value="20.0*cm"/> <constant name="ForwardTRD_length" value="20.0*cm"/>
            <constant name="ForwardTOFLength" value="10.0*cm"/> <constant name="ForwardTOF_length" value="10.0*cm"/>
            <constant name="BackwardCherenkovLength" value="15.0*cm"/> <constant name="BackwardCherenkovLength" value="15.0*cm"/>
            <constant name="BackwardTOFLength" value="10.0*cm"/> <constant name="BackwardTOFLength" value="10.0*cm"/>
            <comment> Total length of PID detectors above</comment> <comment> Total length of PID detectors above</comment>
            <constant name="ForwardPIDLength" value="RICHLength + TRDLength + ForwardTOFLength"/> <constant name="ForwardPIDLength" value="ForwardRICH_length + ForwardTRD_length + ForwardTOF_length"/>
            <constant name="BackwardPIDLength" value="BackwardCherenkovLength + BackwardTOFLength"/> <constant name="BackwardPIDLength" value="BackwardCherenkovLength + BackwardTOFLength"/>
            <constant name="BarrelPIDThickness" value="25.0 * cm"/> <comment> Barrel PID thicknesses</comment>
            <constant name="BarrelExtraPIDThickness" value="25.0 * cm"/>
            <constant name="BarrelTRDThickness" value="25.0 * cm"/>
            <constant name="BarrelTOFThickness" value="1.0 * cm"/>
            <comment> <comment>
            ============================ ============================
            ...@@ -372,7 +391,7 @@ ...@@ -372,7 +391,7 @@
            <constant name="SolenoidYokeEndcapP_zmin" value="Solenoid_length/2.0 + Solenoid_offset+ExtraHcalEndcapP_length"/> <constant name="SolenoidYokeEndcapP_zmin" value="Solenoid_length/2.0 + Solenoid_offset+ExtraHcalEndcapP_length"/>
            <constant name="SolenoidYokeEndcapN_zmin" value="Solenoid_length/2.0 - Solenoid_offset+ExtraHcalEndcapN_length"/> <constant name="SolenoidYokeEndcapN_zmin" value="Solenoid_length/2.0 - Solenoid_offset+ExtraHcalEndcapN_length"/>
            <constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + BarrelPIDThickness + 5.0 * mm"/> <constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + BarrelExtraPIDThickness + 5.0 * mm"/>
            <constant name="HcalBarrel_rmax" value="Solenoid_rmin - 10.0 *cm "/> <constant name="HcalBarrel_rmax" value="Solenoid_rmin - 10.0 *cm "/>
            <constant name="Barrel_TotalCalThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/> <constant name="Barrel_TotalCalThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/>
            <constant name="CalBarrelDivider" value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment> <constant name="CalBarrelDivider" value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
            ...@@ -550,12 +569,12 @@ ...@@ -550,12 +569,12 @@
            Gaseous RICH Parameters Gaseous RICH Parameters
            ----------------------- -----------------------
            </comment> </comment>
            <constant name="RICHZMin" value="SiliconTrackerOuterBarrel_zmax + 1 * cm"/> <constant name="ForwardRICH_zmin" value="SiliconTrackerOuterBarrel_zmax + 1 * cm"/>
            <constant name="RICHRMin" value="15 * cm"/> <constant name="ForwardRICH_rmin" value="15 * cm"/>
            <constant name="RICH_rmax0" value="SiliconTrackerOuterRadius"/> <constant name="ForwardRICH_rmax0" value="SiliconTrackerOuterRadius"/>
            <constant name="RICH_rmax1" value="EcalBarrel_rmin"/> <constant name="ForwardRICH_rmax1" value="EcalBarrel_rmin"/>
            <constant name="RICH_rmax2" value="SolenoidBarrel_rmin-2*cm"/> <constant name="ForwardRICH_rmax2" value="SolenoidBarrel_rmin-2*cm"/>
            <constant name="RICHDepth" value="0.9*m"/> <constant name="ForwardRICHDepth" value="0.9*m"/>
            <comment> <comment>
            ......
            compact/forward_rich.xml
            + 20
            − 20
            View file @ 289dab64
            ...@@ -6,26 +6,26 @@ ...@@ -6,26 +6,26 @@
            <detectors> <detectors>
            <detector id="ForwardRICH_ID" name="ForwardRICH" type="refdet_ForwardRICH" readout="ForwardRICHHits" vis="BlueVis"> <detector id="ForwardRICH_ID" name="ForwardRICH" type="refdet_ForwardRICH" readout="ForwardRICHHits" vis="BlueVis">
            <dimensions <dimensions
            z0="RICHZMin" z0="ForwardRICH_zmin"
            snout_length="RICHLength - RICHDepth" snout_length="ForwardRICH_length - ForwardRICHDepth"
            length="RICHLength" length="ForwardRICH_length"
            rmin="RICHRMin" rmin="ForwardRICH_rmin"
            rmax0="RICH_rmax0" rmax0="ForwardRICH_rmax0"
            rmax1="RICH_rmax1" rmax1="ForwardRICH_rmax1"
            rmax2="RICH_rmax2"/> rmax2="ForwardRICH_rmax2"/>
            <radiator material="N2cherenkov" /> <radiator material="N2cherenkov" />
            <tank <tank
            length="RICHDepth" length="ForwardRICHDepth"
            gas="N2cherenkov" gas="N2cherenkov"
            vis="GreenVis" vis="GreenVis"
            rmin="RICHRMin" rmin="ForwardRICH_rmin"
            rmax1="RICH_rmax1" rmax1="ForwardRICH_rmax1"
            rmax2="RICH_rmax2" /> rmax2="ForwardRICH_rmax2" />
            <comment> What are the following MCP-PMT parameters?</comment> <comment> What are the following MCP-PMT parameters?</comment>
            <mcppmt <mcppmt
            z0="-20.0*cm" z0="-20.0*cm"
            rmin="RICH_rmax1" rmin="ForwardRICH_rmax1"
            rmax="RICH_rmax2" rmax="ForwardRICH_rmax2"
            rtol="1.0*cm" rtol="1.0*cm"
            vis="BlueVis" vis="BlueVis"
            module_size="10*cm" module_size="10*cm"
            ...@@ -33,16 +33,16 @@ ...@@ -33,16 +33,16 @@
            thickness="1.0*cm" thickness="1.0*cm"
            material="Quartz" /> material="Quartz" />
            <mirror <mirror
            z0="RICHLength - 40*cm" z0="ForwardRICH_length - 40*cm"
            thickness="1*mm" thickness="1*mm"
            material="PyrexGlass" material="PyrexGlass"
            vis="GrayVis"> vis="GrayVis">
            <slice focus="10*cm" curve="300*cm" rmin="RICHRMin" rmax="RICH_rmax1" phiw="59*degree" rotz="0*degree" /> <slice focus="10*cm" curve="300*cm" rmin="ForwardRICH_rmin" rmax="ForwardRICH_rmax1" phiw="59*degree" rotz="0*degree" />
            <slice focus="10*cm" curve="300*cm" rmin="RICHRMin" rmax="RICH_rmax1" phiw="59*degree" rotz="60*degree" /> <slice focus="10*cm" curve="300*cm" rmin="ForwardRICH_rmin" rmax="ForwardRICH_rmax1" phiw="59*degree" rotz="60*degree" />
            <slice focus="10*cm" curve="300*cm" rmin="RICHRMin" rmax="RICH_rmax1" phiw="59*degree" rotz="120*degree" /> <slice focus="10*cm" curve="300*cm" rmin="ForwardRICH_rmin" rmax="ForwardRICH_rmax1" phiw="59*degree" rotz="120*degree" />
            <slice focus="10*cm" curve="300*cm" rmin="RICHRMin" rmax="RICH_rmax1" phiw="59*degree" rotz="180*degree" /> <slice focus="10*cm" curve="300*cm" rmin="ForwardRICH_rmin" rmax="ForwardRICH_rmax1" phiw="59*degree" rotz="180*degree" />
            <slice focus="10*cm" curve="300*cm" rmin="RICHRMin" rmax="RICH_rmax1" phiw="59*degree" rotz="240*degree" /> <slice focus="10*cm" curve="300*cm" rmin="ForwardRICH_rmin" rmax="ForwardRICH_rmax1" phiw="59*degree" rotz="240*degree" />
            <slice focus="10*cm" curve="300*cm" rmin="RICHRMin" rmax="RICH_rmax1" phiw="59*degree" rotz="300*degree" /> <slice focus="10*cm" curve="300*cm" rmin="ForwardRICH_rmin" rmax="ForwardRICH_rmax1" phiw="59*degree" rotz="300*degree" />
            </mirror> </mirror>
            </detector> </detector>
            </detectors> </detectors>
            ......
            compact/forward_trd.xml 0 → 100644
            + 33
            − 0
            View file @ 289dab64
            <?xml version="1.0" encoding="UTF-8"?>
            <lccdd>
            <define>
            <comment>
            --------------------------
            Forward TRD Parameters
            --------------------------
            </comment>
            <constant name="ForwardTRD_zmin" value="ForwardRICH_zmin + ForwardRICH_length+ 1*cm"/>
            <constant name="ForwardTRD_rmin" value="ForwardRICH_rmin"/>
            <constant name="ForwardTRD_rmax" value="EcalBarrel_rmax - 5*cm"/>
            </define>
            <detectors>
            <detector
            id="ForwardTRD_ID"
            name="ForwardTRD"
            type="ref_DiskTracker"
            insideTrackingVolume="true"
            reflect="false"
            vis="Argonne_Red">
            <position x="0" y="0" z="0"/>
            <layer id="1"
            vis="Argonne_Blue"
            inner_z="ForwardTRD_zmin"
            inner_r="ForwardTRD_rmin"
            outer_r="ForwardTRD_rmax">
            <slice material="Air" thickness="ForwardTRD_length/2.0" vis="Argonne_Blue" />
            </layer>
            </detector>
            </detectors>
            </lccdd>
            reference_detector.xml
            + 1
            − 0
            View file @ 289dab64
            ...@@ -123,6 +123,7 @@ ...@@ -123,6 +123,7 @@
            <include ref="compact/ffi_ZDC.xml"/> <include ref="compact/ffi_ZDC.xml"/>
            <include ref="compact/ci_GEM.xml"/> <include ref="compact/ci_GEM.xml"/>
            <include ref="compact/hcal.xml"/> <include ref="compact/hcal.xml"/>
            <include ref="compact/forward_trd.xml"/>
            <!-- <!--
            <include ref="compact/ci_HCAL.xml"/> <include ref="compact/ci_HCAL.xml"/>
            <include ref="compact/forward_rich.xml"/> <include ref="compact/forward_rich.xml"/>
            ......
            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