Merge pull request #27670 from bsunanda/Run3-sim40

Run3-sim40 Move all files from interface/src to plugins for TB simulation
cms-sw · Aug 3, 2019 · a90447f · a90447f
2 parents 005939e + d17df39
commit a90447f
Show file tree

Hide file tree

Showing 37 changed files with 267 additions and 373 deletions.
diff --git a/SimG4CMS/HGCalTestBeam/BuildFile.xml b/SimG4CMS/HGCalTestBeam/BuildFile.xml
diff --git a/SimG4CMS/HGCalTestBeam/src/AHCalDetId.cc → SimG4CMS/HGCalTestBeam/plugins/AHCalDetId.cc b/SimG4CMS/HGCalTestBeam/src/AHCalDetId.cc → SimG4CMS/HGCalTestBeam/plugins/AHCalDetId.cc
@@ -1,4 +1,4 @@
-#include "SimG4CMS/HGCalTestBeam/interface/AHCalDetId.h"
+#include "AHCalDetId.h"
 #include <ostream>
 #include "FWCore/Utilities/interface/Exception.h"
 

diff --git a/...4CMS/HGCalTestBeam/interface/AHCalDetId.h → SimG4CMS/HGCalTestBeam/plugins/AHCalDetId.h b/...4CMS/HGCalTestBeam/interface/AHCalDetId.h → SimG4CMS/HGCalTestBeam/plugins/AHCalDetId.h
diff --git a/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc → ...MS/HGCalTestBeam/plugins/AHCalGeometry.cc b/SimG4CMS/HGCalTestBeam/src/AHCalGeometry.cc → ...MS/HGCalTestBeam/plugins/AHCalGeometry.cc
@@ -1,5 +1,5 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimG4CMS/HGCalTestBeam/interface/AHCalGeometry.h"
+#include "AHCalGeometry.h"
 
 AHCalGeometry::AHCalGeometry(edm::ParameterSet const& iC)
     : maxDepth_(iC.getUntrackedParameter<int>("maxDepth", 12)),

diff --git a/...S/HGCalTestBeam/interface/AHCalGeometry.h → ...CMS/HGCalTestBeam/plugins/AHCalGeometry.h b/...S/HGCalTestBeam/interface/AHCalGeometry.h → ...CMS/HGCalTestBeam/plugins/AHCalGeometry.h
@@ -2,7 +2,7 @@
 #define SimG4CMS_HGCalTestBeam_AHCALGEOMETRY_H 1
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "SimG4CMS/HGCalTestBeam/interface/AHCalDetId.h"
+#include "AHCalDetId.h"
 
 /** \class AHCalGeometry
  *  Gets position of AHCal cell

diff --git a/SimG4CMS/HGCalTestBeam/plugins/AHCalSD.cc b/SimG4CMS/HGCalTestBeam/plugins/AHCalSD.cc
@@ -1,5 +1,5 @@
 #include "SimG4CMS/Calo/interface/CaloSD.h"
-#include "SimG4CMS/HGCalTestBeam/interface/AHCalDetId.h"
+#include "AHCalDetId.h"
 #include "SimG4Core/Notification/interface/TrackInformation.h"
 
 #include "DataFormats/DetId/interface/DetId.h"

diff --git a/SimG4CMS/HGCalTestBeam/plugins/BuildFile.xml b/SimG4CMS/HGCalTestBeam/plugins/BuildFile.xml
@@ -12,7 +12,6 @@
 <use   name="SimDataFormats/HcalTestBeam"/>
 <use   name="SimDataFormats/Track"/>
 <use   name="SimDataFormats/Vertex"/>
-<use   name="SimG4CMS/HGCalTestBeam"/>
 <use   name="SimG4CMS/Calo"/>
 <use   name="SimG4Core/Notification"/>
 <use   name="SimG4Core/Watcher"/>

diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
@@ -35,8 +35,8 @@
 #include "SimDataFormats/HcalTestBeam/interface/HcalTestBeamNumbering.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
-#include "SimG4CMS/HGCalTestBeam/interface/AHCalDetId.h"
-#include "SimG4CMS/HGCalTestBeam/interface/AHCalGeometry.h"
+#include "AHCalDetId.h"
+#include "AHCalGeometry.h"
 
 #include "SimDataFormats/CaloHit/interface/PassiveHit.h"
 

diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTimingAnalyzer.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTimingAnalyzer.cc
@@ -34,7 +34,6 @@
 #include "SimDataFormats/HcalTestBeam/interface/HcalTestBeamNumbering.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
-#include "SimG4CMS/HGCalTestBeam/interface/AHCalDetId.h"
 
 // Root objects
 #include "TROOT.h"

diff --git a/SimG4CMS/HcalTestBeam/BuildFile.xml b/SimG4CMS/HcalTestBeam/BuildFile.xml
diff --git a/SimG4CMS/HcalTestBeam/interface/HcalTB02Analysis.h b/SimG4CMS/HcalTestBeam/interface/HcalTB02Analysis.h
diff --git a/SimG4CMS/HcalTestBeam/interface/HcalTB04Analysis.h b/SimG4CMS/HcalTestBeam/interface/HcalTB04Analysis.h
diff --git a/SimG4CMS/HcalTestBeam/interface/HcalTB06Analysis.h b/SimG4CMS/HcalTestBeam/interface/HcalTB06Analysis.h
diff --git a/SimG4CMS/HcalTestBeam/plugins/BuildFile.xml b/SimG4CMS/HcalTestBeam/plugins/BuildFile.xml
@@ -1,10 +1,22 @@
-<use   name="SimG4CMS/HcalTestBeam"/>
-<use   name="SimG4Core/Watcher"/>
+<use   name="DataFormats/HcalDetId"/>
+<use   name="DataFormats/Math"/>
+<use   name="Geometry/EcalCommonData"/>
+<use   name="Geometry/HcalCommonData"/>
 <use   name="SimDataFormats/HcalTestBeam"/>
+<use   name="SimG4Core/Notification"/>
+<use   name="SimG4Core/Watcher"/>
+<use   name="SimG4CMS/Calo"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="FWCore/MessageLogger"/>
 <use   name="FWCore/ServiceRegistry"/>
+<use   name="CommonTools/UtilAlgos"/>
+<use   name="geant4core"/>
+<use   name="hepmc"/>
+<use   name="clhep"/>
+<use   name="rootmath"/>
+<use   name="rootphysics"/>
+<use   name="root"/>
 <flags   EDM_PLUGIN="1"/>
 <library   file="*.cc" name="SimG4CMSHcalTestBeamPlugins">
   <flags   EDM_PLUGIN="1"/>