[RFC] Call nanoAOD_runMETfixEE2017() only if the modifiers are chosen

[makortel]

Originally from cms-sw#25587

The customizations

cmssw/PhysicsTools/NanoAOD/python/nano_cff.py

Lines 275 to 276 in 4fdeedc

	for modifier in run2_nanoAOD_94XMiniAODv1, run2_nanoAOD_94XMiniAODv2:
	modifier.toModify(process, nanoAOD_runMETfixEE2017(process,isData=True))

and

cmssw/PhysicsTools/NanoAOD/python/nano_cff.py

Lines 282 to 283 in 4fdeedc

	for modifier in run2_nanoAOD_94XMiniAODv1, run2_nanoAOD_94XMiniAODv2:
	modifier.toModify(process, nanoAOD_runMETfixEE2017(process,isData=False))

were introduced in cms-sw#25373. The code look like the intention was to call nanoAOD_runMETfixEE2017() only if run2_nanoAOD_94XMiniAODv1 or run2_nanoAOD_94XMiniAODv2 modifiers are turned on.

The actual behavior is, however, different. The lines 276 and 283 contain a call to nanoAOD_runMETfixEE2017() function (instead of a function "object" to be called by toModify()), so it is called regardless of the status of the two modifiers (and twice because of the loop). The function itself

cmssw/PhysicsTools/NanoAOD/python/nano_cff.py

Lines 236 to 241 in 4fdeedc

	def nanoAOD_runMETfixEE2017(process,isData):
	runMetCorAndUncFromMiniAOD(process,isData=isData,
	fixEE2017 = True,
	fixEE2017Params = {'userawPt': True, 'ptThreshold':50.0, 'minEtaThreshold':2.65, 'maxEtaThreshold': 3.139},
	postfix = "FixEE2017")
	process.nanoSequenceCommon.insert(process.nanoSequenceCommon.index(jetSequence),process.fullPatMetSequenceFixEE2017)

does not explicitly return anything, so the return value is None. The Modifier then interprets that

cmssw/FWCore/ParameterSet/python/Config.py

Line 1354 in 4fdeedc

def toModify(self,obj, func=None,**kw):

such that the func argument is None, and there are no keyword arguments, so it has nothing to do.

If my guess above on the intention is correct, this PR suggests to fix the behavior to the intended one.

Tested in 10_4_0.

[gpetruc-bot]

Automatic test started, see https://gitlab.cern.ch/cms-nanoAOD/nanoAOD-integration/pipelines/672679/builds

[gpetruc-bot]

Automatic test report for 672679

• gitlab pipeline at https://gitlab.cern.ch/cms-nanoAOD/nanoAOD-integration/pipelines/672679/builds
• outputs at https://cms-nanoaod-integration.web.cern.ch/integration/test_pr_287/

Code integration

Code checks not run for this PR (no source files modified)

Tests

• Long test data101X (10000 events): passed, no significant changes; dqm plots: all, diff
• Long test data80X (10000 events): passed, no significant changes; dqm plots: all, diff
• Long test data80Xhip (3000 events): passed, no significant changes; dqm plots: all, diff
• Long test data94X (10000 events): passed, no significant changes; dqm plots: all, diff
• Long test data94X2016 (10000 events): passed, no significant changes; dqm plots: all, diff
• Long test data94Xv2 (10000 events): passed, no significant changes; dqm plots: all, diff
• Long test mc102X (9000 events): passed, no significant changes; dqm plots: all, diff
• Long test mc80X (10000 events): passed, no significant changes; dqm plots: all, diff
• Long test mc94X (10000 events): passed, no significant changes; dqm plots: all, diff
• Long test mc94X2016 (9000 events): passed, no significant changes; dqm plots: all, diff
• Long test mc94Xv2 (9000 events): passed, no significant changes; dqm plots: all, diff
• Test mc_94Xv2: passed
• Test mc_102X: passed
• Test data_94X: passed
• Test data_101X: passed

Disk size report

Sample	kb/event	ref kb/event	diff
TTbar MC 94Xv1	1.656	1.658	-0.001 ( -0.1% )
TTbar MC 94Xv2	1.669	1.670	-0.001 ( -0.1% )
TTbar MC 94X2016	1.528	1.528	-0.000 ( -0.0% )
TTbar MC 80X	1.686	1.686	-0.001 ( -0.0% )
Data 94Xv1	0.723	0.723	0.000 ( +0.0% )
Data 80X	0.626	0.625	0.000 ( +0.0% )
Data 80X, Mu Run2016E	0.612	0.612	-0.000 ( -0.0% )