Skip to content

Commit

Permalink
feat : suggestions from Annika
Browse files Browse the repository at this point in the history 
- runner: modify memory, disk usages adapt parsl/dask interfaces
- plot: fixing error band
- doc: minor updates on choices of campaign
- data/utils: implemented low pT muon corrections, remove fill_none
- env: change to <3.11 for python version, add line for test_env.yml
- workflows: fix bug for reading SFs, put HLT flag for triggered lepton
- utils: add flag for triggered leptons
  • Loading branch information
@Ming-Yan
Ming-Yan committed Feb 15, 2023
1 parent 0cfa32d commit 7acc04d
Show file tree
Hide file tree
Showing 27 changed files with 5,580 additions and 129 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,20 @@ More options for `runner.py`
(default: dummy_samples.json)
--year YEAR Year
--campaign CAMPAIGN Dataset campaign, change the corresponding correction
files
files{ "Rereco17_94X","Winter22Run3","2018_UL","2017_UL","2016preVFP_UL","2016postVFP_UL"}
--isCorr Run with SFs
--isJERC JER/JEC implemented to jet
--isSyst Run with systematics for SF
--executor {iterative,futures,parsl/slurm,parsl/condor,parsl/condor/naf_lite,dask/condor,dask/slurm,dask/lpc,dask/lxplus,dask/casa}
The type of executor to use (default: futures).
-j WORKERS, --workers WORKERS
Number of workers (cores/threads) to use for multi- worker executors (e.g. futures or condor) (default:
12)
3)
-s SCALEOUT, --scaleout SCALEOUT
Number of nodes to scale out to if using slurm/condor.
Total number of concurrent threads is ``workers x
scaleout`` (default: 6)
--memory MEMORY Memory used in jobs ``(default: 4GB)
--memory MEMORY Memory used in jobs (in GB) ``(default: 4GB)
--disk DISK Disk used in jobs ``(default: 4GB)
--voms VOMS Path to voms proxy, made accessible to worker nodes.
By default a copy will be made to $HOME.
Expand Down
4 changes: 2 additions & 2 deletions plotting/plotdataMC.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@
)
hmc = collated["mc"][discr][SF_axis]
ax.stairs(
values=hmc.values() + np.sqrt(hmc.values()),
baseline=hmc.values() - np.sqrt(hmc.values()),
values=hmc.values() + np.sqrt(hmc.variance()),
baseline=hmc.values() - np.sqrt(hmc.variance()),
edges=hmc.axes[0].edges,
label="Stat. unc.",
**errband_opts,
Expand Down
17 changes: 9 additions & 8 deletions runner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def get_main_parser():
"-j",
"--workers",
type=int,
default=12,
default=3,
help="Number of workers (cores/threads) to use for multi-worker executors "
"(e.g. futures or condor) (default: %(default)s)",
)
Expand All @@ -135,14 +135,14 @@ def get_main_parser():
)
parser.add_argument(
"--memory",
type=int,
default=4,
type=float,
default=4.0,
help="Memory used in jobs default ``(default: %(default)s)",
)
parser.add_argument(
"--disk",
type=str,
default="4GB",
type=float,
default=4,
help="Disk used in jobs default ``(default: %(default)s)",
)
parser.add_argument(
Expand Down Expand Up @@ -624,16 +624,17 @@ def get_main_parser():
queue="all",
cores=args.workers,
processes=args.scaleout,
memory=args.memory,
memory=f"{args.memory}GB",
disk=f"{args.disk}GB",
retries=args.retries,
walltime="00:30:00",
job_script_prologue=job_script_prologue,
)
elif "condor" in args.executor:
cluster = HTCondorCluster(
cores=args.workers,
memory=args.memory,
disk=args.disk,
memory=f"{args.memory}GB",
disk=f"{args.disk}GB",
job_script_prologue=job_script_prologue,
)

Expand Down
4 changes: 1 addition & 3 deletions setup.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ classifiers =
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Expand All @@ -40,7 +38,7 @@ install_requires =
coffea>=0.7.20


python_requires = <=3.10
python_requires = <3.11
include_package_data = True
scripts =
plotting/plotdataMC.py
Expand Down
270 changes: 270 additions & 0 deletions ...LSF/2016postVFP_UL/Efficiency_muon_generalTracks_Run2016postVFP_UL_trackerMuon.histo.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
{
"NUM_TrackerMuons_DEN_genTracks": {
"abseta_pt": {
"abseta:[1.20,2.10]": {
"pt:[8.00,10.00]": {
"value": 0.9842686913959845,
"error": 0.02963206541364877
},
"pt:[3.50,3.75]": {
"value": 1.0046655328938918,
"error": 0.02864192874252308
},
"pt:[2.50,2.75]": {
"value": 1,
"error": 0
},
"pt:[4.00,4.50]": {
"value": 0.961200145010141,
"error": 0.055150870895074325
},
"pt:[5.00,6.00]": {
"value": 1.0028236667446566,
"error": 0.025221824327802383
},
"pt:[4.50,5.00]": {
"value": 1.0035208543548175,
"error": 0.019031208868073586
},
"pt:[10.00,15.00]": {
"value": 1.0045166286019926,
"error": 0.03544277198028373
},
"pt:[2.75,3.00]": {
"value": 1,
"error": 0
},
"pt:[3.25,3.50]": {
"value": 0.9455725240692203,
"error": 0.09051123511181855
},
"pt:[15.00,20.00]": {
"value": 1.003137641796382,
"error": 0.15525653333299372
},
"pt:[2.00,2.50]": {
"value": 1,
"error": 0
},
"pt:[3.00,3.25]": {
"value": 1,
"error": 0
},
"pt:[6.00,8.00]": {
"value": 1.002243448904213,
"error": 0.014635809729241167
},
"pt:[3.75,4.00]": {
"value": 0.9912556590431282,
"error": 0.0363592687939075
},
"pt:[30.00,40.00]": {
"value": 1,
"error": 0
},
"pt:[20.00,30.00]": {
"value": 1.0023685314073512,
"error": 0.22172800213337931
}
},
"abseta:[2.10,2.40]": {
"pt:[8.00,10.00]": {
"value": 1.000224534964638,
"error": 0.6633788139988811
},
"pt:[3.50,3.75]": {
"value": 1.0013997659539167,
"error": 0.2657935339218712
},
"pt:[2.50,2.75]": {
"value": 1.0015080593564991,
"error": 0.17132524711841202
},
"pt:[4.00,4.50]": {
"value": 1.000494083914997,
"error": 0.18919255742002172
},
"pt:[5.00,6.00]": {
"value": 1.000262108470239,
"error": 0.23226375875167213
},
"pt:[4.50,5.00]": {
"value": 1.0011590620754274,
"error": 0.460722385338737
},
"pt:[10.00,15.00]": {
"value": 1,
"error": 0
},
"pt:[2.75,3.00]": {
"value": 1.0020953201750005,
"error": 0.29593485479273796
},
"pt:[3.25,3.50]": {
"value": 1.0014976086683698,
"error": 0.26567944661749526
},
"pt:[15.00,20.00]": {
"value": 1,
"error": 0
},
"pt:[2.00,2.50]": {
"value": 1.003101641969965,
"error": 0.155266232580708
},
"pt:[3.00,3.25]": {
"value": 1.0010844193841386,
"error": 0.20667774660664287
},
"pt:[6.00,8.00]": {
"value": 1.0004848395299055,
"error": 0.1689451220387189
},
"pt:[3.75,4.00]": {
"value": 1.0015739076237173,
"error": 0.525138116826038
},
"pt:[30.00,40.00]": {
"value": 1,
"error": 0
},
"pt:[20.00,30.00]": {
"value": 1,
"error": 0
}
},
"abseta:[0.90,1.20]": {
"pt:[8.00,10.00]": {
"value": 1.0062041003034161,
"error": 0.04354210261098553
},
"pt:[3.50,3.75]": {
"value": 0.6185253969882053,
"error": 0.39036338589005803
},
"pt:[2.50,2.75]": {
"value": 1,
"error": 0
},
"pt:[4.00,4.50]": {
"value": 1.0161847682127974,
"error": 0.028105655473672015
},
"pt:[5.00,6.00]": {
"value": 1.009897339326928,
"error": 0.050554803273603434
},
"pt:[4.50,5.00]": {
"value": 0.9310484767223539,
"error": 0.08390231200549203
},
"pt:[10.00,15.00]": {
"value": 1.0099097794293355,
"error": 0.08274636810319634
},
"pt:[2.75,3.00]": {
"value": 1,
"error": 0
},
"pt:[3.25,3.50]": {
"value": 1,
"error": 0
},
"pt:[15.00,20.00]": {
"value": 1.0065290007296392,
"error": 0.11675884430113558
},
"pt:[2.00,2.50]": {
"value": 1,
"error": 0
},
"pt:[3.00,3.25]": {
"value": 1,
"error": 0
},
"pt:[6.00,8.00]": {
"value": 1.007027508403878,
"error": 0.0225683236529397
},
"pt:[3.75,4.00]": {
"value": 0.9469166415007371,
"error": 0.11251015088000559
},
"pt:[30.00,40.00]": {
"value": 1,
"error": 0
},
"pt:[20.00,30.00]": {
"value": 1.0047119930493842,
"error": 0.3106718678533123
}
},
"abseta:[0.00,0.90]": {
"pt:[8.00,10.00]": {
"value": 1.006647891756716,
"error": 0.005118321475476306
},
"pt:[3.50,3.75]": {
"value": 1.038536665892633,
"error": 0.07291130380959449
},
"pt:[2.50,2.75]": {
"value": 1,
"error": 0
},
"pt:[4.00,4.50]": {
"value": 1.0064396337144235,
"error": 0.027612782734366327
},
"pt:[5.00,6.00]": {
"value": 0.9886617311126424,
"error": 0.01953658650444682
},
"pt:[4.50,5.00]": {
"value": 0.9952610380311436,
"error": 0.025387667213245226
},
"pt:[10.00,15.00]": {
"value": 1.0066631686152465,
"error": 0.0045658616234896
},
"pt:[2.75,3.00]": {
"value": 1,
"error": 0
},
"pt:[3.25,3.50]": {
"value": 1.2735928307942586,
"error": 0.1126311262426685
},
"pt:[15.00,20.00]": {
"value": 1.0058808727351949,
"error": 0.013272066480558953
},
"pt:[2.00,2.50]": {
"value": 1,
"error": 0
},
"pt:[3.00,3.25]": {
"value": 1,
"error": 0
},
"pt:[6.00,8.00]": {
"value": 1.007158929005355,
"error": 0.005281123527064541
},
"pt:[3.75,4.00]": {
"value": 1.0179272663626346,
"error": 0.04505366672315038
},
"pt:[30.00,40.00]": {
"value": 1.0047417021410996,
"error": 1.0047432037198978
},
"pt:[20.00,30.00]": {
"value": 1.0058399541473997,
"error": 0.09548591195348576
}
}
}
}
}
Loading

0 comments on commit 7acc04d

Please sign in to comment.