diff --git a/python/Framework.py b/python/Framework.py index 09e19cc..8d3f2b5 100644 --- a/python/Framework.py +++ b/python/Framework.py @@ -20,6 +20,7 @@ def __init__(self, isData, era, **kwargs): # Default configuration self.__miniaod_jet_collection = 'slimmedJets' + self.__miniaod_unsmeared_jet_collection = 'slimmedJets' self.__miniaod_fat_jet_collection = 'slimmedJetsAK8' self.__miniaod_gen_jet_collection = 'slimmedGenJets' self.__miniaod_met_collection = 'slimmedMETs' @@ -131,7 +132,7 @@ def create(self): 'jec': {'jetCollection': self.__miniaod_jet_collection, 'metCollection': self.__miniaod_met_collection, 'uncertaintiesFile': None}, - 'jer': {'jetCollection': self.__miniaod_jet_collection, + 'jer': {'jetCollection': self.__miniaod_unsmeared_jet_collection, 'metCollection': self.__miniaod_met_collection, 'genJetCollection': self.__miniaod_gen_jet_collection} } @@ -319,6 +320,7 @@ def redoJEC(self, JECDatabase=None): # Change the default collections to the newly created self.__miniaod_jet_collection = jet_collection + self.__miniaod_unsmeared_jet_collection = jet_collection self.__miniaod_fat_jet_collection = fat_jet_collection self.__miniaod_met_collection = met_collection diff --git a/test/unit_tests_data_ref.root b/test/unit_tests_data_ref.root index bc76266..32e57ac 100644 Binary files a/test/unit_tests_data_ref.root and b/test/unit_tests_data_ref.root differ diff --git a/test/unit_tests_mc_ref.root b/test/unit_tests_mc_ref.root index adef853..22f1588 100644 Binary files a/test/unit_tests_mc_ref.root and b/test/unit_tests_mc_ref.root differ diff --git a/test/unit_tests_mc_with_db_ref.root b/test/unit_tests_mc_with_db_ref.root index 849882a..99059b3 100644 Binary files a/test/unit_tests_mc_with_db_ref.root and b/test/unit_tests_mc_with_db_ref.root differ