From be7556bf050c547d608dc1c56a5e66ca5fe019f6 Mon Sep 17 00:00:00 2001
From: Giovanni <gpetruc@gmail.com>
Date: Wed, 4 Aug 2021 11:08:24 +0200
Subject: [PATCH] Sync with correlator common

---
 .../src/newfirmware/deregionizer/deregionizer_input.h  |  9 ++++++---
 .../src/newfirmware/deregionizer/deregionizer_ref.h    | 10 +++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/L1Trigger/Phase2L1ParticleFlow/src/newfirmware/deregionizer/deregionizer_input.h b/L1Trigger/Phase2L1ParticleFlow/src/newfirmware/deregionizer/deregionizer_input.h
index 38aa6eda971d4..5f17724397174 100644
--- a/L1Trigger/Phase2L1ParticleFlow/src/newfirmware/deregionizer/deregionizer_input.h
+++ b/L1Trigger/Phase2L1ParticleFlow/src/newfirmware/deregionizer/deregionizer_input.h
@@ -1,9 +1,12 @@
-#ifndef deregionizer_input_h
-#define deregionizer_input_h
+#ifndef L1Trigger_Phase2L1ParticleFlow_newfirmware_deregionizer_input_h
+#define L1Trigger_Phase2L1ParticleFlow_newfirmware_deregionizer_input_h
 
-#include <fstream>
 #include <vector>
+#ifdef CMSSW_GIT_HASH
 #include "../dataformats/layer1_emulator.h"
+#else
+#include "../../dataformats/layer1_emulator.h"
+#endif
 
 namespace l1ct {
 
diff --git a/L1Trigger/Phase2L1ParticleFlow/src/newfirmware/deregionizer/deregionizer_ref.h b/L1Trigger/Phase2L1ParticleFlow/src/newfirmware/deregionizer/deregionizer_ref.h
index 5f3ea1da21cdd..d04a4f40f7124 100644
--- a/L1Trigger/Phase2L1ParticleFlow/src/newfirmware/deregionizer/deregionizer_ref.h
+++ b/L1Trigger/Phase2L1ParticleFlow/src/newfirmware/deregionizer/deregionizer_ref.h
@@ -1,5 +1,5 @@
-#ifndef deregionizer_ref_h
-#define deregionizer_ref_h
+#ifndef L1Trigger_Phase2L1ParticleFlow_newfirmware_deregionizer_ref_h
+#define L1Trigger_Phase2L1ParticleFlow_newfirmware_deregionizer_ref_h
 
 #include <vector>
 #include "deregionizer_input.h"
@@ -29,13 +29,13 @@ namespace l1ct {
              std::vector<l1ct::PuppiObjEmu> &out,
              std::vector<l1ct::PuppiObjEmu> &truncated);
 
+    std::vector<std::vector<l1ct::PuppiObjEmu> > splitPFregions(
+        const std::vector<std::vector<std::vector<l1ct::PuppiObjEmu> > > &regionPuppis, const int i, const int j);
+
   private:
     unsigned int nPuppiFinalBuffer_, nPuppiPerClk_, nPuppiFirstBuffers_, nPuppiSecondBuffers_, nPuppiThirdBuffers_;
     bool debug_;
 
-    std::vector<std::vector<l1ct::PuppiObjEmu> > splitPFregions(
-        const std::vector<std::vector<std::vector<l1ct::PuppiObjEmu> > > &regionPuppis, const int i, const int j);
-
     static std::vector<l1ct::PuppiObjEmu> mergeXtoY(const unsigned int X,
                                                     const unsigned int Y,
                                                     const std::vector<l1ct::PuppiObjEmu> &inLeft,