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

1.3.1: remove PS and brem #2

Merged
merged 1 commit into from
May 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions heptfds/cms_pf/qcd.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
_CITATION = """
"""

PADDED_NUM_ELEM_SIZE = 12000
PADDED_NUM_ELEM_SIZE = 6400

class CmsPfQcd(tfds.core.GeneratorBasedBuilder):
"""DatasetBuilder for cms_pf dataset."""

VERSION = tfds.core.Version("1.3.0")
VERSION = tfds.core.Version("1.3.1")
RELEASE_NOTES = {
"1.3.0": "12_2_0_pre2 generation with updated caloparticle/trackingparticle",
"1.3.1": "Remove PS again"
}
MANUAL_DOWNLOAD_INSTRUCTIONS = """
FIXME
Expand Down
5 changes: 3 additions & 2 deletions heptfds/cms_pf/ttbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@
_CITATION = """
"""

PADDED_NUM_ELEM_SIZE = 12000
PADDED_NUM_ELEM_SIZE = 6400

class CmsPfTtbar(tfds.core.GeneratorBasedBuilder):
"""DatasetBuilder for cms_pf dataset."""

VERSION = tfds.core.Version("1.3.0")
VERSION = tfds.core.Version("1.3.1")
RELEASE_NOTES = {
"1.0.0": "Initial release.",
"1.1.0": "Add muon type, fix electron GSF association",
"1.2.0": "12_1_0_pre3 generation, add corrected energy, cluster flags, 20k events",
"1.3.0": "12_2_0_pre2 generation with updated caloparticle/trackingparticle",
"1.3.1": "Remove PS again"
}
MANUAL_DOWNLOAD_INSTRUCTIONS = """
mkdir -p data
Expand Down
8 changes: 3 additions & 5 deletions heptfds/cms_pf/ztt.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@
_CITATION = """
"""

PADDED_NUM_ELEM_SIZE = 12000
PADDED_NUM_ELEM_SIZE = 6400

class CmsPfZtt(tfds.core.GeneratorBasedBuilder):
"""DatasetBuilder for cms_pf dataset."""

VERSION = tfds.core.Version("1.3.0")
VERSION = tfds.core.Version("1.3.1")
RELEASE_NOTES = {
"1.0.0": "Initial release.",
"1.1.0": "Add muon type, fix electron GSF association",
"1.2.0": "12_1_0_pre3 generation, add corrected energy, cluster flags, 20k events",
"1.3.0": "12_2_0_pre2 generation with updated caloparticle/trackingparticle",
"1.3.1": "Remove PS again"
}
MANUAL_DOWNLOAD_INSTRUCTIONS = """
mkdir -p data
Expand Down
10 changes: 5 additions & 5 deletions heptfds/cms_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ def prepare_data_cms(fn, padded_num_elem_size):
ygen = event["ygen"]
ycand = event["ycand"]

# remove PS from inputs, they don't seem to be very useful
#msk_ps = (Xelem["typ"] == 2) | (Xelem["typ"] == 3)
# remove PS and BREM from inputs
msk_ps = (Xelem["typ"] == 2) | (Xelem["typ"] == 3) | (Xelem["typ"] == 7)

Xelem = Xelem
ygen = ygen
ycand = ycand
Xelem = Xelem[~msk_ps]
ygen = ygen[~msk_ps]
ycand = ycand[~msk_ps]

Xelem = append_fields(
Xelem, "typ_idx", np.array([ELEM_LABELS_CMS.index(int(i)) for i in Xelem["typ"]], dtype=np.float32)
Expand Down