Merging -r 256:270 of branches/dev/PhysicsLists into trunk. Users should not see any change in functionality; The default physics list is the former WCSimPhysicsList. One minor bug is the WCSim hadronic model (GHEISHA, BERTINI, BINARY) is no longer selectable from jobOptions.mac since the physics list isn't yet instantiated when this macro is read. BINARY is the default. Suggestions are welcome.

Author: David Webber

GNUmakefile

@@ -58,7 +58,9 @@ libWCSim.a : $(ROOTOBJS)
 	$(RM) $@
 	ar clq $@ $(ROOTOBJS) 
 
-rootcint : $(ROOTSRC)
+./src/WCSimRootDict.cc : $(ROOTSRC)
 	rootcint  -f ./src/WCSimRootDict.cc -c -I./include -I$(shell root-config --incdir) WCSimRootEvent.hh WCSimRootGeom.hh  WCSimPmtInfo.hh WCSimRootLinkDef.hh
 
+rootcint: ./src/WCSimRootDict.cc
+
 include $(G4INSTALL)/config/binmake.gmk

WCSim.cc

@@ -6,6 +6,8 @@
 #include "WCSimDetectorConstruction.hh"
 #include "WCSimPhysicsList.hh"
 #include "WCSimPhysicsMessenger.hh"
+#include "WCSimPhysicsListFactory.hh"
+#include "WCSimPhysicsListFactoryMessenger.hh"
 #include "WCSimTuningParameters.hh"
 #include "WCSimTuningMessenger.hh"
 #include "WCSimPrimaryGeneratorAction.hh"
@@ -24,7 +26,7 @@ int main(int argc,char** argv)
 
   // get the pointer to the UI manager
   G4UImanager* UI = G4UImanager::GetUIpointer();
-  
+
   // Set up the tuning parameters that need to be read before the detector
   //  construction is done
   WCSimTuningParameters* tuningpars = new WCSimTuningParameters();
@@ -41,7 +43,9 @@ int main(int argc,char** argv)
 
   runManager->SetUserInitialization(WCSimdetector);
 
-  runManager->SetUserInitialization(new WCSimPhysicsList);
+  // Added selectable physics lists 2010-07 by DMW
+  // Set up the messenger hooks here, initialize the actual list after loading jobOptions.mac
+  WCSimPhysicsListFactory *physFactory = new WCSimPhysicsListFactory();
 
   //=================================
   // Added by JLR 2005-07-05
@@ -53,6 +57,10 @@ int main(int argc,char** argv)
   // 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);
+
   // Visualization
   G4VisManager* visManager = new WCSimVisManager;
   visManager->Initialize();
@@ -62,19 +70,19 @@ int main(int argc,char** argv)
     WCSimPrimaryGeneratorAction(WCSimdetector);
   runManager->SetUserAction(myGeneratorAction);
 
-  
 
   WCSimRunAction* myRunAction = new WCSimRunAction(WCSimdetector);
   runManager->SetUserAction(myRunAction);
 
   runManager->SetUserAction(new WCSimEventAction(myRunAction, WCSimdetector,
-						  myGeneratorAction));
+        myGeneratorAction));
   runManager->SetUserAction(new WCSimTrackingAction);
 
   runManager->SetUserAction(new WCSimStackingAction(WCSimdetector));
 
   runManager->SetUserAction(new WCSimSteppingAction);
 
+
   // Initialize G4 kernel
   runManager->Initialize();
 
@@ -83,13 +91,13 @@ int main(int argc,char** argv)
 
     // Start UI Session
     G4UIsession* session =  new G4UIterminal(new G4UItcsh);
-    
+
     // Visualization Macro
     UI->ApplyCommand("/control/execute vis.mac");
 
     // Start Interactive Mode
     session->SessionStart();
-    
+
     delete session;
   }
   else           // Batch mode

include/WCSimPhysicsList.hh

@@ -1,11 +1,13 @@
 
 #ifndef WCSimPhysicsList_h
 #define WCSimPhysicsList_h 1
-#include "G4VUserPhysicsList.hh"
+//#include "G4VUserPhysicsList.hh"
+#include "G4VPhysicsConstructor.hh"
 #include "WCSimPhysicsMessenger.hh"
 #include "globals.hh"
 
-class WCSimPhysicsList: public G4VUserPhysicsList
+//class WCSimPhysicsList: public G4VUserPhysicsList
+class WCSimPhysicsList: public G4VPhysicsConstructor
 {
   public:
     WCSimPhysicsList();

include/WCSimPhysicsListFactory.hh

@@ -0,0 +1,38 @@
+#ifndef WCSimPhysicsListFactory_h
+#define WCSimPhysicsListFactory_h 1
+
+#include "globals.hh"
+#include "G4VModularPhysicsList.hh"
+#include "G4PhysListFactory.hh"
+#include "G4UnitsTable.hh"
+#include "G4OpticalPhysics.hh"
+
+#include "WCSimPhysicsListFactoryMessenger.hh"
+#include "WCSimPhysicsList.hh"
+
+//class WCSimPhysicsList;
+
+class WCSimPhysicsListFactory : public G4VModularPhysicsList
+{
+  public:
+    WCSimPhysicsListFactory();
+    ~WCSimPhysicsListFactory();
+
+    void SetList(G4String newvalue);  // called by messenger
+    void InitializeList();
+
+    //G4String GetPhysicsListName() {return PhysicsListName;}
+
+    void ConstructParticle();
+    void ConstructProcess();
+    void SetCuts();
+  private:
+
+    G4String PhysicsListName;
+    G4String ValidListsString;
+
+    WCSimPhysicsListFactoryMessenger* PhysicsMessenger;
+    G4PhysListFactory* factory;
+};
+
+#endif

include/WCSimPhysicsListFactoryMessenger.hh

@@ -0,0 +1,29 @@
+#ifndef WCSimPhysicsListFactoryMessenger_h
+#define WCSimPhysicsListFactoryMessenger_h 1
+
+#include "globals.hh"
+#include "G4UImessenger.hh"
+
+class WCSimPhysicsListFactory;
+class G4UIdirectory;
+class G4UIcommand;
+class G4UIcmdWithAString;
+
+class WCSimPhysicsListFactoryMessenger: public G4UImessenger
+{
+public:
+  WCSimPhysicsListFactoryMessenger(WCSimPhysicsListFactory*, G4String);
+  ~WCSimPhysicsListFactoryMessenger();
+
+  void SetNewValue(G4UIcommand* command, G4String newValue);
+
+private:
+  WCSimPhysicsListFactory* thisWCSimPhysicsListFactory;
+  G4String ValidListsString;
+
+  G4UIdirectory*      WCSimDir;
+  G4UIcmdWithAString* physListCmd;
+
+};
+
+#endif

jobOptions.mac

@@ -1,6 +1,14 @@
+#/WCSim/physics/list QGSP_BIC_HP #preferred?
+/WCSim/physics/list WCSim #old list
+#/WCSim/physics/list LBE #broken
+
+
 # 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
+

src/WCSimPhysicsList.cc

@@ -24,9 +24,10 @@
 #include "G4HadronCaptureProcess.hh" //amb79
 
 
-WCSimPhysicsList::WCSimPhysicsList():  G4VUserPhysicsList(), PhysicsMessenger(0)
+//WCSimPhysicsList::WCSimPhysicsList():  G4VUserPhysicsList(), PhysicsMessenger(0)
+WCSimPhysicsList::WCSimPhysicsList():  G4VPhysicsConstructor(), PhysicsMessenger(0)
 {
- defaultCutValue = 1.0*mm;
+ //defaultCutValue = 1.0*mm;
  SetVerboseLevel(1);
 
  PhysicsMessenger = new WCSimPhysicsMessenger(this);
@@ -60,7 +61,7 @@ void WCSimPhysicsList::ConstructParticle()
 
 void WCSimPhysicsList::ConstructProcess()
 {
-  AddTransportation();
+  //AddTransportation();
   ConstructEM();
   ConstructlArStepLimiter();
   ConstructGeneral();
@@ -721,7 +722,7 @@ void WCSimPhysicsList::SetSecondaryHad(G4String hadval)
 }
 
 //----set cut values----
-
+/*
 void WCSimPhysicsList::SetCuts()
 {
   if (verboseLevel >0){
@@ -738,3 +739,4 @@ void WCSimPhysicsList::SetCuts()
 
   if (verboseLevel>0) DumpCutValuesTable();
 }
+*/

src/WCSimPhysicsListFactory.cc

@@ -0,0 +1,95 @@
+#include "WCSimPhysicsListFactory.hh"
+
+/* This code draws upon examples/extended/fields/field04 for inspiration */
+
+
+
+WCSimPhysicsListFactory::WCSimPhysicsListFactory() :  G4VModularPhysicsList()
+{
+ defaultCutValue = 1.0*mm;
+ SetVerboseLevel(1);
+ 
+ PhysicsListName="NULL_LIST"; // default list is set in WCSimPhysicsListFactoryMessenger to QGSP_BERT
+ factory = new G4PhysListFactory();
+ // TODO create opticalPhyscics object?
+ 
+ std::vector<G4String> ValidListsVector = factory->AvailablePhysLists();
+ ValidListsVector.push_back("WCSim");// add deprecated WCSimPhysicsList.cc as a selectable option
+ G4int nlists = ValidListsVector.size();
+ G4cout << "There are " << nlists << " available physics lists, and they are: " << G4endl;
+ for (G4int i=0; i<nlists; i++){
+   G4cout << "  " << ValidListsVector[i] << G4endl;
+   ValidListsString += ValidListsVector[i];
+   ValidListsString += " ";
+ }
+ //G4cout << "ValidListsString=" << ValidListsString << G4endl;
+
+ PhysicsMessenger = new WCSimPhysicsListFactoryMessenger(this, ValidListsString);
+
+}
+
+WCSimPhysicsListFactory::~WCSimPhysicsListFactory()
+{
+  delete PhysicsMessenger;
+  PhysicsMessenger = NULL;
+
+}
+
+void WCSimPhysicsListFactory::ConstructParticle()
+{
+  G4VModularPhysicsList::ConstructParticle();
+}
+
+void WCSimPhysicsListFactory::ConstructProcess()
+{
+  G4VModularPhysicsList::ConstructProcess();
+}
+
+void WCSimPhysicsListFactory::SetCuts()
+{
+  // same as WCSimPhysicsList
+  if (verboseLevel >0){
+    G4cout << "WCSimPhysicsListFactory::SetCuts:";
+    G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl;
+  }
+
+  // set cut values for gamma at first and for e- second and next for e+,
+  // because some processes for e+/e- need cut values for gamma
+  //
+  SetCutValue(defaultCutValue, "gamma");
+  SetCutValue(defaultCutValue, "e-");
+  SetCutValue(defaultCutValue, "e+");
+
+  if (verboseLevel>0) DumpCutValuesTable();
+
+}
+
+void WCSimPhysicsListFactory::SetList(G4String newvalue){
+  G4cout << "Setting Physics list to " << newvalue << " and delaying initialization" << G4endl;
+  PhysicsListName = newvalue;
+}
+
+void WCSimPhysicsListFactory::InitializeList(){
+  G4cout << "Initializing physics list " << PhysicsListName << G4endl;
+
+  G4VModularPhysicsList* phys = 0;
+
+  if (factory->IsReferencePhysList(PhysicsListName)) {
+    phys=factory->GetReferencePhysList(PhysicsListName);
+    for (G4int i = 0; ; ++i) {
+      G4VPhysicsConstructor* elem =
+        const_cast<G4VPhysicsConstructor*> (phys->GetPhysics(i));
+      if (elem == NULL) break;
+      G4cout << "RegisterPhysics: " << elem->GetPhysicsName() << G4endl;
+      RegisterPhysics(elem);
+    }
+    G4cout << "RegisterPhysics: OpticalPhysics" << G4endl; 
+    RegisterPhysics(new G4OpticalPhysics());
+  } else if (PhysicsListName == "WCSim") {
+    //G4cout << "WCSim physics list not yet implemented" << G4endl;
+    G4cout << "RegisterPhysics: WCSim" << G4endl; 
+    RegisterPhysics(new WCSimPhysicsList());
+  } else {
+    G4cout << "Physics list " << PhysicsListName << " is not understood" << G4endl;
+  }
+} 

src/WCSimPhysicsListFactoryMessenger.cc

@@ -0,0 +1,41 @@
+#include "WCSimPhysicsListFactoryMessenger.hh"
+#include "WCSimPhysicsListFactory.hh"
+
+#include "G4UIdirectory.hh"
+#include "G4ios.hh"
+#include "globals.hh"
+#include "G4UIcmdWithAString.hh"
+
+WCSimPhysicsListFactoryMessenger::WCSimPhysicsListFactoryMessenger(WCSimPhysicsListFactory* WCSimPhysFactory, G4String inValidListsString)
+  :thisWCSimPhysicsListFactory(WCSimPhysFactory), ValidListsString(inValidListsString)
+{
+ 
+//  G4String defaultList="QGSP_BIC_HP";
+  G4String defaultList="WCSim";
+  
+  physListCmd = new G4UIcmdWithAString("/WCSim/physics/list",this);
+  G4String cmd_hint = "Available options: " + ValidListsString;
+  physListCmd->SetGuidance(cmd_hint);
+  physListCmd->SetGuidance("See http://geant4.cern.ch/support/proc_mod_catalog/physics_lists/useCases.shtml");
+  physListCmd->SetGuidance("    http://geant4.cern.ch/support/proc_mod_catalog/physics_lists/referencePL.shtml");
+  physListCmd->SetGuidance("Note: The WCSim option selects a deprecated physics list, but is useful for comparisons");
+  physListCmd->SetGuidance("Note: I think physics list is locked-in after initialization");
+  
+  physListCmd->SetDefaultValue(defaultList);
+  physListCmd->SetCandidates(ValidListsString);  // TODO get list of physics lists from G4PhysicsListFactory
+
+  SetNewValue(physListCmd, defaultList);
+}
+
+WCSimPhysicsListFactoryMessenger::~WCSimPhysicsListFactoryMessenger()
+{
+  delete physListCmd;
+  //delete WCSimDir;
+}
+
+void WCSimPhysicsListFactoryMessenger::SetNewValue(G4UIcommand* command, G4String newValue)
+{
+  if (command == physListCmd)
+    thisWCSimPhysicsListFactory->SetList(newValue);
+
+}

vis.mac

@@ -29,7 +29,7 @@
 /WCSim/SavePi0 false
 
 /vis/scene/create
-/vis/open OGLIX
+/vis/open OGLSX
 /vis/viewer/set/upVector 0 0 1
 /vis/viewer/set/viewpointThetaPhi 45 45 deg
 #/vis/viewer/set/viewpointThetaPhi 120 90 deg