Merge branch 'dev-Larry' into 'master'

Dev larry - 2015 vs 2015 lepton triggers rsmith54#2 - e/mu/btag SFs rsmith54#1 - trigger matching rsmith54#3 See merge request !4
lawrenceleejr · Sep 26, 2016 · e44ef73 · e44ef73
2 parents 3d655a4 + 45c11cd
commit e44ef73
Show file tree

Hide file tree

Showing 6 changed files with 275 additions and 210 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -121,4 +121,4 @@ testValgrind:
 
   artifacts:
     paths:
-    - valgrind.log
+    - testArea/valgrind.log
diff --git a/FactoryTools/CalibrateST.h b/FactoryTools/CalibrateST.h
@@ -31,6 +31,12 @@ class CalibrateST : public EL::Algorithm
   std::string PRWLumiCalcFileNames;
   std::string fatJetContainerName;
 
+  std::string muTrig2015;
+  std::string muTrig2016;
+  std::string elTrig2015;
+  std::string elTrig2016;
+
+
   ST::SUSYObjDef_xAOD *m_objTool;//!
 
   // this is a standard constructor