Fixing a bug introduced in revision 285 which removed physics lists selection. Physics lists can now be selected in jobOptions.mac. If the WCSim physics list is selected, its hadronic model can be selected in jobOptions2.mac

Author: David Webber

WCSim.cc

@@ -47,11 +47,15 @@ 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
+  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
   //=================================
@@ -60,11 +64,7 @@ int main(int argc,char** argv)
   // 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.
-  //K.Z. 2010-08: Moving the choice of the physics lists and 
-  //the hadronic model for wcsim default physcis lists to the right
-  //place, after initializing the physics list factory
-  
-  UI->ApplyCommand("/control/execute jobOptions.mac");
+  UI->ApplyCommand("/control/execute jobOptions2.mac");
 
   // Visualization
   G4VisManager* visManager = new WCSimVisManager;

jobOptions.mac

@@ -1,14 +1,18 @@
-# First choose the hadronic interaction model.
-# Note: WCSim physics list only
-# Options:
-#   GHEISHA   (Original Geant4 model)
-#   BERTINI   (Bertini intra-nuclear cascade model)
-#   BINARY    (Binary intra-nuclear cascade model) -- this is the default
-/WCSim/physics/secondaries/model BINARY
+# Choose the physics list.  
+# Physics lists are described in the Geant4 documentation at 
+# http://geant4.cern.ch/support/proc_mod_catalog/physics_lists/physicsLists.shtml
+# and 
+# http://geant4.cern.ch/support/proc_mod_catalog/physics_lists/referencePL.shtml
+# and 
+# http://geant4.slac.stanford.edu/SLACTutorial09/ChoosingPhysicsList.ppt
+#
+# The list of available physics lists is output during WCSim initialization.
+# A "WCSim" physics list is provided in addition to the Gean4 lists for backwards-compatibility
+# uncomment one line below to choose the physics list
+#
+#/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
 
 
-# Then choose the appropriate physics lists:
 
-#/WCSim/physics/list QGSP_BIC_HP #preferred?
-/WCSim/physics/list WCSim #old list
-#/WCSim/physics/list LBE # now working

jobOptions2.mac

@@ -0,0 +1,14 @@
+# This file is required only if the WCSim physics list is selected in jobOptions.mac
+# If the WCSim physics list is not selected, setting /WCSim/physics/secondaries/model
+# will fail and any lines below that point will not be read.
+#
+# Choose hadronic interaction model.
+# Note: WCSim physics list only
+# Note2: Probably broken because this file is read before WCSim object instantiation
+# Options:
+#   GHEISHA   (Original Geant4 model)
+#   BERTINI   (Bertini intra-nuclear cascade model)
+#   BINARY    (Binary intra-nuclear cascade model) -- this is the default
+/WCSim/physics/secondaries/model BINARY
+# Do not put any commands below this line
+