Replace LinkDef file witl XML selection file in Calibration/HcalCalib…

…Algos
cms-sw · Oct 27, 2015 · 6fe1040 · 6fe1040
1 parent 5ef930d
commit 6fe1040
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 56 deletions.
diff --git a/Calibration/HcalCalibAlgos/BuildFile.xml b/Calibration/HcalCalibAlgos/BuildFile.xml
@@ -1,10 +1,9 @@
 <use   name="root"/>
 <use   name="rootgraphics"/>
 <use   name="rootminuit"/>
-<use   name="hepmc"/>
 <use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="FWCore/ParameterSet"/>
+<use   name="FWCore/ServiceRegistry"/>
 <use   name="FWCore/Utilities"/>
 <use   name="FWCore/Concurrency"/>
 <use   name="CommonTools/UtilAlgos"/>
@@ -13,21 +12,10 @@
 <use   name="DataFormats/DetId"/>
 <use   name="DataFormats/HcalDigi"/>
 <use   name="DataFormats/HcalRecHit"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/ParticleFlowReco"/>
 <use   name="Geometry/CaloTopology"/>
 <use   name="Geometry/CaloGeometry"/>
 <use   name="Geometry/Records"/>
-<use   name="JetMETCorrections/Objects"/>
-<use   name="JetMETCorrections/Type1MET"/>
 <use   name="CondTools/Hcal"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="Calibration/IsolatedParticles"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="TrackPropagation/SteppingHelixPropagator"/>
-<use   name="TrackingTools/TrackAssociator"/>
-<use   name="CondFormats/L1TObjects"/>
-<flags   EDM_PLUGIN="1"/>
+<export>
+  <lib name="1"/> 
+</export>
diff --git a/...on/HcalCalibAlgos/src/Analyzer_minbias.cc → ...calCalibAlgos/plugins/Analyzer_minbias.cc b/...on/HcalCalibAlgos/src/Analyzer_minbias.cc → ...calCalibAlgos/plugins/Analyzer_minbias.cc
@@ -5,7 +5,7 @@
 
 // user include files
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "Calibration/HcalCalibAlgos/interface/Analyzer_minbias.h"
+#include "Calibration/HcalCalibAlgos/plugins/Analyzer_minbias.h"
 #include "DataFormats/Provenance/interface/Provenance.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
@@ -771,4 +771,8 @@ namespace cms{
   }
 }
 
+#include "FWCore/Framework/interface/MakerMacros.h"
 
+using cms::Analyzer_minbias;
+
+DEFINE_FWK_MODULE(Analyzer_minbias);
diff --git a/...alCalibAlgos/interface/Analyzer_minbias.h → ...HcalCalibAlgos/plugins/Analyzer_minbias.h b/...alCalibAlgos/interface/Analyzer_minbias.h → ...HcalCalibAlgos/plugins/Analyzer_minbias.h
diff --git a/Calibration/HcalCalibAlgos/plugins/BuildFile.xml b/Calibration/HcalCalibAlgos/plugins/BuildFile.xml
@@ -1,17 +1,31 @@
+<use   name="Calibration/HcalCalibAlgos"/>
 <use   name="SimDataFormats/Track"/>
 <use   name="CondFormats/HcalObjects"/>
+<use   name="CondFormats/L1TObjects"/>
 <use   name="DQMServices/Core"/>
 <use   name="DataFormats/Common"/>
 <use   name="DataFormats/DetId"/>
 <use   name="DataFormats/EcalDetId"/>
+<use   name="DataFormats/HcalDetId"/>
+<use   name="DataFormats/HcalDigi"/>
+<use   name="DataFormats/HcalRecHit"/>
+<use   name="DataFormats/JetReco"/>
+<use   name="DataFormats/L1GlobalTrigger"/>
 <use   name="DataFormats/Math"/>
+<use   name="DataFormats/ParticleFlowReco"/>
 <use   name="DataFormats/TrackReco"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/MessageLogger"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="FWCore/Utilities"/>
 <use   name="Geometry/Records"/>
 <use   name="Geometry/CaloGeometry"/>
+<use   name="JetMETCorrections/Objects"/>
+<use   name="JetMETCorrections/Type1MET"/>
+<use   name="Geometry/CaloTopology"/>
+<use   name="CondTools/Hcal"/>
+<use   name="HLTrigger/HLTcore"/>
+<use   name="Calibration/IsolatedParticles"/>
 <use   name="rootphysics"/>
 <use   name="boost"/>
 <use   name="root"/>

diff --git a/...ation/HcalCalibAlgos/src/DiJetAnalyzer.cc → ...n/HcalCalibAlgos/plugins/DiJetAnalyzer.cc b/...ation/HcalCalibAlgos/src/DiJetAnalyzer.cc → ...n/HcalCalibAlgos/plugins/DiJetAnalyzer.cc
@@ -4,7 +4,7 @@
 // description: Create an ntuple necessary for dijet balance calibration for the HCAL
 //
 
-#include "Calibration/HcalCalibAlgos/interface/DiJetAnalyzer.h"
+#include "Calibration/HcalCalibAlgos/plugins/DiJetAnalyzer.h"
 
 DiJetAnalyzer::DiJetAnalyzer(const edm::ParameterSet& iConfig)
 {

diff --git a/.../HcalCalibAlgos/interface/DiJetAnalyzer.h → ...on/HcalCalibAlgos/plugins/DiJetAnalyzer.h b/.../HcalCalibAlgos/interface/DiJetAnalyzer.h → ...on/HcalCalibAlgos/plugins/DiJetAnalyzer.h
diff --git a/...on/HcalCalibAlgos/src/GammaJetAnalysis.cc → ...calCalibAlgos/plugins/GammaJetAnalysis.cc b/...on/HcalCalibAlgos/src/GammaJetAnalysis.cc → ...calCalibAlgos/plugins/GammaJetAnalysis.cc
@@ -1,5 +1,5 @@
 //
-#include "Calibration/HcalCalibAlgos/src/GammaJetAnalysis.h"
+#include "Calibration/HcalCalibAlgos/plugins/GammaJetAnalysis.h"
 #include "JetMETCorrections/Objects/interface/JetCorrector.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/...ion/HcalCalibAlgos/src/GammaJetAnalysis.h → ...HcalCalibAlgos/plugins/GammaJetAnalysis.h b/...ion/HcalCalibAlgos/src/GammaJetAnalysis.h → ...HcalCalibAlgos/plugins/GammaJetAnalysis.h
diff --git a/...ion/HcalCalibAlgos/src/HOCalibAnalyzer.cc → ...HcalCalibAlgos/plugins/HOCalibAnalyzer.cc b/...ion/HcalCalibAlgos/src/HOCalibAnalyzer.cc → ...HcalCalibAlgos/plugins/HOCalibAnalyzer.cc
diff --git a/...tion/HcalCalibAlgos/src/HcalCalibrator.cc → .../HcalCalibAlgos/plugins/HcalCalibrator.cc b/...tion/HcalCalibAlgos/src/HcalCalibrator.cc → .../HcalCalibAlgos/plugins/HcalCalibrator.cc
@@ -32,7 +32,7 @@ to the actual calibration code in "endJob()".
 
 // user include files
 
-#include "Calibration/HcalCalibAlgos/interface/HcalCalibrator.h"
+#include "Calibration/HcalCalibAlgos/plugins/HcalCalibrator.h"
 #include "Calibration/HcalCalibAlgos/interface/hcalCalib.h"
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"

diff --git a/...HcalCalibAlgos/interface/HcalCalibrator.h → ...n/HcalCalibAlgos/plugins/HcalCalibrator.h b/...HcalCalibAlgos/interface/HcalCalibrator.h → ...n/HcalCalibAlgos/plugins/HcalCalibrator.h
diff --git a/...alibAlgos/src/HcalConstantsASCIIWriter.cc → ...Algos/plugins/HcalConstantsASCIIWriter.cc b/...alibAlgos/src/HcalConstantsASCIIWriter.cc → ...Algos/plugins/HcalConstantsASCIIWriter.cc
@@ -5,7 +5,7 @@
 
 // user include files
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "Calibration/HcalCalibAlgos/interface/HcalConstantsASCIIWriter.h"
+#include "Calibration/HcalCalibAlgos/plugins/HcalConstantsASCIIWriter.h"
 #include "DataFormats/Provenance/interface/Provenance.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -165,5 +165,10 @@ HcalConstantsASCIIWriter::analyze(const edm::Event& iEvent, const edm::EventSetu
 }
 }
 //define this as a plug-in
-//DEFINE_FWK_MODULE(HcalConstantsASCIIWriter)
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+using cms::HcalConstantsASCIIWriter;
+DEFINE_FWK_MODULE(HcalConstantsASCIIWriter);
+
 
diff --git a/...lgos/interface/HcalConstantsASCIIWriter.h → ...bAlgos/plugins/HcalConstantsASCIIWriter.h b/...lgos/interface/HcalConstantsASCIIWriter.h → ...bAlgos/plugins/HcalConstantsASCIIWriter.h
diff --git a/Calibration/HcalCalibAlgos/plugins/HcalCorrPFCalculation.cc b/Calibration/HcalCalibAlgos/plugins/HcalCorrPFCalculation.cc
@@ -832,7 +832,6 @@ void HcalCorrPFCalculation::endJob()
 {}
 
 
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 

diff --git a/...calCalibAlgos/src/HcalHBHEMuonAnalyzer.cc → ...alibAlgos/plugins/HcalHBHEMuonAnalyzer.cc b/...calCalibAlgos/src/HcalHBHEMuonAnalyzer.cc → ...alibAlgos/plugins/HcalHBHEMuonAnalyzer.cc
diff --git a/.../HcalCalibAlgos/src/HcalIsoTrkAnalyzer.cc → ...lCalibAlgos/plugins/HcalIsoTrkAnalyzer.cc b/.../HcalCalibAlgos/src/HcalIsoTrkAnalyzer.cc → ...lCalibAlgos/plugins/HcalIsoTrkAnalyzer.cc
diff --git a/...ion/HcalCalibAlgos/src/HitReCalibrator.cc → ...HcalCalibAlgos/plugins/HitReCalibrator.cc b/...ion/HcalCalibAlgos/src/HitReCalibrator.cc → ...HcalCalibAlgos/plugins/HitReCalibrator.cc
@@ -1,4 +1,4 @@
-#include "Calibration/HcalCalibAlgos/src/HitReCalibrator.h"
+#include "Calibration/HcalCalibAlgos/plugins/HitReCalibrator.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/CaloTowers/interface/CaloTowerDetId.h"
@@ -126,3 +126,8 @@ HitReCalibrator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
 }
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+using cms::HitReCalibrator;
+DEFINE_FWK_MODULE(HitReCalibrator);
diff --git a/...tion/HcalCalibAlgos/src/HitReCalibrator.h → .../HcalCalibAlgos/plugins/HitReCalibrator.h b/...tion/HcalCalibAlgos/src/HitReCalibrator.h → .../HcalCalibAlgos/plugins/HitReCalibrator.h
diff --git a/.../HcalCalibAlgos/src/RecAnalyzerMinbias.cc → ...lCalibAlgos/plugins/RecAnalyzerMinbias.cc b/.../HcalCalibAlgos/src/RecAnalyzerMinbias.cc → ...lCalibAlgos/plugins/RecAnalyzerMinbias.cc
diff --git a/Calibration/HcalCalibAlgos/plugins/SealModule.cc b/Calibration/HcalCalibAlgos/plugins/SealModule.cc
diff --git a/.../HcalCalibAlgos/src/SimAnalyzerMinbias.cc → ...lCalibAlgos/plugins/SimAnalyzerMinbias.cc b/.../HcalCalibAlgos/src/SimAnalyzerMinbias.cc → ...lCalibAlgos/plugins/SimAnalyzerMinbias.cc
diff --git a/Calibration/HcalCalibAlgos/plugins/ValidationHcalIsoTrackAlCaReco.cc b/Calibration/HcalCalibAlgos/plugins/ValidationHcalIsoTrackAlCaReco.cc
@@ -484,3 +484,6 @@ if(dbe_)
   }
 }
 
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(ValidationHcalIsoTrackAlCaReco);
+
diff --git a/Calibration/HcalCalibAlgos/src/CalibrationHcalCalibAlgosLinkDef.h b/Calibration/HcalCalibAlgos/src/CalibrationHcalCalibAlgosLinkDef.h
diff --git a/Calibration/HcalCalibAlgos/src/SealModule.cc b/Calibration/HcalCalibAlgos/src/SealModule.cc
diff --git a/Calibration/HcalCalibAlgos/src/classes.h b/Calibration/HcalCalibAlgos/src/classes.h
@@ -0,0 +1,6 @@
+#include "Calibration/HcalCalibAlgos/src/TCell.h"
+
+namespace Calibration_HcalCalibAlgos {
+  struct dictionary {
+  };
+}
diff --git a/Calibration/HcalCalibAlgos/src/classes_def.xml b/Calibration/HcalCalibAlgos/src/classes_def.xml
@@ -0,0 +1,3 @@
+<lcgdict>
+  <class name="TCell"/>
+</lcgdict>