make adept to be a plugin

SeverinDiederichs · SeverinDiederichs · commit ddedc24cfae8 · 2025-10-20T17:42:54.000+02:00
diff --git a/SimG4Core/PhysicsLists/BuildFile.xml b/SimG4Core/PhysicsLists/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="clhep"/>
 <use name="geant4core"/>
 <use name="g4hepemcore"/>
-<use name="adept"/>
 <use name="heppdt"/>
 <use name="FWCore/MessageLogger"/>
 <use name="SimG4Core/MagneticField"/>
@@ -11,4 +10,3 @@
 <export>
   <lib name="1"/>
 </export>
-<flags CXXFLAGS="-DASYNC_MODE=ON -DADEPT_USE_EXT_BFIELD=ON"/>
diff --git a/SimG4Core/PhysicsLists/plugins/BuildFile.xml b/SimG4Core/PhysicsLists/plugins/BuildFile.xml
@@ -9,3 +9,11 @@
   <use name="SimG4Core/PhysicsLists"/>
   <flags EDM_PLUGIN="1"/>
 </library>
+<iftool name="adept">
+  <library file="adept/*.cc" name="SimG4CorePhysicsListsAdeptPlugins">
+    <use name="SimG4Core/PhysicsLists"/>
+    <use name="adept"/>
+    <flags CXXFLAGS="-DASYNC_MODE=ON -DADEPT_USE_EXT_BFIELD=ON"/>
+    <flags EDM_PLUGIN="1"/>
+  </library>
+</iftool>
diff --git a/SimG4Core/PhysicsLists/plugins/adept/CMSEmStandardPhysicsA.cc b/SimG4Core/PhysicsLists/plugins/adept/CMSEmStandardPhysicsA.cc
@@ -1,4 +1,4 @@
-#include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsA.h"
+#include "SimG4Core/PhysicsLists/plugins/adept/CMSEmStandardPhysicsA.h"
 #include "SimG4Core/Physics/interface/CMSG4TrackInterface.h"
 #include "SimG4Core/Notification/interface/CurrentG4Track.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
diff --git a/SimG4Core/PhysicsLists/plugins/adept/CMSEmStandardPhysicsA.h b/SimG4Core/PhysicsLists/plugins/adept/CMSEmStandardPhysicsA.h
diff --git a/SimG4Core/PhysicsLists/plugins/adept/FTFPCMS_BERT_EMA.cc b/SimG4Core/PhysicsLists/plugins/adept/FTFPCMS_BERT_EMA.cc
@@ -1,5 +1,5 @@
 #include "FTFPCMS_BERT_EMA.h"
-#include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsA.h"
+#include "SimG4Core/PhysicsLists/plugins/adept/CMSEmStandardPhysicsA.h"
 #include "SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
diff --git a/SimG4Core/PhysicsLists/plugins/adept/FTFPCMS_BERT_EMA.h b/SimG4Core/PhysicsLists/plugins/adept/FTFPCMS_BERT_EMA.h
diff --git a/SimG4Core/PhysicsLists/plugins/adept/module.cc b/SimG4Core/PhysicsLists/plugins/adept/module.cc
@@ -0,0 +1,7 @@
+#include "SimG4Core/Physics/interface/PhysicsListFactory.h"
+
+
+#include "FTFPCMS_BERT_EMA.h"
+
+typedef FTFPCMS_BERT_EMA FTFP_BERT_EMA;
+DEFINE_PHYSICSLIST(FTFP_BERT_EMA);
diff --git a/SimG4Core/PhysicsLists/plugins/module.cc b/SimG4Core/PhysicsLists/plugins/module.cc
@@ -5,7 +5,6 @@
 #include "FTFPCMS_BERT.h"
 #include "FTFPCMS_BERT_EML.h"
 #include "FTFPCMS_BERT_EMM.h"
-#include "FTFPCMS_BERT_EMA.h"
 #include "FTFPCMS_BERT_EMN.h"
 #include "FTFPCMS_BERT_EMM_TRK.h"
 #include "FTFPCMS_BERT_HP_EMM.h"
@@ -33,8 +32,6 @@ DEFINE_PHYSICSLIST(FTFP_BERT);
 // EMH is aliased to EMM for the moment and forces the usage of G4HepEm.
 typedef FTFPCMS_BERT_EMM FTFP_BERT_EMH;
 DEFINE_PHYSICSLIST(FTFP_BERT_EMH);
-typedef FTFPCMS_BERT_EMA FTFP_BERT_EMA;
-DEFINE_PHYSICSLIST(FTFP_BERT_EMA);
 typedef FTFPCMS_BERT_EML FTFP_BERT_EML;
 DEFINE_PHYSICSLIST(FTFP_BERT_EML);
 typedef FTFPCMS_BERT_EMM FTFP_BERT_EMM;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsA.h"`
	`1`	`+#include "SimG4Core/PhysicsLists/plugins/adept/CMSEmStandardPhysicsA.h"`
`2`	`2`	`#include "SimG4Core/Physics/interface/CMSG4TrackInterface.h"`
`3`	`3`	`#include "SimG4Core/Notification/interface/CurrentG4Track.h"`
`4`	`4`	`#include "FWCore/MessageLogger/interface/MessageLogger.h"`