Merge pull request #48570 from brusale/fix-clang-ib-issue

register `HGCalLayerClusterPluginFactory` only once

Author: cmsbuild

…lugins/HGCalLayerClusterPluginFactory.cc …HGCalRecProducers/plugins/SealModules.ccRecoLocalCalo/HGCalRecProducers/plugins/HGCalLayerClusterPluginFactory.cc renamed to RecoLocalCalo/HGCalRecProducers/plugins/SealModules.cc RecoLocalCalo/HGCalRecProducers/plugins/HGCalLayerClusterPluginFactory.cc renamed to RecoLocalCalo/HGCalRecProducers/plugins/SealModules.cc

@@ -3,10 +3,8 @@
 #include "RecoLocalCalo/HGCalRecProducers/interface/HGCalClusteringAlgoBase.h"
 #include "RecoLocalCalo/HGCalRecProducers/interface/HGCalImagingAlgo.h"
 #include "RecoLocalCalo/HGCalRecProducers/plugins/HGCalCLUEAlgo.h"
-#include "FWCore/ParameterSet/interface/ValidatedPluginFactoryMacros.h"
 #include "FWCore/ParameterSet/interface/ValidatedPluginMacros.h"
 
-EDM_REGISTER_VALIDATED_PLUGINFACTORY(HGCalLayerClusterAlgoFactory, "HGCalLayerClusterAlgoFactory");
 DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, HGCalImagingAlgo, "Imaging");
 DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, HGCalSiCLUEAlgo, "SiCLUE");
 DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, HGCalSciCLUEAlgo, "SciCLUE");

RecoLocalCalo/HGCalRecProducers/src/HGCalLayerClusterPluginFactory.cc

@@ -0,0 +1,4 @@
+#include "RecoLocalCalo/HGCalRecProducers/interface/HGCalLayerClusterAlgoFactory.h"
+#include "FWCore/ParameterSet/interface/ValidatedPluginFactoryMacros.h"
+
+EDM_REGISTER_VALIDATED_PLUGINFACTORY(HGCalLayerClusterAlgoFactory, "HGCalLayerClusterAlgoFactory");

RecoParticleFlow/PFClusterProducer/BuildFile.xml

@@ -15,6 +15,7 @@
 <use name="CalibCalorimetry/EcalTPGTools"/>
 <use name="DataFormats/HGCRecHit"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
+<use name="RecoLocalCalo/HGCalRecProducers"/>
 <use name="vdt_headers"/>
 <use name="rootmath"/>
 <use name="root"/>

…ugins/BarrelLayerClusterPluginFactory.cc …PFClusterProducer/plugins/SealModules.ccRecoParticleFlow/PFClusterProducer/plugins/BarrelLayerClusterPluginFactory.cc renamed to RecoParticleFlow/PFClusterProducer/plugins/SealModules.cc RecoParticleFlow/PFClusterProducer/plugins/BarrelLayerClusterPluginFactory.cc renamed to RecoParticleFlow/PFClusterProducer/plugins/SealModules.cc

@@ -1,9 +1,7 @@
 #include "RecoLocalCalo/HGCalRecProducers/interface/HGCalLayerClusterAlgoFactory.h"
 #include "RecoLocalCalo/HGCalRecProducers/interface/HGCalClusteringAlgoBase.h"
 #include "RecoParticleFlow/PFClusterProducer/plugins/BarrelCLUEAlgo.h"
-#include "FWCore/ParameterSet/interface/ValidatedPluginFactoryMacros.h"
 #include "FWCore/ParameterSet/interface/ValidatedPluginMacros.h"
 
-EDM_REGISTER_VALIDATED_PLUGINFACTORY(HGCalLayerClusterAlgoFactory, "HGCalLayerClusterAlgoFactory");
 DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, EBCLUEAlgo, "EBCLUE");
 DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, HBCLUEAlgo, "HBCLUE");