From ee10bb7cbc3a6dbe7524f878e62508796957888a Mon Sep 17 00:00:00 2001
From: Adinda de Wit <adinda.maite.de.wit@cern.ch>
Date: Mon, 25 Nov 2019 14:30:27 +0100
Subject: [PATCH] Fixing missing lines in HTXS header file

---
 SimDataFormats/HTXS/interface/HiggsTemplateCrossSections.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SimDataFormats/HTXS/interface/HiggsTemplateCrossSections.h b/SimDataFormats/HTXS/interface/HiggsTemplateCrossSections.h
index 16df1b47feece..8893b214a5cd5 100644
--- a/SimDataFormats/HTXS/interface/HiggsTemplateCrossSections.h
+++ b/SimDataFormats/HTXS/interface/HiggsTemplateCrossSections.h
@@ -539,8 +539,9 @@ namespace Stage1_1 {
     cat.isZ2vvDecay = htxs_cat_rivet.isZ2vvDecay;
     return cat;
   }
->>>>>>> Adding HTXS stage 1.2
 
+inline int HTXSstage1_to_HTXSstage1FineIndex(HTXS::Stage1::Category stage1, 
+                         HiggsProdMode prodMode, tH_type tH) {
       if(stage1==HTXS::Stage1::Category::UNKNOWN) return 0;
       int P = (int)(stage1 / 100);
       int F = (int)(stage1 % 100);
@@ -689,6 +690,7 @@ namespace Stage1_1 {
 
   // #endif
 
+} // namespace HTXS
 
 #ifdef RIVET_Particle_HH
 //#ifdef HIGGSTRUTHCLASSIFIER_HIGGSTRUTHCLASSIFIER_CC