Remove WCSimPhysicsList

Author: Tomoyo-Yoshida

CMakeLists.txt

@@ -82,7 +82,6 @@ target_link_libraries(WCSim ${Geant4_LIBRARIES} ${ROOT_LIBRARIES} WCSimRoot Tree
 # relies on these scripts being in the current working directory.
 #
 set(WCSIM_SCRIPTS
-  jobOptions2.mac
   jobOptions.mac
   WCSim.mac
   daq.mac

WCSim.cc

@@ -4,8 +4,6 @@
 #include "G4UIterminal.hh"
 #include "G4UItcsh.hh"
 #include "WCSimDetectorConstruction.hh"
-#include "WCSimPhysicsList.hh"
-#include "WCSimPhysicsMessenger.hh"
 #include "WCSimPhysicsListFactory.hh"
 #include "WCSimPhysicsListFactoryMessenger.hh"
 #include "WCSimTuningParameters.hh"
@@ -59,27 +57,14 @@ int main(int argc,char** argv)
   // Set up the messenger hooks here, initialize the actual list after loading jobOptions.mac
   WCSimPhysicsListFactory *physFactory = new WCSimPhysicsListFactory();
 
-  // Currently, default model is set to BINARY
+  // Currently, default physics list is set to FTFP_BERT
   file_exists("jobOptions.mac");
   UI->ApplyCommand("/control/execute jobOptions.mac");
 
   // Initialize the physics factory to register the selected physics.
   physFactory->InitializeList();
   runManager->SetUserInitialization(physFactory);
 
-  // If the WCSim physics list was chosen in jobOptions.mac,
-  // then it's hadronic model needs to be selected in jobOptions2.mac
-  //=================================
-  // Added by JLR 2005-07-05
-  //=================================
-  // Choice of hadronic interaction model for 
-  // protons & neutrons. This file must be read in
-  // by the program BEFORE the runManager is initialized.
-  // If file does not exist, default model will be used.
-  // Currently, default model is set to BINARY.
-  file_exists("jobOptions2.mac");
-  UI->ApplyCommand("/control/execute jobOptions2.mac");
-
   // Visualization
   G4VisManager* visManager = new WCSimVisManager;
   visManager->Initialize();

include/WCSimPhysicsList.hh

@@ -8,7 +8,6 @@
 #include "G4OpticalPhysics.hh"
 
 #include "WCSimPhysicsListFactoryMessenger.hh"
-#include "WCSimPhysicsList.hh"
 #include "WCSimRootOptions.hh"
 
 //class WCSimPhysicsList;
@@ -38,7 +37,6 @@ class WCSimPhysicsListFactory : public G4VModularPhysicsList
     WCSimPhysicsListFactoryMessenger* PhysicsMessenger;
     G4PhysListFactory* factory;
 
-    WCSimPhysicsList * WCSimPhysList;
 };
 
 #endif

include/WCSimPhysicsListFactory.hh

@@ -105,10 +105,8 @@ public:
   bool   GetTopveto() {return Topveto;}
   //WCSimPhysicsListFactory sets
   void SetPhysicsListName(string iPhysicsListName) {PhysicsListName = iPhysicsListName;}
-  void SetSecondaryHadModel(string iSecondaryHadModel) {SecondaryHadModel = iSecondaryHadModel;}
   //WCSimPhysicsListFactory gets
   string GetPhysicsListName() {return PhysicsListName;}
-  string GetSecondaryHadModel() {return SecondaryHadModel;}
   //WCSimPrimaryGeneratorAction sets
   void SetVectorFileName(string iVectorFileName) {VectorFileName = iVectorFileName;}
   void SetGeneratorType(string iGeneratorType) {GeneratorType = iGeneratorType;}
@@ -168,7 +166,6 @@ private:
 
   //WCSimPhysicsListFactory
   string PhysicsListName;
-  string SecondaryHadModel;
 
   //WCSimPrimaryGeneratorAction
   string VectorFileName;

include/WCSimPhysicsMessenger.hh

@@ -12,7 +12,6 @@
 #
 #/WCSim/physics/list QGSP_BIC_HP #preferred for energies below 5 GeV
 #/WCSim/physics/list LBE # preferred for low-background experiments.  
-#/WCSim/physics/list WCSim # included for backward-compatibility.  Requires jobOptions2.mac
 /WCSim/physics/list FTFP_BERT # recommended for high energy physics and hadron production up to beam momentum of several tens of GeV/c.