Merge pull request #34770 from bsunanda/Run3-TB63

Run3-TB63 Rearrange the files in SimG4CMS/HcalTestBeam
cms-sw · Aug 5, 2021 · 2443931 · 2443931
2 parents 97a1b25 + 50617c6
commit 2443931
Show file tree

Hide file tree

Showing 26 changed files with 47 additions and 24 deletions.
diff --git a/SimG4CMS/HcalTestBeam/BuildFile.xml b/SimG4CMS/HcalTestBeam/BuildFile.xml
@@ -0,0 +1,22 @@
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/Math"/>
+<use name="Geometry/EcalCommonData"/>
+<use name="Geometry/HcalTestBeamData"/>
+<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"/>
+<export>
+  <lib name="1"/>
+</export>
diff --git a/...eam/plugins/HcalTB02HcalNumberingScheme.h → ...m/interface/HcalTB02HcalNumberingScheme.h b/...eam/plugins/HcalTB02HcalNumberingScheme.h → ...m/interface/HcalTB02HcalNumberingScheme.h
@@ -19,7 +19,7 @@
 // system include files
 
 // user include files
-#include "HcalTB02NumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02NumberingScheme.h"
 
 class HcalTB02HcalNumberingScheme : public HcalTB02NumberingScheme {
 public:

diff --git a/...4CMS/HcalTestBeam/plugins/HcalTB02Histo.h → ...MS/HcalTestBeam/interface/HcalTB02Histo.h b/...4CMS/HcalTestBeam/plugins/HcalTB02Histo.h → ...MS/HcalTestBeam/interface/HcalTB02Histo.h
diff --git a/...estBeam/plugins/HcalTB02NumberingScheme.h → ...tBeam/interface/HcalTB02NumberingScheme.h b/...estBeam/plugins/HcalTB02NumberingScheme.h → ...tBeam/interface/HcalTB02NumberingScheme.h
diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB02SD.h → SimG4CMS/HcalTestBeam/interface/HcalTB02SD.h b/SimG4CMS/HcalTestBeam/plugins/HcalTB02SD.h → SimG4CMS/HcalTestBeam/interface/HcalTB02SD.h
@@ -26,7 +26,7 @@
 #include "Geometry/HcalTestBeamData/interface/HcalTB02Parameters.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include "HcalTB02NumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02NumberingScheme.h"
 
 class HcalTB02SD : public CaloSD {
 public:

diff --git a/...eam/plugins/HcalTB02XtalNumberingScheme.h → ...m/interface/HcalTB02XtalNumberingScheme.h b/...eam/plugins/HcalTB02XtalNumberingScheme.h → ...m/interface/HcalTB02XtalNumberingScheme.h
@@ -19,7 +19,7 @@
 // system include files
 
 // user include files
-#include "HcalTB02NumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02NumberingScheme.h"
 
 class HcalTB02XtalNumberingScheme : public HcalTB02NumberingScheme {
 public:

diff --git a/...4CMS/HcalTestBeam/plugins/HcalTB04Histo.h → ...MS/HcalTestBeam/interface/HcalTB04Histo.h b/...4CMS/HcalTestBeam/plugins/HcalTB04Histo.h → ...MS/HcalTestBeam/interface/HcalTB04Histo.h
diff --git a/...eam/plugins/HcalTB04XtalNumberingScheme.h → ...m/interface/HcalTB04XtalNumberingScheme.h b/...eam/plugins/HcalTB04XtalNumberingScheme.h → ...m/interface/HcalTB04XtalNumberingScheme.h
diff --git a/...CMS/HcalTestBeam/plugins/HcalTB06BeamSD.h → ...S/HcalTestBeam/interface/HcalTB06BeamSD.h b/...CMS/HcalTestBeam/plugins/HcalTB06BeamSD.h → ...S/HcalTestBeam/interface/HcalTB06BeamSD.h
diff --git a/...4CMS/HcalTestBeam/plugins/HcalTB06Histo.h → ...MS/HcalTestBeam/interface/HcalTB06Histo.h b/...4CMS/HcalTestBeam/plugins/HcalTB06Histo.h → ...MS/HcalTestBeam/interface/HcalTB06Histo.h
diff --git a/...lTestBeam/plugins/HcalTBNumberingScheme.h → ...estBeam/interface/HcalTBNumberingScheme.h b/...lTestBeam/plugins/HcalTBNumberingScheme.h → ...estBeam/interface/HcalTBNumberingScheme.h
diff --git a/SimG4CMS/HcalTestBeam/plugins/BuildFile.xml b/SimG4CMS/HcalTestBeam/plugins/BuildFile.xml
@@ -11,6 +11,7 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="CommonTools/UtilAlgos"/>
+<use name="SimG4CMS/HcalTestBeam"/>
 <use name="geant4core"/>
 <use name="hepmc"/>
 <use name="clhep"/>

diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB02Analysis.cc b/SimG4CMS/HcalTestBeam/plugins/HcalTB02Analysis.cc
@@ -36,9 +36,9 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 
-#include "HcalTB02HcalNumberingScheme.h"
-#include "HcalTB02XtalNumberingScheme.h"
-#include "HcalTB02Histo.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02HcalNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02XtalNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02Histo.h"
 
 #include "G4HCofThisEvent.hh"
 #include "G4SDManager.hh"

diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB02SensitiveDetectorBuilder.cc b/SimG4CMS/HcalTestBeam/plugins/HcalTB02SensitiveDetectorBuilder.cc
@@ -7,7 +7,7 @@
 
 #include "Geometry/HcalTestBeamData/interface/HcalTB02Parameters.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "HcalTB02SD.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02SD.h"
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"

diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB04Analysis.cc b/SimG4CMS/HcalTestBeam/plugins/HcalTB04Analysis.cc
@@ -46,9 +46,9 @@
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "HcalTBNumberingScheme.h"
-#include "HcalTB04Histo.h"
-#include "HcalTB04XtalNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTBNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB04Histo.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB04XtalNumberingScheme.h"
 
 #include "G4SDManager.hh"
 #include "G4Step.hh"

diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB06Analysis.cc b/SimG4CMS/HcalTestBeam/plugins/HcalTB06Analysis.cc
@@ -11,8 +11,8 @@
 //
 
 // user include files
-#include "HcalTB06Histo.h"
-#include "HcalTB06BeamSD.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB06Histo.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB06BeamSD.h"
 
 // to retreive hits
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"

diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB06BeamDetectorBuilder.cc b/SimG4CMS/HcalTestBeam/plugins/HcalTB06BeamDetectorBuilder.cc
@@ -7,7 +7,7 @@
 
 #include "Geometry/HcalTestBeamData/interface/HcalTB06BeamParameters.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "HcalTB06BeamSD.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB06BeamSD.h"
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"

diff --git a/...am/plugins/HcalTB02HcalNumberingScheme.cc → ...stBeam/src/HcalTB02HcalNumberingScheme.cc b/...am/plugins/HcalTB02HcalNumberingScheme.cc → ...stBeam/src/HcalTB02HcalNumberingScheme.cc
@@ -13,7 +13,7 @@
 // system include files
 
 // user include files
-#include "HcalTB02HcalNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02HcalNumberingScheme.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "G4SystemOfUnits.hh"

diff --git a/...CMS/HcalTestBeam/plugins/HcalTB02Histo.cc → SimG4CMS/HcalTestBeam/src/HcalTB02Histo.cc b/...CMS/HcalTestBeam/plugins/HcalTB02Histo.cc → SimG4CMS/HcalTestBeam/src/HcalTB02Histo.cc
@@ -18,7 +18,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
-#include "HcalTB02Histo.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02Histo.h"
 
 //#define EDM_ML_DEBUG
 //

diff --git a/SimG4CMS/HcalTestBeam/plugins/HcalTB02SD.cc → SimG4CMS/HcalTestBeam/src/HcalTB02SD.cc b/SimG4CMS/HcalTestBeam/plugins/HcalTB02SD.cc → SimG4CMS/HcalTestBeam/src/HcalTB02SD.cc
@@ -15,9 +15,9 @@
 // user include files
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "HcalTB02SD.h"
-#include "HcalTB02HcalNumberingScheme.h"
-#include "HcalTB02XtalNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02SD.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02HcalNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02XtalNumberingScheme.h"
 
 #include "G4Step.hh"
 #include "G4Track.hh"

diff --git a/...am/plugins/HcalTB02XtalNumberingScheme.cc → ...stBeam/src/HcalTB02XtalNumberingScheme.cc b/...am/plugins/HcalTB02XtalNumberingScheme.cc → ...stBeam/src/HcalTB02XtalNumberingScheme.cc
@@ -13,7 +13,7 @@
 // system include files
 
 // user include files
-#include "HcalTB02XtalNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB02XtalNumberingScheme.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //#define EDM_ML_DEBUG

diff --git a/...CMS/HcalTestBeam/plugins/HcalTB04Histo.cc → SimG4CMS/HcalTestBeam/src/HcalTB04Histo.cc b/...CMS/HcalTestBeam/plugins/HcalTB04Histo.cc → SimG4CMS/HcalTestBeam/src/HcalTB04Histo.cc
@@ -18,7 +18,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
-#include "HcalTB04Histo.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB04Histo.h"
 
 //
 // constructors and destructor

diff --git a/...am/plugins/HcalTB04XtalNumberingScheme.cc → ...stBeam/src/HcalTB04XtalNumberingScheme.cc b/...am/plugins/HcalTB04XtalNumberingScheme.cc → ...stBeam/src/HcalTB04XtalNumberingScheme.cc
@@ -15,7 +15,7 @@
 // user include files
 #include "SimG4CMS/Calo/interface/HcalTestNumberingScheme.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "HcalTB04XtalNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB04XtalNumberingScheme.h"
 
 //#define EDM_ML_DEBUG
 

diff --git a/...MS/HcalTestBeam/plugins/HcalTB06BeamSD.cc → SimG4CMS/HcalTestBeam/src/HcalTB06BeamSD.cc b/...MS/HcalTestBeam/plugins/HcalTB06BeamSD.cc → SimG4CMS/HcalTestBeam/src/HcalTB06BeamSD.cc
@@ -8,7 +8,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "HcalTB06BeamSD.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB06BeamSD.h"
 
 #include "G4Step.hh"
 #include "G4Track.hh"

diff --git a/...CMS/HcalTestBeam/plugins/HcalTB06Histo.cc → SimG4CMS/HcalTestBeam/src/HcalTB06Histo.cc b/...CMS/HcalTestBeam/plugins/HcalTB06Histo.cc → SimG4CMS/HcalTestBeam/src/HcalTB06Histo.cc
@@ -19,7 +19,7 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 
-#include "HcalTB06Histo.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTB06Histo.h"
 
 //
 // constructors and destructor

diff --git a/...TestBeam/plugins/HcalTBNumberingScheme.cc → ...HcalTestBeam/src/HcalTBNumberingScheme.cc b/...TestBeam/plugins/HcalTBNumberingScheme.cc → ...HcalTestBeam/src/HcalTBNumberingScheme.cc
@@ -17,7 +17,7 @@
 #include "SimG4CMS/Calo/interface/HcalTestNumberingScheme.h"
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "HcalTBNumberingScheme.h"
+#include "SimG4CMS/HcalTestBeam/interface/HcalTBNumberingScheme.h"
 
 //
 // member functions