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.

Sign up for GitHub

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

Jump to bottom

Ch update histeft #431

Merged
merged 72 commits into from
Dec 20, 2024
Merged

Ch update histeft #431

merged 72 commits into from
Dec 20, 2024

Conversation

jlawrenc
Copy link
Contributor

This change modifies the topeft_run2 analysis processor and supporting scripts. The key change in the channel definitions are moved to a json as a common source for the scripts to draw upon. It also includes two new run modes the onZ/offZ channels and tau channels. The TOP-22-006 run mode has been fully validated to the data and asimov limits. The tau and onZ/offZ run modes are still undergoing final validation

anpicci and others added 25 commits June 6, 2024 12:24
@anpicci
aligining ch_update to master
d06d7ef
@anpicci
first implementation of parsing selections defining a SR - only tried…
09d07ae 
… with 2lss_p
@anpicci @jlawrenc
Uploading latest Tau SF functions
bfeb3b8
@anpicci @bryates @jlawrenc
Update topeft/modules/corrections.py
525e57d 
Co-authored-by: Brent R. Yates <[email protected]>
@anpicci @jlawrenc
Addressing lint errors
98d68e9
@anpicci @jlawrenc
Addressing lint issues
b56cd5b
@bryates @jlawrenc
Pin setuptools
3abbde7
@bryates @jlawrenc
Checkout pin-setuptools on TopCoffea
a3119fb
@bryates @jlawrenc
Back to topcoffea main
ef087c5
@anpicci
Modifying the code according to the results from the CI tests
36bc629
adapt datacards_post_processing.py to ch_lst.json
179fe5f
@jlawrenc
Merge branch 'ch_update_histeft' of github.com:TopEFT/topeft into ch_…
4648e99 
…update_histeft
@jlawrenc
Update ch_lst json
5dcb941
@anpicci
testing
9b4beaa
@anpicci
Updates for CRs in processor and json, replacing deepthought with hac…
e7c0536 
…tar01
@anpicci
Fixing some bugs in the analysis_processor
0e07153
@anpicci
fixing channel json
e9f2853
@anpicci
fixing channel json
2469d7e
@anpicci
Updated and working versions
ac5ca64
update ch_lst_test.json with 3loffZ split
1599a64
turn off 3loffZ split
7626c85
@jlawrenc
Add tau channels
afbcefc
update datacards_post_processing.py script for ch_lst_test.json
fca1433
@jlawrenc
Change tau channels
337efad
@jlawrenc
Add taus to datacards_post_processing
11a37e8
@bryates
Copy link
Contributor

bryates commented Sep 19, 2024

Thanks @jlawrenc. Is this branch in sync with the latest master updates? I see some merge conflicts.

@jlawrenc
Copy link
Contributor Author

It does appear there are a couple merge conflicts we were unaware of. It looks like they are due to some recent tau changes so I will resolve them before a merge

bryates
bryates reviewed Sep 19, 2024
View reviewed changes
analysis/topeft_run2/analysis_processor.py Outdated Show resolved Hide resolved
analysis/topeft_run2/analysis_processor.py Outdated Show resolved Hide resolved
analysis/topeft_run2/analysis_processor.py Outdated Show resolved Hide resolved
analysis/topeft_run2/analysis_processor.py Outdated Show resolved Hide resolved
analysis/topeft_run2/analysis_processor.py Outdated Show resolved Hide resolved
analysis/topeft_run2/analysis_processor.py Outdated Show resolved Hide resolved
analysis/topeft_run2/analysis_processor.py Outdated Show resolved Hide resolved
topeft/modules/object_selection.py Outdated Show resolved Hide resolved
topeft/modules/object_selection.py Outdated Show resolved Hide resolved
analysis/topeft_run2/datacards_post_processing.py Outdated Show resolved Hide resolved
@bryates
Copy link
Contributor

bryates commented Dec 19, 2024

@jlawrenc @ywan2 @bryates I have resolved the conflicts between master and this branch

It looks like that introduced a lot if lint errors and the processor fails.

@bryates
Copy link
Contributor

bryates commented Dec 19, 2024

@jlawrenc @ywan2 @bryates I have resolved the conflicts between master and this branch

It looks like that introduced a lot if lint errors and the processor fails.

ModuleNotFoundError: No module named 'topcoffea.modules.CorrectedJetsFactory'

I'm thinking the TopCoffea branch checkout was overwritten when the master branch was merged in.

@bryates bryates requested review from sscruz and Andrew42 December 19, 2024 13:50
bryates
bryates requested changes Dec 19, 2024
View reviewed changes
Copy link
Contributor

@bryates bryates left a comment

Choose a reason for hiding this comment

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

Let's get the CI working, and address the remaining open comments (or make issues for them).

@anpicci
Copy link
Collaborator

anpicci commented Dec 19, 2024

@bryates now everything should be addressed from my side, @jlawrenc and @ywan2 are going to cross-check your comments. Thanks!

@ywan2
Copy link
Contributor

ywan2 commented Dec 20, 2024

There were some lines accidentally deleted for the scalings selection, I added it back. This branch should be ready to merge.
For fwd analysis, 2lss and 2lssfwd are binned by lt, whereas 2lss_4t is still lj0pt. The limits are similar versus if we change 2lss_4t to lt mining, but let me know if there are objections. For 3loffZ analysis, I am still working on investigation on the 3loffZ fake factor statstics, but there are no issue with the fits. We can leave the discussion after break.

@bryates
Copy link
Contributor

bryates commented Dec 20, 2024

There were some lines accidentally deleted for the scalings selection, I added it back. This branch should be ready to merge. For fwd analysis, 2lss and 2lssfwd are binned by lt, whereas 2lss_4t is still lj0pt. The limits are similar versus if we change 2lss_4t to lt mining, but let me know if there are objections. For 3loffZ analysis, I am still working on investigation on the 3loffZ fake factor statstics, but there are no issue with the fits. We can leave the discussion after break.

Great, thanks for fixing everything @ywan2 ! It looks like there are a few merge conflicts with the master branch related to the cfg files. Once those are fixed we should be able to merge.

anpicci and others added 3 commits December 20, 2024 11:59
@anpicci
fixing 3l-offZ bug
c844e18
@anpicci @anehnis
New jsons for including extensions in the same jsons as the original …
7471d51 
…sample, and updated (#449)

* Adding json and  cfg files.

* Run3 processor and event selection

* Topeft/modules update

* Temporary commit

* unit SFs for Run3

* some tweaking

* another temp commit

* Fixed issues in analysis processor for plain Run3

* Fixed issues in analysis processor for plain Run3

* JME Run3

* Fixing dataset definition for data in analysis_processor

* First pkl file version

* Adapting SFs to Run3

* Fixing dataset definition for data in analysis_processor

* Fixing uncommented line

* Stable Run2 + Run3 flow with systematics (when available)

* Fixing uncommented line

* Fixing uncommented line

* Adapting corrections to the new JECStack

* Merging with master

* Minor fixes

* Minor fixes for pylint

* Minor fixes for pylint

* Minor fixes for pylint

* Optimizing JME corrections

* fixing pylint errors

* Addressing Brent's comments

* Fixing pyling comments

* Fixing pyling comments

* Fixing pyling comments

* Implementing Brent's comments

* fixing pylint errors

* Fixing AttachElectronSF

* Updates for plotting with make_cr_and_sr_plots.py

* Updated jsons, summed over ext files

* Working make_cr_and_sr_plots.py update

* Realigning plotter script to Brent's version

* Realigning plotter script to Brent's version

* Updating redirector

* fixing ttbar 2QLNu sample

* fixing Run3 cfgs

* Script to check that all the files listed in the jsons are reachable

* modified files, according to what is present

* modified files, according to what is present

---------

Co-authored-by: Amanda Ehnis <[email protected]>
@anpicci
reverting some temporary additions
7afa64a
bryates
bryates reviewed Dec 20, 2024
View reviewed changes
analysis/topeft_run2/analysis_processor.py Outdated Show resolved Hide resolved
environment.yml Outdated Show resolved Hide resolved
@bryates
Copy link
Contributor

bryates commented Dec 20, 2024

@anpicci can you fix the new lint errors?

@bryates bryates self-requested a review December 20, 2024 17:13
@bryates bryates merged commit faa85f6 into master Dec 20, 2024
4 checks passed
@bryates bryates deleted the ch_update_histeft branch December 20, 2024 19:50
@anpicci anpicci restored the ch_update_histeft branch December 21, 2024 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anpicci anpicci anpicci left review comments

@bryates bryates bryates approved these changes

@sscruz sscruz Awaiting requested review from sscruz

@Andrew42 Andrew42 Awaiting requested review from Andrew42

Assignees

@jlawrenc jlawrenc

@anpicci anpicci

@ywan2 ywan2

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jlawrenc @bryates @anpicci @ywan2