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

Adding 2016 pre-VFP entries (v12) #21

Merged
merged 37 commits into from
Mar 11, 2024
Merged

Adding 2016 pre-VFP entries (v12) #21

merged 37 commits into from
Mar 11, 2024

Conversation

aalvesan
Copy link
Contributor

Adding the campaign run2_2016_HIPM_uhh_v12. Includes all cmsdb entries for data, signal and background for 2016 nanoAOD datasets, at version 12, and for pre-VFP era.

@aalvesan aalvesan self-assigned this Jan 15, 2024
@aalvesan aalvesan requested a review from riga January 15, 2024 16:19
@aalvesan aalvesan requested a review from pkausw January 23, 2024 10:05
Copy link
Contributor

@pkausw pkausw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @aalvesan , thanks for this massive amount of work! All in all, it looks in good shape 👍 I have some small requests:

  • there are typos here and there in the different files. I did my best to check everything carefully, but can you also have another look?
  • I think the imports in the different files point to the 2017 campaign, please correct this
  • There seems to be an issue with datasets that are present twice. Might be connected to extenstions of datasets, which logically should belong to the dataset w/o the ext tag
  • Can you also solve the linting errors on your branch?

I'm also tagging @dsavoiu here, because I know he also put some thought and work into the naming scheme of processes and datasets. Maybe he'll have additional comments

cmsdb/campaigns/run2_2016_HIPM_uhh_v12/DY.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/MultiBoson.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/MultiBoson.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/Signals.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/Signals.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/__init__.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/hh2bbtautau.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/hh2bbtautau.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/hh2bbtautau.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/hh2bbtautau.py Outdated Show resolved Hide resolved
@aalvesan aalvesan requested review from pkausw and removed request for riga January 25, 2024 11:45
@riga
Copy link
Member

riga commented Jan 29, 2024

This looks great @aalvesan 🎉
Could you add an entry to https://github.com/uhh-cms/cmsdb/blob/master/.github/workflows/lint_and_test.yaml#L61 so that the new campaign is covered by CI?

@riga riga self-requested a review January 29, 2024 14:25
Copy link
Member

@dsavoiu dsavoiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @aalvesan, thanks for adding this campaign! And thanks @pkausw for the ping ;)

I only noticed some minor things (naming conventions, typos), but maybe you could have a look and make changes where necessary?

Also, in general, I think it would be good to only use lowercase or "snake-case" for filenames in cmsdb, so instead of MultiBoson.py, could you use multi_boson.py or similar? Same for one-letter filenames (Z.py -> z.py, etc.)

Actually, I think in general in the other campaigns we collected the Drell-Yan, Multiboson, Z and W background samples in one electroweak file ewk.py. Unless we have a good reason for the separation, I would propose to rename or merge following files into one:

  • DY.py, MultiBoson.py, W.py, Z.py -> ewk.py
  • SingleHiggs.py -> higgs.py
  • SingleTop.py -> st.py

cmsdb/campaigns/run2_2016_HIPM_uhh_v12/MultiBoson.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/MultiBoson.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/MultiBoson.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/W.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/DY.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/__init__.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/__init__.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/__init__.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/data.py Outdated Show resolved Hide resolved
cmsdb/campaigns/run2_2016_HIPM_uhh_v12/data.py Outdated Show resolved Hide resolved
@aalvesan aalvesan requested a review from dsavoiu February 1, 2024 10:19
Copy link
Member

@dsavoiu dsavoiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @aalvesan, thanks for implementing the changes! Everything looks fine now, I just noticed a few minor things that should be easy to fix (see below).

@aalvesan
Copy link
Contributor Author

Hi @aalvesan, thanks for implementing the changes! Everything looks fine now, I just noticed a few minor things that should be easy to fix (see below).

Hi Daniel, thanks again for the review! I think I just removed all .pyc files. Let me know if there is something else that needs to be fixed :)

Cheers,
Ana

@dsavoiu
Copy link
Member

dsavoiu commented Feb 22, 2024

Hi @aalvesan, sorry for the delay in reviewing this. I actually noticed that I had overlooked some things in the initial review and also that the tests were failing due to some typos in the imports and missing processes. I took the liberty of committing a series of changes to fix these issues, so this should in principle now be ready to merge.

But @aalvesan please check if the changes work for you and I would also ping @riga and @pkausw here in case they also want to look over the changes before the merge.

Conflicts:
	.github/workflows/lint_and_test.yaml
@dsavoiu
Copy link
Member

dsavoiu commented Mar 6, 2024

Hi @aalvesan, I fixed the conflicts with the master branch, which were due to the restructuring of unit tests introduced by #22. Did you manage to have a look at the latest changes? If there are no further things to do we could go ahead and merge this soon.

Copy link
Member

@riga riga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@riga riga merged commit 7999c91 into master Mar 11, 2024
24 checks passed
@riga riga deleted the Run2_2016_HIMP_uhh_v12 branch March 11, 2024 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants