Drop local copy of conifer.h in favor of conifer external

cms-sw · Oct 26, 2023 · b8e145f · b8e145f
1 parent 7e21693
commit b8e145f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 167 deletions.
diff --git a/L1Trigger/Phase2L1ParticleFlow/BuildFile.xml b/L1Trigger/Phase2L1ParticleFlow/BuildFile.xml
@@ -9,6 +9,7 @@
 <use name="CommonTools/MVAUtils"/>
 <use name="L1Trigger/DemonstratorTools"/>
 <use name="PhysicsTools/TensorFlow"/>
+<use name="conifer"/>
 <use name="tensorflow"/>
 <use name="roottmva"/>
 <use name="hls"/>

diff --git a/L1Trigger/Phase2L1ParticleFlow/interface/conifer.h b/L1Trigger/Phase2L1ParticleFlow/interface/conifer.h
diff --git a/L1Trigger/Phase2L1ParticleFlow/interface/egamma/pftkegalgo_ref.h b/L1Trigger/Phase2L1ParticleFlow/interface/egamma/pftkegalgo_ref.h
@@ -4,9 +4,10 @@
 #include "DataFormats/L1TParticleFlow/interface/layer1_emulator.h"
 #include "DataFormats/L1TParticleFlow/interface/egamma.h"
 #include "DataFormats/L1TParticleFlow/interface/pf.h"
-#include "L1Trigger/Phase2L1ParticleFlow/interface/conifer.h"
 #include "L1Trigger/Phase2L1ParticleFlow/interface/common/inversion.h"
 
+#include "conifer.h"
+
 namespace edm {
   class ParameterSet;
   class ParameterSetDescription;