Skip to content

Commit 05885dc

Browse files
committed
CLDReco: add cms parameter and add possible beam spot sizes
1 parent cb1fb09 commit 05885dc

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

CLDConfig/CLDReconstruction.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
parser_group.add_argument("--outputBasename", help="Basename of the output file(s)", default="output")
3434
parser_group.add_argument("--trackingOnly", action="store_true", help="Run only track reconstruction", default=False)
3535
parser_group.add_argument("--enableLCFIJet", action="store_true", help="Enable LCFIPlus jet clustering parts", default=False)
36+
parser_group.add_argument("--cms", action="store", help="Choose a Centre-of-Mass energy", default=240, choices=(91, 160, 240, 365), type=int)
3637
parser_group.add_argument("--compactFile", help="Compact detector file to use", type=str, default=os.environ["K4GEO"] + "/FCCee/CLD/compact/CLD_o2_v07/CLD_o2_v07.xml")
3738
tracking_group = parser_group.add_mutually_exclusive_group()
3839
tracking_group.add_argument("--conformalTracking", action="store_true", default=True, help="Use conformal tracking pattern recognition")
@@ -75,10 +76,20 @@
7576
# we are making assumptions for reconstruction parameters based on the detector option, so we limit the possibilities
7677
raise RuntimeError("Too many XML files for the detector path, please only specify the main file!")
7778

79+
# from https://github.com/HEP-FCC/FCCeePhysicsPerformance/blob/d6ecee2c2c3ed5d76db55a3ae18ced349b2b914a/General/README.md?plain=1#L457-L467
80+
# for december 2022
81+
BEAM_SPOT_SIZES = { 91: (5.96e-3, 23.8e-6, 0.397),
82+
160: (14.7e-3, 46.5e-6, 0.97),
83+
240: (9.8e-3, 25.4e-6, 0.65),
84+
365: (27.3e-3, 48.8e-6, 1.33),
85+
}
86+
7887
sequenceLoader = SequenceLoader(
7988
algList,
8089
# global_vars can be used in sequence-loaded modules without explicit import
81-
global_vars={"CONFIG": CONFIG, "geoservice": geoservice, "reco_args": reco_args},
90+
global_vars={"CONFIG": CONFIG, "geoservice": geoservice, "reco_args": reco_args,
91+
"BEAM_SPOT_SIZES": BEAM_SPOT_SIZES,
92+
},
8293
)
8394

8495
if reco_args.inputFiles:

CLDConfig/HighLevelReco/JetAndVertex.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@
8787
VertexFinder.ProcessorType = "LcfiplusProcessor"
8888
VertexFinder.Parameters = {
8989
"Algorithms": ["PrimaryVertexFinder", "BuildUpVertex"],
90-
"BeamSizeX": ["38.2E-3"],
91-
"BeamSizeY": ["68E-6"],
92-
"BeamSizeZ": ["1.97"],
90+
"BeamSizeX": [str(BEAM_SPOT_SIZES[reco_args.cms][0])],
91+
"BeamSizeY": [str(BEAM_SPOT_SIZES[reco_args.cms][1])],
92+
"BeamSizeZ": [str(BEAM_SPOT_SIZES[reco_args.cms][2])],
9393
"BuildUpVertex.AVFTemperature": ["5.0"],
9494
"BuildUpVertex.AssocIPTracks": ["1"],
9595
"BuildUpVertex.AssocIPTracksChi2RatioSecToPri": ["2.0"],
@@ -141,9 +141,9 @@
141141
VertexFinderUnconstrained.ProcessorType = "LcfiplusProcessor"
142142
VertexFinderUnconstrained.Parameters = {
143143
"Algorithms": ["PrimaryVertexFinder", "BuildUpVertex"],
144-
"BeamSizeX": ["38.2E-3"],
145-
"BeamSizeY": ["68E-6"],
146-
"BeamSizeZ": ["1.97"],
144+
"BeamSizeX": [str(BEAM_SPOT_SIZES[reco_args.cms][0])],
145+
"BeamSizeY": [str(BEAM_SPOT_SIZES[reco_args.cms][1])],
146+
"BeamSizeZ": [str(BEAM_SPOT_SIZES[reco_args.cms][2])],
147147
"BuildUpVertex.AVFTemperature": ["5.0"],
148148
"BuildUpVertex.AssocIPTracks": ["1"],
149149
"BuildUpVertex.AssocIPTracksChi2RatioSecToPri": ["2.0"],

0 commit comments

Comments
 (0)