Skip to content

Commit

Permalink
moved DSS (downstream shield) volumes from beamline to torus where th…
Browse files Browse the repository at this point in the history 
…e apex is implemented (Raffella), ddvcs geo update, fixed raster options for LUND format, added new transverse solenoid map option: Full_transsolenoid_x321_y161_z321_April2024
  • Loading branch information
@maureeungaro
maureeungaro committed May 2, 2024
1 parent a1dbf4f commit fbdd710
Show file tree
Hide file tree
Showing 21 changed files with 1,619 additions and 1,910 deletions.
7 changes: 4 additions & 3 deletions experiments/clas12/alert/ahdc__bank.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
ahdc | sector | set to 0 | 1 | Di
ahdc | layer | hipo layer is superlayer*10 + layer | 2 | Di
ahdc | component | wire number | 3 | Di
ahdc | TDC_order | set to 0 | 4 | Di
ahdc | TDC_TDC | TDC integral from pulse fit | 5 | Di
ahdc | TDC_ped |pedestal from pulse analysis - currently set to doca | 6 | Di
ahdc | ADC_order | set to 0 | 4 | Di
ahdc | ADC_ADC | ADC integral from pulse fit | 5 | Di
ahdc | ADC_time | adc time from pulse fit | 6 | Di
ahdc | ADC_ped |pedestal from pulse analysis - currently set to doca | 7 | Di
ahdc | hitn | hit number | 99 | Di
Binary file removed experiments/clas12/beamline/cadBeamline/DSShieldBackAss.stl
View file
Binary file not shown.
Binary file removed experiments/clas12/beamline/cadBeamline/DSShieldBackCover.stl
View file
Binary file not shown.
Binary file removed experiments/clas12/beamline/cadBeamline/DSShieldBackLead.stl
View file
Binary file not shown.
Binary file removed experiments/clas12/beamline/cadBeamline/DSShieldFlange.stl
View file
Binary file not shown.
Binary file removed experiments/clas12/beamline/cadBeamline/DSShieldFlangeAttachment.stl
View file
Binary file not shown.
Binary file removed experiments/clas12/beamline/cadBeamline/DSShieldFrontAss.stl
View file
Binary file not shown.
Binary file removed experiments/clas12/beamline/cadBeamline/DSShieldFrontCover.stl
View file
Binary file not shown.
Binary file removed experiments/clas12/beamline/cadBeamline/DSShieldFrontLead.stl
View file
Binary file not shown.
Binary file removed experiments/clas12/beamline/cadBeamline/DSShieldInnerAss.stl
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions experiments/clas12/beamline/cadBeamline/cad.gxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,4 @@ For the FTON configurration the cone is shifted by -238.8mm
<volume name="adjuster2" color="22ffff" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="adjuster3" color="22ffff" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>

<volume name="DSShieldFrontLead" mother="fc" color="22ffff" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_Pb"/>
<volume name="DSShieldBackLead" mother="fc" color="22ffff" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_Pb"/>
<volume name="DSShieldInnerAss" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldBackAss" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldFrontAss" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldBackCover" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldFrontCover" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldFlangeAttachment" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldFlange" mother="fc" color="8899dd" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>

</gxml>
10 changes: 0 additions & 10 deletions experiments/clas12/beamline/cadBeamlineFTOFF/cad.gxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,4 @@ The position is modified by to produce a little gap
<volume name="adjuster2" color="22ffff" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="adjuster3" color="22ffff" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>

<volume name="DSShieldFrontLead" mother="fc" color="22ffff" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_Pb"/>
<volume name="DSShieldBackLead" mother="fc" color="22ffff" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_Pb"/>
<volume name="DSShieldInnerAss" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldBackAss" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldFrontAss" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldBackCover" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldFrontCover" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldFlangeAttachment" mother="fc" color="992222" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>
<volume name="DSShieldFlange" mother="fc" color="8899dd" position="0*mm 0*mm 1273.27*mm" rotation="0*deg 180*deg 0*deg" material="G4_STAINLESS-STEEL"/>

</gxml>
Loading

0 comments on commit fbdd710

Please sign in to comment.