Closed jpata closed 7 years ago
Had to resolve conflicts with the isHttSubjet
stuff (following commits by @gkasieczka)
6226a88c6c3373ded164c9c004159c9b61128e7a
65156d04e6f8effae725645d9676a6889e15fb9a
eb48e8a0e76e55e2902d8548323857d8e4caa683
5f027f93ce859502849d54ef2822ef4c499a42d0
in JetReCalibrator.py
, I simply took the heppy version.
@arizzi can this be merged?
looking into it
I wonder if we should simply check out the heppy-side version of the JetReCalibrator
and not deal with these merge changes.
@gkasieczka @veelken can you comment? (i.e. is it ok for you if we just overwrite those changes in the merge with colin branch and then you reimplement on top if you still need?)
Yes, that works for me and should be the easiest.
@jpata ok, then please just fix the delat!=0 thing (if we agree on it)
I agree too.
done
mhh ... I merged but I see if delta!=0 is still there!
As discussed with @arizzi, https://github.com/cbernet/cmssw/pull/78 was left out of https://github.com/vhbb/cmssw/pull/572 so we pull it in here.