Sync with correlator common

cms-l1t-offline · Aug 4, 2021 · be7556b · be7556b
1 parent 90e232f
commit be7556b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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,