Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev various changes, preparing for 5.11 #83

Merged
merged 33 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
04c2947
typo fix in comment
maureeungaro Oct 23, 2024
5020cff
removed forward carriage from gcards
maureeungaro Oct 23, 2024
febfdec
Merge pull request #55 from maureeungaro/main
maureeungaro Oct 23, 2024
0abeac6
using D2 variation for now for rgf. may change later
maureeungaro Oct 24, 2024
39e23a2
added ddvcs gcard
maureeungaro Oct 24, 2024
a9aee4a
Merge pull request #56 from maureeungaro/main
maureeungaro Oct 24, 2024
ab1db09
temp disabling rtpc in rgf as it gives seg fault, probably due to the…
maureeungaro Oct 29, 2024
7f26a5f
temp disabling rtpc in rgf as it gives seg fault, probably due to the…
maureeungaro Oct 29, 2024
133ff56
Merge pull request #57 from maureeungaro/main
maureeungaro Oct 29, 2024
80b6846
adding downstream cad components to PRODUCTIONCUTFORVOLUMES
maureeungaro Oct 30, 2024
6a49115
Added RGE gcards
antorad Nov 6, 2024
e6e50ca
adding RG-E yamls
raffaelladevita Nov 6, 2024
c328f65
triggering validation from dev branch
maureeungaro Nov 6, 2024
ab370fc
Merge pull request #68 from maureeungaro/main
maureeungaro Nov 6, 2024
b5fb260
add linter ci (#61)
baltzell Nov 4, 2024
9484fef
RGE gcards modifications
antorad Nov 7, 2024
07a2fff
Merge pull request #66 from antorad/dev
maureeungaro Nov 7, 2024
66c8af8
Merge pull request #67 from JeffersonLab/rge_yamls
maureeungaro Nov 7, 2024
fc53206
Added RGE configs to setup.json
antorad Nov 8, 2024
f5180ad
Merge pull request #70 from antorad/dev
maureeungaro Nov 11, 2024
b701ac8
removed dev from workflow tags as per Chris request
maureeungaro Nov 12, 2024
8d0a1a9
synced from main
maureeungaro Nov 14, 2024
fb57a0f
updated ddvcs gcard, removing lumi electrons set to 50k by mistake
raffaelladevita Nov 19, 2024
a8ceab0
propagating the recent ddvcs gcard fix to 5.10
raffaelladevita Nov 19, 2024
232f7d5
Merge pull request #81 from JeffersonLab/devSync
maureeungaro Nov 20, 2024
f06b22c
added gemc/dev coatjava/11.0.4 to rga_fall2018 for testing
maureeungaro Dec 3, 2024
3f1e8b2
gemc/dev with 10.1.1
maureeungaro Dec 13, 2024
30f273a
updated coatjava version for spring18
raffaelladevita Jan 16, 2025
ac951f0
added background settings for rga_spring2018
raffaelladevita Jan 17, 2025
3edcfb3
commented out rga_spring2018 bg configurations that are not yet avail…
raffaelladevita Jan 17, 2025
af29686
Merge pull request #82 from JeffersonLab/rgSp18
maureeungaro Jan 17, 2025
c7db160
no comments allowed on json
maureeungaro Jan 17, 2025
189d7ea
comma typo fix
maureeungaro Jan 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# YAML file for RG-A Spring2018 Pass2 simulations
# Uses AI-assisted tracking and denoising
# Compatible with:
# - coatjava 10.0.3 or later
# - coatjava 11.1.0 or later
# - gemc 5.2 or later
# THIS IS A PLACEHOLDER UNTIL THE PASS2 DATA PROCESSING CONDITIONS WILL BE FINALIZED
io-services:
Expand Down Expand Up @@ -66,7 +66,9 @@ services:
name: MC
configuration:
global:
variation: rga_fall2018_mc
dcMinistagger: "NOTONREFWIRE"
dcFeedthroughs: "OFF"
variation: rga_spring2018_mc
# timestamp: 07/27/2023-12:00:00
# uncomment to use bank filtering based on schema, schema path should be updated
# to point to the correct coatjava folder
Expand All @@ -81,7 +83,7 @@ configuration:
DCCR:
rawBankGroup: "NOISE1"
MLTD:
run: "5197"
run: "4003"
DCHAI:
outputBankPrefix: "HB"
RTPC:
Expand Down
31 changes: 22 additions & 9 deletions gemc/5.10/ddvcs.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,31 @@
<option name="HALL_MATERIAL" value="Vacuum"/>


<option name="INTEGRATEDRAW" value="*"/>
<option name="RECORD_PASSBY" value="0"/>

<option name="BEAM_P" value="e-, 11*GeV, 0*deg, 0*deg" />
<!-- <option name="SPREAD_P" value="1*GeV, 10*deg, 180*deg" />-->

<!-- luminosity conditions -->
<option name="LUMI_EVENT" value="50000, 250*ns, 4*ns" />
<option name="LUMI_P" value="e-, 11*GeV, 0*deg, 0*deg" />
<option name="LUMI_V" value="(0.,0.,-4.5.)cm" />
<option name="LUMI_SPREAD_V" value="(0.01, 0.01)cm" />
<option name="SAVE_ALL_MOTHERS" value="1"/>
<option name="RECORD_OPTICALPHOTONS" value="1"/>
<option name="SKIPREJECTEDHITS" value="1" />

<!-- Uncomment this line to save the true information (necessary for Truth Matching -->
<!-- <option name="INTEGRATEDRAW" value="*" /> -->

<!-- Time window defined by LUMI_EVENT -->
<option name="LUMI_EVENT" value="0, 248.5*ns, 4*ns" />
<!-- Uncomment this (and replace the LUMI_EVENT Above) to simulate 10^35 luminosity beam on a 5cm liquid hydrogen target, use 124K e- / event -->
<!-- Scale accordingly for different target / luminosity -->
<!--
<option name="LUMI_EVENT" value="124000, 248.5*ns, 4*ns" />
<option name="LUMI_P" value="e-, 10.6*GeV, 0*deg, 0*deg" />
<option name="LUMI_V" value="(0.0, 0.0, -10)cm" />
<option name="LUMI_SPREAD_V" value="(0.03, 0.03)cm" />
-->

<!-- RF Signal needs event time window defined by LUMI_EVENT -->
<!-- Reference position set as target shift below -->
<option name="RFSETUP" value="clas12_ccdb" />
<option name="RFSTART" value="eventVertex, 0, 0, -30.0" />

<option name="PRINT_EVENT" value="1" />

Expand All @@ -67,7 +81,6 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="rga_fall2018_mc" />


<detector name="airPipe">
<existence exist="no" />
</detector>
Expand Down
5 changes: 3 additions & 2 deletions gemc/dev/clas12-default.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="default" />

<!-- Do not track staff after the apex -->
<!-- Do not track staff after the downstream shielding -->
<option name="MAX_Z_POS" value="9000"/>

<!-- Time window defined by LUMI_EVENT -->
Expand All @@ -98,7 +98,8 @@

<!-- production threshold for passive volumes -->
<!-- beamline shielding: 2cm-->
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, main-cone, adjuster1, adjuster2, adjuster3, 20" />
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, adjuster1, adjuster2, adjuster3, Apex_Shield_Lead_Fill, Apex_Shield_PCAL_Hub, Downstream_Beam_tube_Segment_1, Downstream_Beam_tube_Segment_2, Torus_Beam_Tube_Reducer_2, Torus_Exit_Shield_Casing, Torus_Exit_Shield_Lead_Fill, 20"/>




Expand Down
30 changes: 22 additions & 8 deletions gemc/dev/ddvcs.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,31 @@
<option name="HALL_MATERIAL" value="Vacuum"/>


<option name="INTEGRATEDRAW" value="*"/>
<option name="RECORD_PASSBY" value="0"/>

<option name="BEAM_P" value="e-, 11*GeV, 0*deg, 0*deg" />
<!-- <option name="SPREAD_P" value="1*GeV, 10*deg, 180*deg" />-->

<!-- luminosity conditions -->
<option name="LUMI_EVENT" value="50000, 250*ns, 4*ns" />
<option name="LUMI_P" value="e-, 11*GeV, 0*deg, 0*deg" />
<option name="LUMI_V" value="(0.,0.,-4.5.)cm" />
<option name="LUMI_SPREAD_V" value="(0.01, 0.01)cm" />
<option name="SAVE_ALL_MOTHERS" value="1"/>
<option name="RECORD_OPTICALPHOTONS" value="1"/>
<option name="SKIPREJECTEDHITS" value="1" />

<!-- Uncomment this line to save the true information (necessary for Truth Matching -->
<!-- <option name="INTEGRATEDRAW" value="*" /> -->

<!-- Time window defined by LUMI_EVENT -->
<option name="LUMI_EVENT" value="0, 248.5*ns, 4*ns" />
<!-- Uncomment this (and replace the LUMI_EVENT Above) to simulate 10^35 luminosity beam on a 5cm liquid hydrogen target, use 124K e- / event -->
<!-- Scale accordingly for different target / luminosity -->
<!--
<option name="LUMI_EVENT" value="124000, 248.5*ns, 4*ns" />
<option name="LUMI_P" value="e-, 10.6*GeV, 0*deg, 0*deg" />
<option name="LUMI_V" value="(0.0, 0.0, -10)cm" />
<option name="LUMI_SPREAD_V" value="(0.03, 0.03)cm" />
-->

<!-- RF Signal needs event time window defined by LUMI_EVENT -->
<!-- Reference position set as target shift below -->
<option name="RFSETUP" value="clas12_ccdb" />
<option name="RFSTART" value="eventVertex, 0, 0, -30.0" />

<option name="PRINT_EVENT" value="1" />

Expand Down
5 changes: 3 additions & 2 deletions gemc/dev/rga_fall2018.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="rga_fall2018_mc" />

<!-- Do not track staff after the apex -->
<!-- Do not track staff after the downstream shielding -->
<option name="MAX_Z_POS" value="9000"/>

<!-- Time window defined by LUMI_EVENT -->
Expand All @@ -98,7 +98,8 @@

<!-- production threshold for passive volumes -->
<!-- beamline shielding: 2cm-->
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, main-cone, adjuster1, adjuster2, adjuster3, 20" />
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, adjuster1, adjuster2, adjuster3, Apex_Shield_Lead_Fill, Apex_Shield_PCAL_Hub, Downstream_Beam_tube_Segment_1, Downstream_Beam_tube_Segment_2, Torus_Beam_Tube_Reducer_2, Torus_Exit_Shield_Casing, Torus_Exit_Shield_Lead_Fill, 20"/>




Expand Down
5 changes: 3 additions & 2 deletions gemc/dev/rga_fall2018_target_at_m3.5.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="rga_fall2018_mc" />

<!-- Do not track staff after the apex -->
<!-- Do not track staff after the downstream shielding -->
<option name="MAX_Z_POS" value="9000"/>

<!-- Time window defined by LUMI_EVENT -->
Expand All @@ -98,7 +98,8 @@

<!-- production threshold for passive volumes -->
<!-- beamline shielding: 2cm-->
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, main-cone, adjuster1, adjuster2, adjuster3, 20" />
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, adjuster1, adjuster2, adjuster3, Apex_Shield_Lead_Fill, Apex_Shield_PCAL_Hub, Downstream_Beam_tube_Segment_1, Downstream_Beam_tube_Segment_2, Torus_Beam_Tube_Reducer_2, Torus_Exit_Shield_Casing, Torus_Exit_Shield_Lead_Fill, 20"/>




Expand Down
5 changes: 3 additions & 2 deletions gemc/dev/rga_spring2018.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="rga_spring2018_mc" />

<!-- Do not track staff after the apex -->
<!-- Do not track staff after the downstream shielding -->
<option name="MAX_Z_POS" value="9000"/>

<!-- Time window defined by LUMI_EVENT -->
Expand All @@ -98,7 +98,8 @@

<!-- production threshold for passive volumes -->
<!-- beamline shielding: 2cm-->
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, main-cone, adjuster1, adjuster2, adjuster3, 20" />
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, adjuster1, adjuster2, adjuster3, Apex_Shield_Lead_Fill, Apex_Shield_PCAL_Hub, Downstream_Beam_tube_Segment_1, Downstream_Beam_tube_Segment_2, Torus_Beam_Tube_Reducer_2, Torus_Exit_Shield_Casing, Torus_Exit_Shield_Lead_Fill, 20"/>




Expand Down
5 changes: 3 additions & 2 deletions gemc/dev/rga_spring2019.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="rga_spring2019_mc" />

<!-- Do not track staff after the apex -->
<!-- Do not track staff after the downstream shielding -->
<option name="MAX_Z_POS" value="9000"/>

<!-- Time window defined by LUMI_EVENT -->
Expand All @@ -98,7 +98,8 @@

<!-- production threshold for passive volumes -->
<!-- beamline shielding: 2cm-->
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, main-cone, adjuster1, adjuster2, adjuster3, 20" />
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, adjuster1, adjuster2, adjuster3, Apex_Shield_Lead_Fill, Apex_Shield_PCAL_Hub, Downstream_Beam_tube_Segment_1, Downstream_Beam_tube_Segment_2, Torus_Beam_Tube_Reducer_2, Torus_Exit_Shield_Casing, Torus_Exit_Shield_Lead_Fill, 20"/>




Expand Down
5 changes: 3 additions & 2 deletions gemc/dev/rgb_fall2019.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="rgb_fall2019_mc" />

<!-- Do not track staff after the apex -->
<!-- Do not track staff after the downstream shielding -->
<option name="MAX_Z_POS" value="9000"/>

<!-- Time window defined by LUMI_EVENT -->
Expand All @@ -98,7 +98,8 @@

<!-- production threshold for passive volumes -->
<!-- beamline shielding: 2cm-->
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, main-cone, adjuster1, adjuster2, adjuster3, 20" />
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, adjuster1, adjuster2, adjuster3, Apex_Shield_Lead_Fill, Apex_Shield_PCAL_Hub, Downstream_Beam_tube_Segment_1, Downstream_Beam_tube_Segment_2, Torus_Beam_Tube_Reducer_2, Torus_Exit_Shield_Casing, Torus_Exit_Shield_Lead_Fill, 20"/>




Expand Down
5 changes: 3 additions & 2 deletions gemc/dev/rgb_spring2019.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="rgb_spring2019_mc" />

<!-- Do not track staff after the apex -->
<!-- Do not track staff after the downstream shielding -->
<option name="MAX_Z_POS" value="9000"/>

<!-- Time window defined by LUMI_EVENT -->
Expand All @@ -98,7 +98,8 @@

<!-- production threshold for passive volumes -->
<!-- beamline shielding: 2cm-->
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, main-cone, adjuster1, adjuster2, adjuster3, 20" />
<option name="PRODUCTIONCUTFORVOLUMES" value="innerShieldAndFlange, outerFlange, outerMount, nut1, nut2, nut3, nut4, nut5, nut6, nut7, nut8, nut9, taggerInnerShield, main-cone, adjuster1, adjuster2, adjuster3, Apex_Shield_Lead_Fill, Apex_Shield_PCAL_Hub, Downstream_Beam_tube_Segment_1, Downstream_Beam_tube_Segment_2, Torus_Beam_Tube_Reducer_2, Torus_Exit_Shield_Casing, Torus_Exit_Shield_Lead_Fill, 20"/>




Expand Down
2 changes: 1 addition & 1 deletion gemc/dev/rgc_fall2022.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="rgc_summer2022_mc" />

<!-- Do not track staff after the apex -->
<!-- Do not track staff after the downstream shielding -->
<option name="MAX_Z_POS" value="9000"/>

<!-- Time window defined by LUMI_EVENT -->
Expand Down
2 changes: 1 addition & 1 deletion gemc/dev/rgc_summer2022.gcard
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<option name="RUNNO" value="11" />
<option name="DIGITIZATION_VARIATION" value="rgc_summer2022_mc" />

<!-- Do not track staff after the apex -->
<!-- Do not track staff after the downstream shielding -->
<option name="MAX_Z_POS" value="9000"/>

<!-- Time window defined by LUMI_EVENT -->
Expand Down
1 change: 1 addition & 0 deletions gemc/dev/rge_spring2024_LD2-Al-liq.gcard
Loading
Loading