Changeset 1342 for trunk/examples/extended/field/field04/src

Timestamp:

Nov 5, 2010, 4:08:39 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/examples/extended/field/field04/src

Files:

• F04OpticalPhysics.cc (modified) (3 diffs)
• F04PhysicsList.cc (modified) (2 diffs)

trunk/examples/extended/field/field04/src/F04OpticalPhysics.cc

@@ -34 +34 @@
 #include "G4OpAbsorption.hh"
 #include "G4OpRayleigh.hh"
+#include "G4OpMieHG.hh"
 #include "G4OpBoundaryProcess.hh"
 #include "G4OpWLS.hh"
@@ -66 +67 @@
   G4OpAbsorption* theAbsorptionProcess= new G4OpAbsorption();
   G4OpRayleigh* theRayleighScattering = new G4OpRayleigh();
+  G4OpMieHG* theMieHGScatteringProcess = new G4OpMieHG();
   G4OpBoundaryProcess* theBoundaryProcess = new G4OpBoundaryProcess();
   G4OpWLS* theWLSProcess=new G4OpWLS();
@@ -82 +84 @@
   pManager->AddDiscreteProcess(theAbsorptionProcess);
   pManager->AddDiscreteProcess(theRayleighScattering);
+  pManager->AddDiscreteProcess(theMieHGScatteringProcess);
 
   theBoundaryProcess->SetModel(unified);

trunk/examples/extended/field/field04/src/F04PhysicsList.cc

@@ -56 +56 @@
 #include "G4MuonRadiativeDecayChannelWithSpin.hh"
 
-F04PhysicsList::F04PhysicsList(G4String physicsList) : G4VModularPhysicsList() 
+F04PhysicsList::F04PhysicsList(G4String physName) : G4VModularPhysicsList() 
 {
     G4LossTableManager::Instance();
@@ -70 +70 @@
 
     G4PhysListFactory factory;
-    G4VModularPhysicsList* phys = 0;
-
-    if(factory.IsReferencePhysList(physicsList))
-      phys =factory.GetReferencePhysList(physicsList);
+    G4VModularPhysicsList* phys = NULL;
+
+    if (factory.IsReferencePhysList(physName))
+       phys =factory.GetReferencePhysList(physName);
 
     // Physics List is defined via environment variable PHYSLIST
-    if(!phys) phys = factory.ReferencePhysList();
+    if (!phys) phys = factory.ReferencePhysList();
+
+    if (!phys) G4Exception("WLSPhysicsList::WLSPhysicsList","InvalidSetup",
+                              FatalException,"PhysicsList does not exist");
 
     for (G4int i = 0; ; ++i) {