-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated default and backup STT geometry for SAND added. (#34)
* Updated default and backup STT geometry for SAND added. * Address prod related questions. Removed commented lines. * Adapted to the Makefile format * Minor changes to indentation style in Makefile and Changelog.md * Some more indentation fix in Makefile * Changes to Changelog.md --------- Co-authored-by: Nibir Talukdar <[email protected]> Co-authored-by: Nibir Talukdar <[email protected]>
- Loading branch information
3 people
authored
Dec 10, 2024
1 parent
fc29996
commit 7ed6d8a
Showing
9 changed files
with
1,343 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [SANDINNERVOLUME] | ||
| class = duneggd.SubDetector.SandInnerVolume.SandInnerVolumeBuilder | ||
| subbuilders = ['GRAIN', 'STT_Backup'] | ||
| halfDimension = {'rmin':Q('0.0cm'), 'rmax':Q('2.00m'), 'dz':Q('1.69m')} | ||
| Material = "Air35C" | ||
| nBarrelModules = 24 | ||
| configuration = "option_4" | ||
| GRAINThickness = Q("0.902m") | ||
|
|
||
| clearenceECALGRAIN = Q("1.15cm") | ||
| clearenceGRAINTracker = Q("1cm") | ||
| clearenceTrackerECAL = Q("6.8cm") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [SANDINNERVOLUME] | ||
| class = duneggd.SubDetector.SandInnerVolume.SandInnerVolumeBuilder | ||
| subbuilders = ['GRAIN', 'STT_Default'] | ||
| halfDimension = {'rmin':Q('0.0cm'), 'rmax':Q('2.00m'), 'dz':Q('1.69m')} | ||
| Material = "Air35C" | ||
| nBarrelModules = 24 | ||
| configuration = "option_4" | ||
| GRAINThickness = Q("0.902m") | ||
|
|
||
| clearenceECALGRAIN = Q("1.15cm") | ||
| clearenceGRAINTracker = Q("1cm") | ||
| clearenceTrackerECAL = Q("6.8cm") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| [STT_Backup] | ||
|
|
||
| #**********************************| SAND inner vol |******************************************** | ||
|
|
||
| class = duneggd.SubDetector.STT_Backup.STTBuilder | ||
| STTconfiguration = "STT_Backup" | ||
| nBarrelModules = {SANDINNERVOLUME:nBarrelModules} | ||
| halfDimension = {SANDINNERVOLUME:halfDimension} | ||
| Material = {SANDINNERVOLUME:Material} | ||
| configuration = {SANDINNERVOLUME:configuration} | ||
| GRAINThickness = {SANDINNERVOLUME:GRAINThickness} | ||
| clearenceECALGRAIN = {SANDINNERVOLUME:clearenceECALGRAIN} | ||
| clearenceGRAINTracker = {SANDINNERVOLUME:clearenceGRAINTracker} # this should be read from SANDINNERVOLUME | ||
| clearenceTrackerECAL = {SANDINNERVOLUME:clearenceTrackerECAL} # the same | ||
|
|
||
| #**********************************| STT tracker |******************************************** | ||
|
|
||
| nofUpstreamTrkMod = 1 | ||
| nofDownstreamTrkMod = 6 | ||
| nofC3H6ModAfterCMod = 6 | ||
| nofC3H6ModNoRadAfterCMod = 3 | ||
|
|
||
| #**********************************| STT MODULE |******************************************** | ||
|
|
||
| # target | ||
| FrameThickness = Q("10cm") | ||
| AddGapForSlab = Q("7cm") | ||
| targetThickness = {"CMod" : Q("4mm"), "C3H6Mod": Q("5mm"), "C3H6ModNoRad": Q("5mm"), "TrkMod":Q("0mm"), "TrkMod2lyr":Q("0mm")} | ||
|
|
||
| # radiator | ||
| radiator = "yes" # "yes" or "no | ||
| nofFoils = 105 if radiator=="yes" else 0 | ||
| FoilThickness = Q("18um") if radiator=="yes" else Q("0um") | ||
| AirGapThickness = Q("117um") if radiator=="yes" else Q("0um") | ||
| RadiatorThickness = {"CMod" : Q("0mm"), "C3H6Mod": nofFoils*FoilThickness + (nofFoils-1)*AirGapThickness, "C3H6ModNoRad":Q("0mm"), "TrkMod":Q("0mm"), "TrkMod2lyr":Q("0mm")} | ||
| # straw planes | ||
| nofStrawPlanes = {"CMod" : 2, "C3H6Mod": 2, "C3H6ModNoRad": 2, "TrkMod": 3, "TrkMod2lyr": 2} | ||
| gap = {"CMod" : Q("4.67mm"), "C3H6Mod": Q("0mm"), "C3H6ModNoRad": Q("4.17mm"), "TrkMod":Q("4.67mm"), "TrkMod2lyr":Q("4.67mm")} | ||
|
|
||
| #**********************************| STRAW |******************************************** | ||
|
|
||
| StrawRadius = Q('2.5mm') | ||
| StrawPlug = Q('0mm') | ||
| DistStrawStraw = Q('0mm') | ||
| DistStrawWall = Q('0mm') | ||
| AngleStrawStraw = Q('60deg') | ||
| StrawWireRadius = Q('20um') | ||
| StrawWireCoatThickness = Q('20nm') | ||
| CoatThickness = Q("70nm") | ||
| MylarThickness = Q("12um") | ||
| StrawGas = {"CMod" : "stGas_Ar19", "C3H6Mod":"stGas_Xe19", "C3H6ModNoRad":"stGas_Ar19", "TrkMod":"stGas_Ar19", "TrkMod2lyr":"stGas_Ar19"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| [STT_Default] | ||
|
|
||
| #**********************************| SAND inner vol |******************************************** | ||
|
|
||
| class = duneggd.SubDetector.STT_Default.STTBuilder | ||
| STTconfiguration = "STT_Default" | ||
| nBarrelModules = {SANDINNERVOLUME:nBarrelModules} | ||
| halfDimension = {SANDINNERVOLUME:halfDimension} | ||
| Material = {SANDINNERVOLUME:Material} | ||
| configuration = {SANDINNERVOLUME:configuration} | ||
| GRAINThickness = {SANDINNERVOLUME:GRAINThickness} | ||
| clearenceECALGRAIN = {SANDINNERVOLUME:clearenceECALGRAIN} | ||
| clearenceGRAINTracker = {SANDINNERVOLUME:clearenceGRAINTracker} # this should be read from SANDINNERVOLUME | ||
| clearenceTrackerECAL = {SANDINNERVOLUME:clearenceTrackerECAL} # the same | ||
|
|
||
| #**********************************| STT tracker |******************************************** | ||
|
|
||
| nofUpstreamTrkMod = 1 | ||
| nofDownstreamTrkMod = 6 | ||
| nofC3H6ModAfterCMod = 6 | ||
| nofC3H6ModNoRadAfterCMod = 3 | ||
|
|
||
| #**********************************| STT MODULE |******************************************** | ||
|
|
||
| # target | ||
| FrameThickness = Q("10cm") | ||
| AddGapForSlab = Q("7cm") | ||
| targetThickness = {"CMod" : Q("4mm"), "C3H6Mod": Q("5mm"), "C3H6ModNoRad": Q("5mm"), "TrkMod":Q("0mm"), "TrkMod2lyr":Q("0mm")} | ||
|
|
||
| # radiator | ||
| radiator = "yes" # "yes" or "no | ||
| nofFoils = 105 if radiator=="yes" else 0 | ||
| FoilThickness = Q("18um") if radiator=="yes" else Q("0um") | ||
| AirGapThickness = Q("117um") if radiator=="yes" else Q("0um") | ||
| RadiatorThickness = {"CMod" : Q("0mm"), "C3H6Mod": nofFoils*FoilThickness + (nofFoils-1)*AirGapThickness, "C3H6ModNoRad":Q("0mm"), "TrkMod":Q("0mm"), "TrkMod2lyr":Q("0mm")} | ||
| # straw planes | ||
| nofStrawPlanes = {"CMod" : 2, "C3H6Mod": 2, "C3H6ModNoRad": 2, "TrkMod": 3, "TrkMod2lyr": 2} | ||
| gap = {"CMod" : Q("4.67mm"), "C3H6Mod": Q("0mm"), "C3H6ModNoRad": Q("4.17mm"), "TrkMod":Q("4.67mm"), "TrkMod2lyr":Q("4.67mm")} | ||
|
|
||
| #**********************************| STRAW |******************************************** | ||
|
|
||
| StrawRadius = Q('2.5mm') | ||
| StrawPlug = Q('0mm') | ||
| DistStrawStraw = Q('0mm') | ||
| DistStrawWall = Q('0mm') | ||
| AngleStrawStraw = Q('60deg') | ||
| StrawWireRadius = Q('20um') | ||
| StrawWireCoatThickness = Q('20nm') | ||
| CoatThickness = Q("70nm") | ||
| MylarThickness = Q("12um") | ||
| StrawGas = {"CMod" : "stGas_Ar19", "C3H6Mod":"stGas_Xe19", "C3H6ModNoRad":"stGas_Ar19", "TrkMod":"stGas_Ar19", "TrkMod2lyr":"stGas_Ar19"} |
Oops, something went wrong.