Merge pull request #250 from blinkseb/fix_jer_syst

Fix JER systematics
cp3-llbb · Mar 7, 2017 · e81a73a · e81a73a
2 parents a140949 + fea8fbd
commit e81a73a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git 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
diff --git a/test/unit_tests_mc_ref.root b/test/unit_tests_mc_ref.root
diff --git a/test/unit_tests_mc_with_db_ref.root b/test/unit_tests_mc_with_db_ref.root