Changeset 1230 for trunk/examples/extended/medical

Timestamp:

Jan 8, 2010, 3:02:48 PM (15 years ago)

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/extended/medical

Files:

• DICOM/dicom.cc (modified) (2 diffs)
• DICOM/include/DicomDetectorConstruction.hh (modified) (1 diff)
• DICOM/include/DicomNestedPhantomParameterisation.hh (modified) (2 diffs)
• DICOM/src/DicomDetectorConstruction.cc (modified) (1 diff)
• DICOM/src/DicomNestedPhantomParameterisation.cc (modified) (9 diffs)
• DICOM/src/DicomPhysicsList.cc (modified) (1 diff)
• DICOM/src/DicomPrimaryGeneratorAction.cc (modified) (1 diff)
• DICOM/src/RegularDicomDetectorConstruction.cc (modified) (1 diff)
• DICOM/vis.mac (modified) (2 diffs)
• GammaTherapy/GNUmakefile (modified) (2 diffs)
• GammaTherapy/include/EventActionMessenger.hh (modified) (1 diff)
• GammaTherapy/include/G4StepLimiterBuilder.hh (modified) (1 diff)
• GammaTherapy/include/G4StepLimiterMessenger.hh (modified) (1 diff)
• GammaTherapy/include/G4StepLimiterPerRegion.hh (modified) (1 diff)
• GammaTherapy/include/ParticlesBuilder.hh (modified) (1 diff)
• GammaTherapy/include/PhysListEmLivermore.hh (modified) (1 diff)
• GammaTherapy/include/PhysListEmPenelope.hh (modified) (1 diff)
• GammaTherapy/include/PhysicsList.hh (modified) (1 diff)
• GammaTherapy/include/PhysicsListMessenger.hh (modified) (1 diff)
• GammaTherapy/src/EventActionMessenger.cc (modified) (1 diff)
• GammaTherapy/src/G4StepLimiterBuilder.cc (modified) (1 diff)
• GammaTherapy/src/G4StepLimiterMessenger.cc (modified) (1 diff)
• GammaTherapy/src/G4StepLimiterPerRegion.cc (modified) (1 diff)
• GammaTherapy/src/ParticlesBuilder.cc (modified) (1 diff)
• GammaTherapy/src/PhysListEmLivermore.cc (modified) (1 diff)
• GammaTherapy/src/PhysListEmPenelope.cc (modified) (1 diff)
• GammaTherapy/src/PhysicsList.cc (modified) (3 diffs)
• GammaTherapy/src/PhysicsListMessenger.cc (modified) (1 diff)
• GammaTherapy/vis.mac (modified) (1 diff)
• fanoCavity/GNUmakefile (modified) (3 diffs)
• fanoCavity/fanoCavity.cc (modified) (1 diff)
• fanoCavity/include/DetectorConstruction.hh (modified) (1 diff)
• fanoCavity/include/DetectorMessenger.hh (modified) (1 diff)
• fanoCavity/include/EventAction.hh (modified) (1 diff)
• fanoCavity/include/EventActionMessenger.hh (modified) (1 diff)
• fanoCavity/include/HistoManager.hh (modified) (1 diff)
• fanoCavity/include/HistoMessenger.hh (modified) (1 diff)
• fanoCavity/include/MyKleinNishinaCompton.hh (modified) (3 diffs)
• fanoCavity/include/MyMollerBhabhaModel.hh (modified) (1 diff)
• fanoCavity/include/PhysicsList.hh (modified) (3 diffs)
• fanoCavity/include/PhysicsListMessenger.hh (modified) (4 diffs)
• fanoCavity/include/PrimaryGeneratorAction.hh (modified) (1 diff)
• fanoCavity/include/PrimaryGeneratorMessenger.hh (modified) (1 diff)
• fanoCavity/include/ProcessesCount.hh (modified) (1 diff)
• fanoCavity/include/RunAction.hh (modified) (1 diff)
• fanoCavity/include/StackingAction.hh (modified) (1 diff)
• fanoCavity/include/StackingMessenger.hh (modified) (1 diff)
• fanoCavity/include/StepMax.hh (modified) (1 diff)
• fanoCavity/include/StepMaxMessenger.hh (modified) (1 diff)
• fanoCavity/include/SteppingAction.hh (modified) (1 diff)
• fanoCavity/include/SteppingVerbose.hh (modified) (1 diff)
• fanoCavity/include/TrackingAction.hh (modified) (1 diff)
• fanoCavity/run01.mac (modified) (2 diffs)
• fanoCavity/src/DetectorConstruction.cc (modified) (1 diff)
• fanoCavity/src/DetectorMessenger.cc (modified) (1 diff)
• fanoCavity/src/EventAction.cc (modified) (1 diff)
• fanoCavity/src/EventActionMessenger.cc (modified) (1 diff)
• fanoCavity/src/HistoManager.cc (modified) (3 diffs)
• fanoCavity/src/HistoMessenger.cc (modified) (1 diff)
• fanoCavity/src/MyKleinNishinaCompton.cc (modified) (4 diffs)
• fanoCavity/src/MyMollerBhabhaModel.cc (modified) (1 diff)
• fanoCavity/src/PhysicsList.cc (modified) (7 diffs)
• fanoCavity/src/PhysicsListMessenger.cc (modified) (5 diffs)
• fanoCavity/src/PrimaryGeneratorAction.cc (modified) (1 diff)
• fanoCavity/src/PrimaryGeneratorMessenger.cc (modified) (1 diff)
• fanoCavity/src/RunAction.cc (modified) (2 diffs)
• fanoCavity/src/StackingAction.cc (modified) (1 diff)
• fanoCavity/src/StackingMessenger.cc (modified) (1 diff)
• fanoCavity/src/StepMax.cc (modified) (1 diff)
• fanoCavity/src/StepMaxMessenger.cc (modified) (1 diff)
• fanoCavity/src/SteppingAction.cc (modified) (1 diff)
• fanoCavity/src/SteppingVerbose.cc (modified) (1 diff)
• fanoCavity/src/TrackingAction.cc (modified) (1 diff)
• fanoCavity2/GNUmakefile (modified) (3 diffs)
• fanoCavity2/basic.mac (modified) (3 diffs)
• fanoCavity2/essai.mac (modified) (1 diff)
• fanoCavity2/fanoCavity2.cc (modified) (1 diff)
• fanoCavity2/include/DetectorConstruction.hh (modified) (1 diff)
• fanoCavity2/include/DetectorMessenger.hh (modified) (1 diff)
• fanoCavity2/include/EventAction.hh (modified) (1 diff)
• fanoCavity2/include/EventActionMessenger.hh (modified) (1 diff)
• fanoCavity2/include/HistoManager.hh (modified) (1 diff)
• fanoCavity2/include/HistoMessenger.hh (modified) (1 diff)
• fanoCavity2/include/MyMollerBhabhaModel.hh (modified) (1 diff)
• fanoCavity2/include/PhysicsList.hh (modified) (4 diffs)
• fanoCavity2/include/PhysicsListMessenger.hh (modified) (4 diffs)
• fanoCavity2/include/PrimaryGeneratorAction.hh (modified) (1 diff)
• fanoCavity2/include/ProcessesCount.hh (modified) (1 diff)
• fanoCavity2/include/RunAction.hh (modified) (1 diff)
• fanoCavity2/include/StepMax.hh (modified) (1 diff)
• fanoCavity2/include/StepMaxMessenger.hh (modified) (1 diff)
• fanoCavity2/include/SteppingAction.hh (modified) (1 diff)
• fanoCavity2/include/SteppingVerbose.hh (modified) (1 diff)
• fanoCavity2/include/TrackingAction.hh (modified) (1 diff)
• fanoCavity2/run01.mac (modified) (1 diff)
• fanoCavity2/src/DetectorConstruction.cc (modified) (1 diff)
• fanoCavity2/src/DetectorMessenger.cc (modified) (1 diff)
• fanoCavity2/src/EventAction.cc (modified) (1 diff)
• fanoCavity2/src/EventActionMessenger.cc (modified) (1 diff)
• fanoCavity2/src/HistoManager.cc (modified) (3 diffs)
• fanoCavity2/src/HistoMessenger.cc (modified) (1 diff)
• fanoCavity2/src/MyMollerBhabhaModel.cc (modified) (1 diff)
• fanoCavity2/src/PhysicsList.cc (modified) (7 diffs)
• fanoCavity2/src/PhysicsListMessenger.cc (modified) (5 diffs)
• fanoCavity2/src/PrimaryGeneratorAction.cc (modified) (1 diff)
• fanoCavity2/src/RunAction.cc (modified) (1 diff)
• fanoCavity2/src/StepMax.cc (modified) (1 diff)
• fanoCavity2/src/StepMaxMessenger.cc (modified) (1 diff)
• fanoCavity2/src/SteppingAction.cc (modified) (1 diff)
• fanoCavity2/src/SteppingVerbose.cc (modified) (1 diff)
• fanoCavity2/src/TrackingAction.cc (modified) (1 diff)
• fanoCavity2/stepfunction.mac (modified) (1 diff)

trunk/examples/extended/medical/DICOM/dicom.cc

@@ -56 +56 @@
 #include "DicomPrimaryGeneratorAction.hh"
 #include "DicomEventAction.hh"
+#include "DicomRunAction.hh"
 #include "DicomHandler.hh"
 
@@ -77 +78 @@
   runManager->SetUserInitialization(theGeometry);
   runManager->SetUserAction(new DicomPrimaryGeneratorAction());
-  //  runManager->SetUserAction(new DicomEventAction);
+  runManager->SetUserAction(new DicomRunAction);
+  runManager->SetUserAction(new DicomEventAction);
 
   runManager->Initialize();

trunk/examples/extended/medical/DICOM/include/DicomDetectorConstruction.hh

@@ -79 +79 @@
   // construct the patient volumes. This method should be implemented for each of the derived classes
 
+  void SetScorer(G4LogicalVolume* voxel_logic);
+
 protected:
   G4Material* air;

trunk/examples/extended/medical/DICOM/include/DicomNestedPhantomParameterisation.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-#ifndef RE02NESTEDPARAMETERISATION_HH
-#define RE02NESTEDPARAMETERISATION_HH
+// $Id: DicomNestedPhantomParameterisation.hh,v 1.3 2009/01/27 10:44:58 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
+//
+// --------------------------------------------------------------------
+#ifndef DICOMNESTEDPARAMETERISATION_HH
+#define DICOMNESTEDPARAMETERISATION_HH
+
+#include <vector>
 
 #include "G4Types.hh"
+#include "G4ThreeVector.hh"
 #include "G4VNestedParameterisation.hh" 
-#include "G4ThreeVector.hh"
-#include <vector>
 
 class G4VPhysicalVolume;
@@ -52 +57 @@
 class G4Hype;
 
-class DicomNestedPhantomParameterisation: public G4VNestedParameterisation
+class DicomNestedPhantomParameterisation : public G4VNestedParameterisation
 {
-  public:  // with description
+  public:
 
     DicomNestedPhantomParameterisation(const G4ThreeVector& voxelSize,
-                                      std::vector<G4Material*>& mat);
+                                       std::vector<G4Material*>& mat);
     virtual ~DicomNestedPhantomParameterisation(); 
 
-    // Methods required in derived classes
-    // -----------------------------------
-    virtual G4Material* ComputeMaterial(G4VPhysicalVolume *currentVol,
-                                        const G4int repNo, 
-                                        const G4VTouchable *parentTouch=0
-                                        );
-  // Required method, as it is the reason for this class.
-  //   Must cope with parentTouch=0 for navigator's SetupHierarchy
+    G4Material* ComputeMaterial(G4VPhysicalVolume *currentVol,
+                                const G4int repNo, 
+                                const G4VTouchable *parentTouch );
+      // Must cope with parentTouch for navigator's SetupHierarchy
 
-    virtual G4int       GetNumberOfMaterials() const;
-    virtual G4Material* GetMaterial(G4int idx) const;
+    G4int       GetNumberOfMaterials() const;
+    G4Material* GetMaterial(G4int idx) const;
       // Needed to define materials for instances of Nested Parameterisation 
-      //   Current convention: each call should return the materials 
-      //   of all instances with the same mother/ancestor volume.
+      // Current convention: each call should return the materials 
+      // of all instances with the same mother/ancestor volume
+
     size_t GetMaterialIndex( size_t nx, size_t ny, size_t nz) const;
     size_t GetMaterialIndex( size_t copyNo) const;
-    void SetMaterialIndices( size_t* matInd ){
-      fMaterialIndices = matInd; }
+    void SetMaterialIndices( size_t* matInd ) { fMaterialIndices = matInd; }
     void SetNoVoxel( size_t nx, size_t ny, size_t nz );
 
-    virtual void ComputeTransformation(const G4int no,
-                                       G4VPhysicalVolume *currentPV) const;
-
-    // Methods optional in derived classes
-    // -----------------------------------
+    void ComputeTransformation(const G4int no,
+                                     G4VPhysicalVolume *currentPV) const;
 
     // Additional standard Parameterisation methods, 
-    //   which can be optionally defined, in case solid is used.
+    // which can be optionally defined, in case solid is used.
 
-    virtual void ComputeDimensions(G4Box &,
-                                   const G4int,
-                                   const G4VPhysicalVolume *) const;
+    void ComputeDimensions(G4Box &, const G4int,
+                                    const G4VPhysicalVolume *) const;
 
-private:  // Dummy declarations to get rid of warnings ...
-  void ComputeDimensions (G4Trd&,const G4int,const G4VPhysicalVolume*) 
-    const {}
-  void ComputeDimensions (G4Trap&,const G4int,const G4VPhysicalVolume*) 
-    const {}
-  void ComputeDimensions (G4Cons&,const G4int,const G4VPhysicalVolume*) 
-    const {}
-  void ComputeDimensions (G4Sphere&,const G4int,const G4VPhysicalVolume*) 
-    const {}
-  void ComputeDimensions (G4Orb&,const G4int,const G4VPhysicalVolume*) 
-    const {}
-  void ComputeDimensions (G4Torus&,const G4int,const G4VPhysicalVolume*) 
-    const {}
-  void ComputeDimensions (G4Para&,const G4int,const G4VPhysicalVolume*) 
-    const {}
-  void ComputeDimensions (G4Hype&,const G4int,const G4VPhysicalVolume*) 
-    const {}
-  void ComputeDimensions (G4Tubs&,const G4int,const G4VPhysicalVolume*) 
-    const {}
-  void ComputeDimensions (G4Polycone&,const G4int,const G4VPhysicalVolume*)
-    const {}
-  void ComputeDimensions (G4Polyhedra&,const G4int,const G4VPhysicalVolume*) 
-    const {}
+  private:  // Dummy declarations to get rid of warnings ...
 
-private:
-  G4double fdX,fdY,fdZ;
-  G4int fnX,fnY,fnZ;
-  
-  //
-  std::vector<G4Material*> fMaterials;
+    void ComputeDimensions (G4Trd&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Trap&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Cons&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Sphere&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Orb&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Torus&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Para&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Hype&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Tubs&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Polycone&, const G4int,
+                            const G4VPhysicalVolume*) const {}
+    void ComputeDimensions (G4Polyhedra&, const G4int,
+                            const G4VPhysicalVolume*) const {}
 
-  size_t* fMaterialIndices;
-      // Index in fMaterials that correspond to each voxel.
+  private:
+
+    G4double fdX,fdY,fdZ;
+    G4int fnX,fnY,fnZ;
+    std::vector<G4Material*> fMaterials;
+    size_t* fMaterialIndices; // Index in materials corresponding to each voxel
 };
 

trunk/examples/extended/medical/DICOM/src/DicomDetectorConstruction.cc

@@ -451 +451 @@
 }
 
+
+#include "G4SDManager.hh"
+#include "G4MultiFunctionalDetector.hh"
+#include "G4PSDoseDeposit_RegNav.hh"
+
+//-------------------------------------------------------------
+void DicomDetectorConstruction::SetScorer(G4LogicalVolume* voxel_logic)
+{
+
+  G4SDManager* SDman = G4SDManager::GetSDMpointer();
+  //
+  // Sensitive Detector Name
+  G4String concreteSDname = "PatientSD";
+
+  //------------------------
+  // MultiFunctionalDetector
+  //------------------------
+  //
+  // Define MultiFunctionalDetector with name.
+  G4MultiFunctionalDetector* MFDet = new G4MultiFunctionalDetector(concreteSDname);
+  SDman->AddNewDetector( MFDet );                 // Register SD to SDManager
+
+  voxel_logic->SetSensitiveDetector(MFDet);
+
+  G4PSDoseDeposit_RegNav*   scorer = new G4PSDoseDeposit_RegNav("DoseDeposit");  
+  MFDet->RegisterPrimitive(scorer);
+
+}
+

trunk/examples/extended/medical/DICOM/src/DicomNestedPhantomParameterisation.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-///////////////////////////////////////////////////////////////////////////////
+// $Id: DicomNestedPhantomParameterisation.cc,v 1.5 2009/01/27 10:44:58 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
+//
+// --------------------------------------------------------------------
 #include "DicomNestedPhantomParameterisation.hh"
 
@@ -34 +37 @@
 #include "G4Material.hh"
 
-DicomNestedPhantomParameterisation::DicomNestedPhantomParameterisation(
-                                                     const G4ThreeVector& voxelSize,
-                                                     std::vector<G4Material*>& mat):
-  G4VNestedParameterisation(),fdX(voxelSize.x()),fdY(voxelSize.y()),fdZ(voxelSize.z()),fMaterials(mat)
+DicomNestedPhantomParameterisation::
+DicomNestedPhantomParameterisation(const G4ThreeVector& voxelSize,
+                                         std::vector<G4Material*>& mat):
+  G4VNestedParameterisation(), fdX(voxelSize.x()),
+  fdY(voxelSize.y()), fdZ(voxelSize.z()), fMaterials(mat)
 {
   // Position of voxels. 
-  // x and y positions are already defined in DetectorConstruction 
-  // by using replicated volume. Here only we need to define is z positions of voxes.
+  // x and y positions are already defined in DetectorConstruction by using
+  // replicated volume. Here only we need to define is z positions of voxels.
 }
 
@@ -48 +52 @@
 }
 
-void DicomNestedPhantomParameterisation::SetNoVoxel( size_t nx, size_t ny, size_t nz )
+void DicomNestedPhantomParameterisation::
+SetNoVoxel( size_t nx, size_t ny, size_t nz )
 {
   fnX = nx;
@@ -58 +63 @@
 // Material assignment to geometry.
 //
-G4Material* DicomNestedPhantomParameterisation::ComputeMaterial(G4VPhysicalVolume* ,
-                                                         const G4int copyNoZ, 
-                                                         const G4VTouchable* parentTouch)
+G4Material* DicomNestedPhantomParameterisation::
+ComputeMaterial(G4VPhysicalVolume*, const G4int copyNoZ, 
+                                    const G4VTouchable* parentTouch)
 {
-  if(parentTouch==0) return fMaterials[0]; // protection for initialization and vis at idle state
+  // protection for initialization and vis at idle state
+  //
+  if(parentTouch==0) return fMaterials[0];
+
   // Copy number of voxels. 
   // Copy number of X and Y are obtained from replication number.
@@ -70 +78 @@
   G4int iz = copyNoZ;
 
-  G4int copyNo = ix + fnZ*iy + fnX*fnY*iz;
+  G4int copyNo = ix + fnX*iy + fnX*fnY*iz;
 
   size_t matIndex = GetMaterialIndex(copyNo);
 
   return fMaterials[ matIndex ];
-
 }
 
@@ -86 +93 @@
 
 //
-//  Number of Materials
-//  Material scanner is required for preparing physics tables and so on before 
-//  stating simulation, so that G4 has to know number of materials.
-G4int       DicomNestedPhantomParameterisation::GetNumberOfMaterials() const{
+// Number of Materials
+// Material scanner is required for preparing physics tables and so on before 
+// starting simulation, so that G4 has to know number of materials.
+//
+G4int DicomNestedPhantomParameterisation::GetNumberOfMaterials() const
+{
   return fMaterials.size();
 }
@@ -97 +106 @@
 //  This is needed for material scanner and realizing geometry.
 //
-G4Material* DicomNestedPhantomParameterisation::GetMaterial(G4int i) const{
+G4Material* DicomNestedPhantomParameterisation::GetMaterial(G4int i) const
+{
   return fMaterials[i];
 }
@@ -104 +114 @@
 // Transformation of voxels.
 //
-void DicomNestedPhantomParameterisation::ComputeTransformation(const G4int copyNo, 
-                                                  G4VPhysicalVolume* physVol)const{
+void DicomNestedPhantomParameterisation::
+ComputeTransformation(const G4int copyNo, G4VPhysicalVolume* physVol) const
+{
   G4ThreeVector position(0.,0.,(2*copyNo+1)*fdZ - fdZ*fnZ);
-
   physVol->SetTranslation(position);
 }
@@ -114 +124 @@
 // Dimensions are always same in this RE02 example.
 //
-void DicomNestedPhantomParameterisation::ComputeDimensions(G4Box& box, 
-                                               const G4int ,
-                                               const G4VPhysicalVolume* ) const{
+void DicomNestedPhantomParameterisation::
+ComputeDimensions( G4Box& box, const G4int, const G4VPhysicalVolume* ) const
+{
   box.SetXHalfLength(fdX);
   box.SetYHalfLength(fdY);

trunk/examples/extended/medical/DICOM/src/DicomPhysicsList.cc

@@ -54 +54 @@
 DicomPhysicsList::DicomPhysicsList():  G4VUserPhysicsList()
 {
-  defaultCutValue = 1.e-3*mm;
-  cutForGamma     = 1.e-3*mm;
+  defaultCutValue = 1.*mm;
+  cutForGamma     = 1.*mm;
   cutForElectron  = defaultCutValue;
   cutForPositron  = defaultCutValue;

trunk/examples/extended/medical/DICOM/src/DicomPrimaryGeneratorAction.cc

@@ -65 +65 @@
   G4String particleName;
   G4ParticleDefinition* particle
-    = particleTable->FindParticle(particleName="gamma");
+    = particleTable->FindParticle(particleName="e-");
   particleGun->SetParticleDefinition(particle);
-  G4ThreeVector dir(2.*CLHEP::RandFlat::shoot()-1.,2.*CLHEP::RandFlat::shoot()-1.,2.*CLHEP::RandFlat::shoot()-1);
+  // put the e- in the x direction of the patient (z in the accelerator axs) to hit patient in the central slice of the phantom
+  G4ThreeVector dir(0,1,0);
+  //G4ThreeVector dir(2.*CLHEP::RandFlat::shoot()-1.,2.*CLHEP::RandFlat::shoot()-1.,-CLHEP::RandFlat::shoot());
   dir /= dir.mag();
   particleGun->SetParticleMomentumDirection(dir);       
   particleGun->SetParticleEnergy(5.*MeV);
-  particleGun->SetParticlePosition(G4ThreeVector(0.,0.,-20.)); // put it close to the patient voxels
+  //put it at SAD = 1 m on xy plane of central slice
+  particleGun->SetParticlePosition(G4ThreeVector(0.,-99.9*cm,-27.));
+  //particleGun->SetParticlePosition(G4ThreeVector(0.,0.,-22.));
   particleGun->GeneratePrimaryVertex(anEvent);
 }

trunk/examples/extended/medical/DICOM/src/RegularDicomDetectorConstruction.cc

@@ -95 +95 @@
   //----- Set this physical volume as having a regular structure of type 1, so that G4RegularNavigation is used
   patient_phys->SetRegularStructureId(1); // if not set, G4VoxelNavigation will be used instead 
+
+  SetScorer(voxel_logic);
 }
 

trunk/examples/extended/medical/DICOM/vis.mac

@@ -3 +3 @@
 #visualisation
 /vis/scene/create
-/vis/open OGLSQT
+/vis/open OGLIX
+#/vis/open DAWNFILE
+/vis/open VRML2FILE
 /vis/viewer/update
 /vis/viewer/zoom 5
@@ -10 +12 @@
 /tracking/verbose 1
 /run/beamOn 10
+/vis/viewer/update
 

trunk/examples/extended/medical/GammaTherapy/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.2 2006/11/16 14:42:20 vnivanch Exp $
+# $Id: GNUmakefile,v 1.3 2008/06/11 15:17:57 vnivanch Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
@@ -15 +15 @@
 all: lib bin
 
-ifdef G4ANALYSIS_USE
-  CPPFLAGS += -DG4ANALYSIS_USE
-endif
-
 include $(G4INSTALL)/config/architecture.gmk
-
-ifdef G4ANALYSIS_USE
-  CPPFLAGS   += `aida-config --include`
-  LOADLIBS   += `aida-config --lib`
-endif
 
 include $(G4INSTALL)/config/binmake.gmk

trunk/examples/extended/medical/GammaTherapy/include/EventActionMessenger.hh

@@ -25 +25 @@
 //
 // $Id: EventActionMessenger.hh,v 1.2 2006/06/29 17:25:54 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/include/G4StepLimiterBuilder.hh

@@ -26 +26 @@
 //
 // $Id: G4StepLimiterBuilder.hh,v 1.2 2006/06/29 17:26:25 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/include/G4StepLimiterMessenger.hh

@@ -25 +25 @@
 //
 // $Id: G4StepLimiterMessenger.hh,v 1.2 2006/06/29 17:26:28 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/include/G4StepLimiterPerRegion.hh

@@ -25 +25 @@
 //
 // $Id: G4StepLimiterPerRegion.hh,v 1.4 2007/05/16 16:27:53 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/include/ParticlesBuilder.hh

@@ -26 +26 @@
 //
 // $Id: ParticlesBuilder.hh,v 1.2 2006/06/29 17:26:34 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 

trunk/examples/extended/medical/GammaTherapy/include/PhysListEmLivermore.hh

@@ -26 +26 @@
 //
 // $Id: PhysListEmLivermore.hh,v 1.1 2006/11/16 14:42:20 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/include/PhysListEmPenelope.hh

@@ -26 +26 @@
 //
 // $Id: PhysListEmPenelope.hh,v 1.3 2006/11/16 14:42:20 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/include/PhysicsList.hh

@@ -25 +25 @@
 //
 // $Id: PhysicsList.hh,v 1.6 2006/11/16 14:42:20 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // Modified:

trunk/examples/extended/medical/GammaTherapy/include/PhysicsListMessenger.hh

@@ -25 +25 @@
 //
 // $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 17:26:41 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/src/EventActionMessenger.cc

@@ -25 +25 @@
 //
 // $Id: EventActionMessenger.cc,v 1.2 2006/06/29 17:27:19 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/src/G4StepLimiterBuilder.cc

@@ -26 +26 @@
 //
 // $Id: G4StepLimiterBuilder.cc,v 1.3 2006/06/29 17:27:48 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //---------------------------------------------------------------------------

trunk/examples/extended/medical/GammaTherapy/src/G4StepLimiterMessenger.cc

@@ -25 +25 @@
 //
 // $Id: G4StepLimiterMessenger.cc,v 1.2 2006/06/29 17:27:50 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/src/G4StepLimiterPerRegion.cc

@@ -25 +25 @@
 //
 // $Id: G4StepLimiterPerRegion.cc,v 1.4 2007/05/16 16:27:53 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/src/ParticlesBuilder.cc

@@ -26 +26 @@
 //
 // $Id: ParticlesBuilder.cc,v 1.3 2006/06/29 17:27:56 gunter Exp $
-// GEANT4 tag $Name:  $ 
+// GEANT4 tag $Name: geant4-09-03-cand-01 $ 
 //
 //---------------------------------------------------------------------------

trunk/examples/extended/medical/GammaTherapy/src/PhysListEmLivermore.cc

@@ -26 +26 @@
 //
 // $Id: PhysListEmLivermore.cc,v 1.1 2006/11/16 14:42:20 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/src/PhysListEmPenelope.cc

@@ -26 +26 @@
 //
 // $Id: PhysListEmPenelope.cc,v 1.3 2006/11/16 14:42:20 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/src/PhysicsList.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: PhysicsList.cc,v 1.15 2007/07/04 11:14:33 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// $Id: PhysicsList.cc,v 1.16 2008/06/11 15:17:57 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //---------------------------------------------------------------------------
@@ -50 +50 @@
 #include "G4EmStandardPhysics_option1.hh"
 #include "G4EmStandardPhysics_option2.hh"
+#include "G4EmStandardPhysics_option3.hh"
 #include "PhysListEmLivermore.hh"
 #include "PhysListEmPenelope.hh"
@@ -150 +151 @@
     G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl;
 
+  } else if (name == "emstandard_opt3" && !emBuilderIsRegisted) {
+    RegisterPhysics(new G4EmStandardPhysics_option3());
+    emBuilderIsRegisted = true;
+    G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl;
+
   } else if (name == "livermore" && !emBuilderIsRegisted) {
     RegisterPhysics(new PhysListEmLivermore());

trunk/examples/extended/medical/GammaTherapy/src/PhysicsListMessenger.cc

@@ -25 +25 @@
 //
 // $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 17:28:04 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/GammaTherapy/vis.mac

@@ -34 +34 @@
 #
 ####/vis/open DAWNFILE
-/vis/open OGLSQT
+/vis/open OGLIX
 #
 # Draw scene

trunk/examples/extended/medical/fanoCavity/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.1 2007/01/19 17:20:26 maire Exp $
+# $Id: GNUmakefile,v 1.2 2008/06/11 15:25:38 vnivanch Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
@@ -17 +17 @@
 #### G4ANALYSIS_USE := true
 
-ifdef G4ANALYSIS_USE
-  CPPFLAGS += -DG4ANALYSIS_USE
-endif
-
 include $(G4INSTALL)/config/architecture.gmk
-
-ifdef G4ANALYSIS_USE
-  # for the aida-config command see the README file
-  CPPFLAGS += `aida-config --include`
-  LOADLIBS += `aida-config --lib`
-endif
 
 include $(G4INSTALL)/config/binmake.gmk
@@ -34 +24 @@
         rm -f g4*.prim g4*.eps g4*.wrl
         rm -f .DAWN_*
-        
+
 histclean:
         rm ${G4WORKDIR}/tmp/${G4SYSTEM}/${G4TARGET}/HistoManager.o

trunk/examples/extended/medical/fanoCavity/fanoCavity.cc

@@ -25 +25 @@
 //
 // $Id: fanoCavity.cc,v 1.6 2007/10/29 17:09:53 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/DetectorConstruction.hh

@@ -25 +25 @@
 //
 // $Id: DetectorConstruction.hh,v 1.2 2007/10/08 12:05:02 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/DetectorMessenger.hh

@@ -25 +25 @@
 //
 // $Id: DetectorMessenger.hh,v 1.2 2007/10/08 12:05:02 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/EventAction.hh

@@ -25 +25 @@
 //
 // $Id: EventAction.hh,v 1.3 2007/10/29 17:09:53 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/EventActionMessenger.hh

@@ -25 +25 @@
 //
 // $Id: EventActionMessenger.hh,v 1.1 2007/01/19 17:20:26 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/HistoManager.hh

@@ -25 +25 @@
 //
 // $Id: HistoManager.hh,v 1.4 2007/11/13 11:31:54 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/HistoMessenger.hh

@@ -25 +25 @@
 //
 // $Id: HistoMessenger.hh,v 1.2 2007/11/13 11:31:54 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/MyKleinNishinaCompton.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: MyKleinNishinaCompton.hh,v 1.3 2007/05/23 08:40:21 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// $Id: MyKleinNishinaCompton.hh,v 1.4 2009/10/25 19:06:26 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -36 +36 @@
 
 class DetectorConstruction;
+class MyKleinNishinaMessenger;
 class G4ParticleChangeForGamma;
 
@@ -66 +67 @@
 protected:
 
-  DetectorConstruction* detector;
-  G4double              CrossSectionFactor;
+  DetectorConstruction*    detector;
+  MyKleinNishinaMessenger* pMessenger;
+  G4double  CrossSectionFactor;
 
 };

trunk/examples/extended/medical/fanoCavity/include/MyMollerBhabhaModel.hh

@@ -25 +25 @@
 //
 // $Id: MyMollerBhabhaModel.hh,v 1.1 2007/01/19 17:20:26 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/examples/extended/medical/fanoCavity/include/PhysicsList.hh

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: PhysicsList.hh,v 1.4 2009/10/25 19:06:26 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
-// $Id: PhysicsList.hh,v 1.3 2007/10/02 14:42:51 maire Exp $
-// GEANT4 tag $Name:  $
-//
-// 
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -36 +33 @@
 #define PhysicsList_h 1
 
-#include "G4VUserPhysicsList.hh"
+#include "G4VModularPhysicsList.hh"
 #include "globals.hh"
 
+class G4VPhysicsConstructor;
+
 class DetectorConstruction;
-class MyKleinNishinaCompton;
 class PhysicsListMessenger;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class PhysicsList: public G4VUserPhysicsList
+class PhysicsList: public G4VModularPhysicsList
 {
-  public:
-    PhysicsList(DetectorConstruction*);
-   ~PhysicsList();
+public:
+  PhysicsList(DetectorConstruction*);
+  virtual ~PhysicsList();
 
-    // Construct particle and physics
-    void ConstructParticle();
-    void ConstructProcess();
- 
-    void SetCuts();
+  void ConstructParticle();
+        
+  void AddPhysicsList(const G4String& name);    
+  void ConstructProcess();    
+  void AddStepMax(); 
+  
+  void SetCuts();      
     
-    // these methods Construct physics processes and register them
-    void ConstructEM();
-    void AddStepMax();
-    
-    void SetComptonCSfactor(G4double);
-    void SingleCoulombScattering (G4bool);    
-    void RegisterBrem (G4bool);
-    
-  private:
-    DetectorConstruction*  detector;
-    MyKleinNishinaCompton* comptonModel;
-    G4bool                 singleScattering;        
-    G4bool                 registerBrem;    
-    PhysicsListMessenger*  pMessenger;    
+private:
+
+  DetectorConstruction* detector;
+  PhysicsListMessenger* pMessenger; 
+
+  G4String emName;
+  G4VPhysicsConstructor*  emPhysicsList;
 };
 
@@ -77 +70 @@
 #endif
 
-
-

trunk/examples/extended/medical/fanoCavity/include/PhysicsListMessenger.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: PhysicsListMessenger.hh,v 1.2 2007/10/02 14:42:51 maire Exp $
-// GEANT4 tag $Name:  $
+// $Id: PhysicsListMessenger.hh,v 1.3 2009/10/25 19:06:26 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -33 +33 @@
 #define PhysicsListMessenger_h 1
 
+#include "G4UImessenger.hh"
 #include "globals.hh"
-#include "G4UImessenger.hh"
 
 class PhysicsList;
 class G4UIdirectory;
-class G4UIcmdWithADouble;
-class G4UIcmdWithABool;
+class G4UIcmdWithADoubleAndUnit;
+class G4UIcmdWithAString;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -45 +45 @@
 class PhysicsListMessenger: public G4UImessenger
 {
-  public:  
+  public:
+  
     PhysicsListMessenger(PhysicsList* );
    ~PhysicsListMessenger();
@@ -51 +52 @@
     void SetNewValue(G4UIcommand*, G4String);
     
-  private:  
-    PhysicsList*        pPhysicsList;   
-    G4UIdirectory*      physDir;        
-    G4UIcmdWithADouble* csFactor;
-    G4UIcmdWithABool*   singleScat;      
-    G4UIcmdWithABool*   brem;    
+  private:
+  
+    PhysicsList*               pPhysicsList;
+    
+    G4UIdirectory*             physDir;
+    G4UIcmdWithAString*        pListCmd;
 };
 

trunk/examples/extended/medical/fanoCavity/include/PrimaryGeneratorAction.hh

@@ -25 +25 @@
 //
 // $Id: PrimaryGeneratorAction.hh,v 1.1 2007/01/19 17:20:26 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/PrimaryGeneratorMessenger.hh

@@ -25 +25 @@
 //
 // $Id: PrimaryGeneratorMessenger.hh,v 1.1 2007/01/19 17:20:26 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/ProcessesCount.hh

@@ -26 +26 @@
 //
 // $Id: ProcessesCount.hh,v 1.1 2007/01/19 17:20:26 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/RunAction.hh

@@ -25 +25 @@
 //
 // $Id: RunAction.hh,v 1.3 2007/10/29 12:36:26 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/StackingAction.hh

@@ -25 +25 @@
 //
 // $Id: StackingAction.hh,v 1.1 2007/01/23 13:34:19 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/StackingMessenger.hh

@@ -25 +25 @@
 //
 // $Id: StackingMessenger.hh,v 1.1 2007/01/23 13:34:19 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/StepMax.hh

@@ -25 +25 @@
 //
 // $Id: StepMax.hh,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/StepMaxMessenger.hh

@@ -25 +25 @@
 //
 // $Id: StepMaxMessenger.hh,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/SteppingAction.hh

@@ -25 +25 @@
 //
 // $Id: SteppingAction.hh,v 1.4 2007/10/29 17:09:53 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/SteppingVerbose.hh

@@ -25 +25 @@
 //
 // $Id: SteppingVerbose.hh,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/include/TrackingAction.hh

@@ -25 +25 @@
 //
 // $Id: TrackingAction.hh,v 1.3 2007/10/29 17:09:53 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/run01.mac

@@ -1 @@
-# $Id: run01.mac,v 1.5 2007/10/29 17:09:53 maire Exp $
+# $Id: run01.mac,v 1.7 2009/10/25 19:06:26 maire Exp $
 #
 /control/verbose 2
 /run/verbose 2
+#
+/testem/phys/addPhysics  standard_opt3
 #
 /run/initialize
@@ -9 +11 @@
 #
 /testem/histo/setFileName fanocavity
-/testem/histo/setFileType hbook
+/testem/histo/setFileType root
 /testem/histo/setHisto  1 120 -6 +6 mm          #interaction point
 /testem/histo/setHisto  2 125  0  1250 keV      #energy spectrum

trunk/examples/extended/medical/fanoCavity/src/DetectorConstruction.cc

@@ -25 +25 @@
 //
 // $Id: DetectorConstruction.cc,v 1.3 2007/10/08 12:05:02 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 
 //

trunk/examples/extended/medical/fanoCavity/src/DetectorMessenger.cc

@@ -25 +25 @@
 //
 // $Id: DetectorMessenger.cc,v 1.3 2007/11/05 13:44:18 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/EventAction.cc

@@ -25 +25 @@
 //
 // $Id: EventAction.cc,v 1.4 2007/10/29 17:09:53 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/EventActionMessenger.cc

@@ -25 +25 @@
 //
 // $Id: EventActionMessenger.cc,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/HistoManager.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: HistoManager.cc,v 1.5 2007/11/13 11:31:54 maire Exp $
-// GEANT4 tag $Name:  $
+// $Id: HistoManager.cc,v 1.7 2008/09/28 16:04:01 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -54 +54 @@
  
   fileName[0] = "fanocavity";
-  fileType    = "hbook";
-  fileOption  = "--noErrors uncompress";  
+  fileType    = "root";
+  fileOption  = "--noErrors export=root uncompress";  
   // histograms
   for (G4int k=0; k<MaxHisto; k++) {
@@ -224 +224 @@
  if (ih > MaxHisto) {
     G4cout << "---> warning from HistoManager::RemoveHisto() : histo " << ih
-           << "does not exist" << G4endl;
+           << "does not exist  (fac = " << fac << ")"  << G4endl;
     return;
   }

trunk/examples/extended/medical/fanoCavity/src/HistoMessenger.cc

@@ -25 +25 @@
 //
 // $Id: HistoMessenger.cc,v 1.2 2007/11/13 11:31:54 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/MyKleinNishinaCompton.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: MyKleinNishinaCompton.cc,v 1.5 2007/10/01 15:19:57 maire Exp $
-// GEANT4 tag $Name:  $
+// $Id: MyKleinNishinaCompton.cc,v 1.6 2009/10/25 19:06:26 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -31 +31 @@
 
 #include "MyKleinNishinaCompton.hh"
+#include "MyKleinNishinaMessenger.hh"
 #include "DetectorConstruction.hh"
 
@@ -48 +49 @@
   :G4KleinNishinaCompton(0,nam), detector(det)
 {
-  CrossSectionFactor = 1.; 
+  CrossSectionFactor = 1.;
+  pMessenger = new MyKleinNishinaMessenger(this);    
 }
 
@@ -54 +56 @@
 
 MyKleinNishinaCompton::~MyKleinNishinaCompton()
-{}
+{  
+  delete pMessenger;  
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/examples/extended/medical/fanoCavity/src/MyMollerBhabhaModel.cc

@@ -25 +25 @@
 //
 // $Id: MyMollerBhabhaModel.cc,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/PhysicsList.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: PhysicsList.cc,v 1.18 2009/10/29 16:19:59 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
-// $Id: PhysicsList.cc,v 1.9 2007/10/02 14:42:51 maire Exp $
-// GEANT4 tag $Name:  $
-//
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -34 +32 @@
 #include "PhysicsList.hh"
 #include "PhysicsListMessenger.hh"
-#include "DetectorConstruction.hh"
+
+#include "PhysListEmStandard_option0.hh"
+#include "PhysListEmStandard_option3.hh"
+#include "PhysListEmStandard_GS.hh"
+#include "PhysListEmStandard_SS.hh"
+
+#include "StepMax.hh"
 
 #include "G4ParticleDefinition.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleTable.hh"
 
 #include "G4ProcessManager.hh"
 #include "G4LossTableManager.hh"
 
+// Bosons
+#include "G4ChargedGeantino.hh"
+#include "G4Geantino.hh"
+#include "G4Gamma.hh"
+
+// leptons
+#include "G4Electron.hh"
+#include "G4Positron.hh"
+
+// Hadrons
+#include "G4Proton.hh"
+
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 PhysicsList::PhysicsList(DetectorConstruction* det)
-: G4VUserPhysicsList(), detector(det)
+: G4VModularPhysicsList(), detector(det)
 {
-  defaultCutValue = 10.*km;
-  singleScattering = false;
-  registerBrem = false;
-  pMessenger = new PhysicsListMessenger(this);
-  SetVerboseLevel(1);
+  G4LossTableManager::Instance();
+  pMessenger = new PhysicsListMessenger(this); 
+   
+  // EM physics
+  emName = G4String("standard_opt3");
+  emPhysicsList = new PhysListEmStandard_option3(emName,detector);
+      
+  defaultCutValue = 10*km;
+
+  SetVerboseLevel(1);  
   
-  G4LossTableManager::Instance();  
+  G4LossTableManager::Instance();
 }
 
@@ -60 +80 @@
 
 PhysicsList::~PhysicsList()
-{ delete pMessenger; }
+{
+  delete emPhysicsList;
+  delete pMessenger;  
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -66 +89 @@
 void PhysicsList::ConstructParticle()
 {
+  // pseudo-particles
   G4Geantino::GeantinoDefinition();
+  G4ChargedGeantino::ChargedGeantinoDefinition();
+  
+  // gamma
   G4Gamma::GammaDefinition();
-
+  
+  // leptons
   G4Electron::ElectronDefinition();
   G4Positron::PositronDefinition();
 
-  G4Proton::ProtonDefinition();
+  // baryons
+  G4Proton::ProtonDefinition();  
 }
 
@@ -80 +109 @@
 {
   AddTransportation();
-  ConstructEM();
+  emPhysicsList->ConstructProcess();
+
   AddStepMax();
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-#include "G4ComptonScattering.hh"
-#include "MyKleinNishinaCompton.hh"
-#include "G4GammaConversion.hh"
-#include "G4PhotoElectricEffect.hh"
-
-#include "G4MultipleScattering.hh"
-#include "G4CoulombScattering.hh"
-
-#include "G4eIonisation.hh"
-#include "MyMollerBhabhaModel.hh"
-#include "G4eBremsstrahlung.hh"
-#include "G4eplusAnnihilation.hh"
-
-#include "G4hIonisation.hh"
-
-#include "G4EmProcessOptions.hh"
-#include "G4MscStepLimitType.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-
-void PhysicsList::ConstructEM()
-{
-  theParticleIterator->reset();
-  while( (*theParticleIterator)() ){
-    G4ParticleDefinition* particle = theParticleIterator->value();
-    G4ProcessManager* pmanager = particle->GetProcessManager();
-    G4String particleName = particle->GetParticleName();
-    G4int iAlong = 0, iPost = 0; 
-     
-    if (particleName == "gamma") {
-    
-      G4ComptonScattering* compton = new G4ComptonScattering();
-      compton->SetModel(comptonModel = new MyKleinNishinaCompton(detector));
-      comptonModel->SetCSFactor(1000.);
-       
-      pmanager->AddDiscreteProcess(compton);                
-      pmanager->AddDiscreteProcess(new G4PhotoElectricEffect);
-      pmanager->AddDiscreteProcess(new G4GammaConversion);
-      
-    } else if (particleName == "e-") {
-
-      if (singleScattering)
-        pmanager->AddProcess(new G4CoulombScattering,  -1, -1,       ++iPost);
-        else    
-        pmanager->AddProcess(new G4MultipleScattering, -1, ++iAlong, ++iPost);
-      
-      G4eIonisation* eIoni = new G4eIonisation();
-      eIoni->SetEmModel(new MyMollerBhabhaModel);             
-      pmanager->AddProcess(eIoni,                      -1, ++iAlong, ++iPost);
-      
-      if (registerBrem)
-        pmanager->AddProcess(new G4eBremsstrahlung,    -1, ++iAlong, ++iPost);      
-       
-    } else if (particleName == "e+") {
-    
-      if (singleScattering)
-        pmanager->AddProcess(new G4CoulombScattering,  -1, -1,       ++iPost);
-        else   
-        pmanager->AddProcess(new G4MultipleScattering, -1, ++iAlong, ++iPost);
-      
-      G4eIonisation* pIoni = new G4eIonisation();
-      pIoni->SetEmModel(new MyMollerBhabhaModel);                   
-      pmanager->AddProcess(pIoni,                      -1, ++iAlong, ++iPost);
-      
-      if (registerBrem) {
-        pmanager->AddProcess(new G4eBremsstrahlung,    -1, ++iAlong, ++iPost);
-        pmanager->AddProcess(new G4eplusAnnihilation,   0, -1,       ++iPost);
-      }
-      
-    } else if (particleName == "proton") {
-    
-      if (singleScattering)
-        pmanager->AddProcess(new G4CoulombScattering,  -1, -1,       ++iPost);
-        else   
-        pmanager->AddProcess(new G4MultipleScattering, -1, ++iAlong, ++iPost);
-        
-      pmanager->AddProcess(new G4hIonisation,          -1, ++iAlong, ++iPost);
-    }
-  }
-  
-  // Em options
-  //
-  G4EmProcessOptions emOptions;
-  
-  //multiple scattering
-  //
-  emOptions.SetMscStepLimitation(fUseDistanceToBoundary);
-  emOptions.SetSkin(2.);
-  
-  //physics tables
-  //
-  emOptions.SetMinEnergy(100*eV);    
-  emOptions.SetMaxEnergy(10*GeV);  
-  emOptions.SetDEDXBinning(800);  
-  emOptions.SetLambdaBinning(800);
-  
-  //energy loss
-  //  
-  emOptions.SetStepFunction(0.2, 10*um);
-  emOptions.SetLinearLossLimit(1.e-6);
-          
-  //build CSDA range
-  //
-  emOptions.SetBuildCSDARange(true);
-  emOptions.SetMaxEnergyForCSDARange(10*GeV);  
-  emOptions.SetDEDXBinningForCSDARange(800);    
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-#include "StepMax.hh"
 
 void PhysicsList::AddStepMax()
@@ -209 +126 @@
       G4ProcessManager* pmanager = particle->GetProcessManager();
 
-      if (stepMaxProcess->IsApplicable(*particle))
+      if (stepMaxProcess->IsApplicable(*particle) && !particle->IsShortLived())
         {
           pmanager ->AddDiscreteProcess(stepMaxProcess);
         }
+  }
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+void PhysicsList::AddPhysicsList(const G4String& name)
+{
+  if (verboseLevel>-1) {
+    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl;
+  }
+
+  if (name == emName) return;
+
+  if (name == "standard_opt0") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new PhysListEmStandard_option0(name,detector);
+    
+  } else if (name == "standard_opt3") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new PhysListEmStandard_option3(name,detector);
+    
+  } else if (name == "standard_GS") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new PhysListEmStandard_GS(name,detector);    
+    
+  } else if (name == "standard_SS") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new PhysListEmStandard_SS(name,detector);    
+  } else {
+
+    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">"
+           << " is not defined"
+           << G4endl;
   }
 }
@@ -232 +190 @@
   SetCutValue(defaultCutValue, "e-");
   SetCutValue(defaultCutValue, "e+");
+  SetCutValue(defaultCutValue, "proton");  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void PhysicsList::SetComptonCSfactor(G4double factor)
-{
-  if (comptonModel) comptonModel->SetCSFactor(factor);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void PhysicsList::SingleCoulombScattering(G4bool flag)
-{
-  singleScattering = flag;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void PhysicsList::RegisterBrem(G4bool flag)
-{
-  registerBrem = flag;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-
-
-

trunk/examples/extended/medical/fanoCavity/src/PhysicsListMessenger.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: PhysicsListMessenger.cc,v 1.2 2007/10/02 14:42:51 maire Exp $
-// GEANT4 tag $Name:  $
+// $Id: PhysicsListMessenger.cc,v 1.3 2009/10/25 19:06:26 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -33 +33 @@
 
 #include "PhysicsList.hh"
-#include "MyKleinNishinaCompton.hh"
 #include "G4UIdirectory.hh"
-#include "G4UIcmdWithADouble.hh"
-#include "G4UIcmdWithABool.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+#include "G4UIcmdWithAString.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -42 +41 @@
 PhysicsListMessenger::PhysicsListMessenger(PhysicsList* pPhys)
 :pPhysicsList(pPhys)
-{
+{ 
   physDir = new G4UIdirectory("/testem/phys/");
   physDir->SetGuidance("physics list commands");
-  
-  csFactor = new G4UIcmdWithADouble("/testem/phys/crossSectionFactor",this);
-  csFactor->SetGuidance("multiply Compton cross section");
-  csFactor->SetParameterName("factor",false);
-  csFactor->SetRange("factor>=0");
-  
-  singleScat = new G4UIcmdWithABool("/testem/phys/singleScattering",this);
-  singleScat->SetGuidance("apply single Coulomb scattering process");
-  singleScat->SetParameterName("flag",true);
-  singleScat->SetDefaultValue(true);
-  singleScat->AvailableForStates(G4State_PreInit);
-        
-  brem = new G4UIcmdWithABool("/testem/phys/registerBrem",this);
-  brem->SetGuidance("register Brems in PhysicsList");
-  brem->SetParameterName("flag",true);
-  brem->SetDefaultValue(true);
-  brem->AvailableForStates(G4State_PreInit);    
+
+  pListCmd = new G4UIcmdWithAString("/testem/phys/addPhysics",this);  
+  pListCmd->SetGuidance("Add modula physics list.");
+  pListCmd->SetParameterName("PList",false);
+  pListCmd->AvailableForStates(G4State_PreInit);
 }
 
@@ -68 +55 @@
 PhysicsListMessenger::~PhysicsListMessenger()
 {
-  delete csFactor;
-  delete singleScat;
-  delete brem;
-  delete physDir;    
+  delete pListCmd;
+  delete physDir;
 }
 
@@ -78 +63 @@
 void PhysicsListMessenger::SetNewValue(G4UIcommand* command,
                                           G4String newValue)
-{ 
-  if (command == csFactor)
-   {pPhysicsList->SetComptonCSfactor(csFactor->GetNewDoubleValue(newValue));}
-   
-  if (command == singleScat)
-   {pPhysicsList->SingleCoulombScattering(singleScat->GetNewBoolValue(newValue));}
-            
-  if (command == brem)
-   {pPhysicsList->RegisterBrem(brem->GetNewBoolValue(newValue));}      
+{           
+  if( command == pListCmd )
+   { pPhysicsList->AddPhysicsList(newValue);}
 }
 

trunk/examples/extended/medical/fanoCavity/src/PrimaryGeneratorAction.cc

@@ -25 +25 @@
 //
 // $Id: PrimaryGeneratorAction.cc,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/PrimaryGeneratorMessenger.cc

@@ -25 +25 @@
 //
 // $Id: PrimaryGeneratorMessenger.cc,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/RunAction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: RunAction.cc,v 1.3 2007/10/29 12:36:26 maire Exp $
-// GEANT4 tag $Name:  $
+// $Id: RunAction.cc,v 1.4 2009/01/22 18:34:06 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -325 +325 @@
   //
   G4double ratio = doseOverBeam/massTransfCoef;
-  G4double error = ratio*(dEoverE + dToverT);
+  G4double error = ratio*std::sqrt(dEoverE*dEoverE + dToverT*dToverT);
   
   G4cout.precision(5);  

trunk/examples/extended/medical/fanoCavity/src/StackingAction.cc

@@ -25 +25 @@
 //
 // $Id: StackingAction.cc,v 1.2 2007/03/02 11:08:41 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/StackingMessenger.cc

@@ -25 +25 @@
 //
 // $Id: StackingMessenger.cc,v 1.1 2007/01/23 13:34:19 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/StepMax.cc

@@ -25 +25 @@
 //
 // $Id: StepMax.cc,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/StepMaxMessenger.cc

@@ -25 +25 @@
 //
 // $Id: StepMaxMessenger.cc,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/SteppingAction.cc

@@ -25 +25 @@
 //
 // $Id: SteppingAction.cc,v 1.4 2007/10/29 17:09:53 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/SteppingVerbose.cc

@@ -25 +25 @@
 //
 // $Id: SteppingVerbose.cc,v 1.1 2007/01/19 17:20:27 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity/src/TrackingAction.cc

@@ -25 +25 @@
 //
 // $Id: TrackingAction.cc,v 1.4 2007/10/29 17:09:53 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.1 2007/10/15 16:20:23 maire Exp $
+# $Id: GNUmakefile,v 1.2 2008/06/11 15:27:31 vnivanch Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
@@ -17 +17 @@
 #### G4ANALYSIS_USE := true
 
-ifdef G4ANALYSIS_USE
-  CPPFLAGS += -DG4ANALYSIS_USE
-endif
-
 include $(G4INSTALL)/config/architecture.gmk
-
-ifdef G4ANALYSIS_USE
-  # for the aida-config command see the README file
-  CPPFLAGS += `aida-config --include`
-  LOADLIBS += `aida-config --lib`
-endif
 
 include $(G4INSTALL)/config/binmake.gmk
@@ -34 +24 @@
         rm -f g4*.prim g4*.eps g4*.wrl
         rm -f .DAWN_*
-        
+
 histclean:
         rm ${G4WORKDIR}/tmp/${G4SYSTEM}/${G4TARGET}/HistoManager.o

trunk/examples/extended/medical/fanoCavity2/basic.mac

@@ -1 @@
-# $Id: basic.mac,v 1.2 2007/11/05 13:19:16 maire Exp $
+# $Id: basic.mac,v 1.4 2009/10/31 18:05:56 maire Exp $
 #
 /control/verbose 2
@@ -7 +7 @@
 /testem/det/wallThickness 5 cm
 #
+/testem/phys/addPhysics standard_opt3
+#
 /run/initialize
 #
@@ -12 +14 @@
 /process/eLoss/fluct false
 #
-/gun/energy 10 keV
+/process/eLoss/StepFunction 0.2 10 um
 #
-/testem/event/printModulo 500000
+/gun/energy 1 MeV
 #
-/run/beamOn 10000000
+/testem/event/printModulo 50000
+#
+/run/beamOn 500000

trunk/examples/extended/medical/fanoCavity2/essai.mac

@@ -1 @@
-# $Id: essai.mac,v 1.3 2007/11/12 18:19:30 maire Exp $
+# $Id: essai.mac,v 1.5 2009/10/31 18:05:56 maire Exp $
 #
 /control/verbose 2
 /run/verbose 2
 #
-/testem/det/wallMater Water
-/testem/det/wallThickness 5 mm
-/testem/det/worldRadius   5 mm
+/testem/phys/addPhysics standard_opt3
 #
 /run/initialize
 #
-/process/inactivate msc
-/process/eLoss/fluct false
+/gun/energy 1 MeV
 #
-/gun/energy 10 keV
-/gun/direction 0 1 0
+/testem/event/printModulo 100000
 #
-/testem/event/printModulo 20000
-#
-#/run/beamOn 200000
+/run/beamOn 1000000

trunk/examples/extended/medical/fanoCavity2/fanoCavity2.cc

@@ -25 +25 @@
 //
 // $Id: fanoCavity2.cc,v 1.2 2007/10/31 16:16:20 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/DetectorConstruction.hh

@@ -25 +25 @@
 //
 // $Id: DetectorConstruction.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/DetectorMessenger.hh

@@ -25 +25 @@
 //
 // $Id: DetectorMessenger.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/EventAction.hh

@@ -25 +25 @@
 //
 // $Id: EventAction.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/EventActionMessenger.hh

@@ -25 +25 @@
 //
 // $Id: EventActionMessenger.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/HistoManager.hh

@@ -25 +25 @@
 //
 // $Id: HistoManager.hh,v 1.3 2007/11/12 18:19:30 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/HistoMessenger.hh

@@ -25 +25 @@
 //
 // $Id: HistoMessenger.hh,v 1.2 2007/11/12 18:19:30 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/MyMollerBhabhaModel.hh

@@ -25 +25 @@
 //
 // $Id: MyMollerBhabhaModel.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

trunk/examples/extended/medical/fanoCavity2/include/PhysicsList.hh

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: PhysicsList.hh,v 1.2 2009/10/31 18:05:56 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
-// $Id: PhysicsList.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
-//
-// 
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -36 +33 @@
 #define PhysicsList_h 1
 
-#include "G4VUserPhysicsList.hh"
+#include "G4VModularPhysicsList.hh"
 #include "globals.hh"
+
+class G4VPhysicsConstructor;
 
 class DetectorConstruction;
@@ -44 +43 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class PhysicsList: public G4VUserPhysicsList
+class PhysicsList: public G4VModularPhysicsList
 {
-  public:
-    PhysicsList(DetectorConstruction*);
-   ~PhysicsList();
+public:
+  PhysicsList(DetectorConstruction*);
+  virtual ~PhysicsList();
 
-    // Construct particle and physics
-    void ConstructParticle();
-    void ConstructProcess();
- 
-    void SetCuts();
+  void ConstructParticle();
+        
+  void AddPhysicsList(const G4String& name);    
+  void ConstructProcess();    
+  void AddStepMax(); 
+  
+  void SetCuts();      
     
-    // these methods Construct physics processes and register them
-    void ConstructEM();
-    void AddStepMax();
-    
-    void SingleCoulombScattering (G4bool);    
-    void RegisterBrem (G4bool);
-    
-  private:
-    DetectorConstruction*  detector;
-    G4bool                 singleScattering;        
-    G4bool                 registerBrem;    
-    PhysicsListMessenger*  pMessenger;    
+private:
+
+  DetectorConstruction* detector;
+  PhysicsListMessenger* pMessenger; 
+
+  G4String emName;
+  G4VPhysicsConstructor*  emPhysicsList;
 };
 
@@ -74 +70 @@
 #endif
 
-
-

trunk/examples/extended/medical/fanoCavity2/include/PhysicsListMessenger.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: PhysicsListMessenger.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// $Id: PhysicsListMessenger.hh,v 1.2 2009/10/31 18:05:56 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -33 +33 @@
 #define PhysicsListMessenger_h 1
 
+#include "G4UImessenger.hh"
 #include "globals.hh"
-#include "G4UImessenger.hh"
 
 class PhysicsList;
 class G4UIdirectory;
-class G4UIcmdWithABool;
+class G4UIcmdWithADoubleAndUnit;
+class G4UIcmdWithAString;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -44 +45 @@
 class PhysicsListMessenger: public G4UImessenger
 {
-  public:  
+  public:
+  
     PhysicsListMessenger(PhysicsList* );
    ~PhysicsListMessenger();
@@ -50 +52 @@
     void SetNewValue(G4UIcommand*, G4String);
     
-  private:  
-    PhysicsList*        pPhysicsList;   
-    G4UIdirectory*      physDir;        
-    G4UIcmdWithABool*   singleScat;      
-    G4UIcmdWithABool*   brem;    
+  private:
+  
+    PhysicsList*               pPhysicsList;
+    
+    G4UIdirectory*             physDir;
+    G4UIcmdWithAString*        pListCmd;
 };
 

trunk/examples/extended/medical/fanoCavity2/include/PrimaryGeneratorAction.hh

@@ -25 +25 @@
 //
 // $Id: PrimaryGeneratorAction.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/ProcessesCount.hh

@@ -26 +26 @@
 //
 // $Id: ProcessesCount.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/RunAction.hh

@@ -25 +25 @@
 //
 // $Id: RunAction.hh,v 1.2 2007/10/31 16:16:20 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/StepMax.hh

@@ -25 +25 @@
 //
 // $Id: StepMax.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/StepMaxMessenger.hh

@@ -25 +25 @@
 //
 // $Id: StepMaxMessenger.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/SteppingAction.hh

@@ -25 +25 @@
 //
 // $Id: SteppingAction.hh,v 1.2 2007/10/31 16:16:20 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/SteppingVerbose.hh

@@ -25 +25 @@
 //
 // $Id: SteppingVerbose.hh,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/include/TrackingAction.hh

@@ -25 +25 @@
 //
 // $Id: TrackingAction.hh,v 1.2 2007/10/31 16:16:20 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/run01.mac

@@ -1 @@
-# $Id: run01.mac,v 1.2 2007/10/31 16:16:20 maire Exp $
+# $Id: run01.mac,v 1.3 2009/10/31 18:05:56 maire Exp $
 #
 /control/verbose 2
 /run/verbose 2
+#
+/testem/phys/addPhysics standard_opt3
 #
 /run/initialize

trunk/examples/extended/medical/fanoCavity2/src/DetectorConstruction.cc

@@ -25 +25 @@
 //
 // $Id: DetectorConstruction.cc,v 1.2 2007/11/05 13:19:16 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 
 //

trunk/examples/extended/medical/fanoCavity2/src/DetectorMessenger.cc

@@ -25 +25 @@
 //
 // $Id: DetectorMessenger.cc,v 1.2 2007/11/05 13:19:16 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/EventAction.cc

@@ -25 +25 @@
 //
 // $Id: EventAction.cc,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/EventActionMessenger.cc

@@ -25 +25 @@
 //
 // $Id: EventActionMessenger.cc,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/HistoManager.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: HistoManager.cc,v 1.3 2007/11/12 18:19:30 maire Exp $
-// GEANT4 tag $Name:  $
+// $Id: HistoManager.cc,v 1.5 2008/09/28 16:15:39 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -54 +54 @@
  
   fileName[0] = "fanocavity2";
-  fileType    = "hbook";
-  fileOption  = "--noErrors uncompress";  
+  fileType    = "root";
+  fileOption  = "--noErrors export=root uncompress";  
   // histograms
   for (G4int k=0; k<MaxHisto; k++) {
@@ -224 +224 @@
  if (ih > MaxHisto) {
     G4cout << "---> warning from HistoManager::RemoveHisto() : histo " << ih
-           << "does not exist" << G4endl;
+           << "does not exist  (fac = " << fac << ")"  << G4endl;
     return;
   }

trunk/examples/extended/medical/fanoCavity2/src/HistoMessenger.cc

@@ -25 +25 @@
 //
 // $Id: HistoMessenger.cc,v 1.2 2007/11/12 18:19:30 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/MyMollerBhabhaModel.cc

@@ -25 +25 @@
 //
 // $Id: MyMollerBhabhaModel.cc,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/PhysicsList.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: PhysicsList.cc,v 1.7 2009/10/31 18:05:01 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
-// $Id: PhysicsList.cc,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
-//
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -34 +32 @@
 #include "PhysicsList.hh"
 #include "PhysicsListMessenger.hh"
-#include "DetectorConstruction.hh"
+
+#include "PhysListEmStandard_option0.hh"
+#include "PhysListEmStandard_option3.hh"
+#include "PhysListEmStandard_GS.hh"
+#include "PhysListEmStandard_SS.hh"
+
+#include "StepMax.hh"
 
 #include "G4ParticleDefinition.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleTable.hh"
 
 #include "G4ProcessManager.hh"
 #include "G4LossTableManager.hh"
 
+// Bosons
+#include "G4ChargedGeantino.hh"
+#include "G4Geantino.hh"
+#include "G4Gamma.hh"
+
+// leptons
+#include "G4Electron.hh"
+#include "G4Positron.hh"
+
+// Hadrons
+#include "G4Proton.hh"
+
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 PhysicsList::PhysicsList(DetectorConstruction* det)
-: G4VUserPhysicsList(), detector(det)
+: G4VModularPhysicsList(), detector(det)
 {
-  defaultCutValue = 10.*km;
-  singleScattering = false;
-  registerBrem = false;
-  pMessenger = new PhysicsListMessenger(this);
-  SetVerboseLevel(1);
+  G4LossTableManager::Instance();
+  pMessenger = new PhysicsListMessenger(this); 
+   
+  // EM physics
+  emName = G4String("standard_opt3");
+  emPhysicsList = new PhysListEmStandard_option3(emName,detector);
+      
+  defaultCutValue = 10*km;
+
+  SetVerboseLevel(1);  
   
-  G4LossTableManager::Instance();  
+  G4LossTableManager::Instance();
 }
 
@@ -60 +80 @@
 
 PhysicsList::~PhysicsList()
-{ delete pMessenger; }
+{
+  delete emPhysicsList;
+  delete pMessenger;  
+}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -66 +89 @@
 void PhysicsList::ConstructParticle()
 {
+  // pseudo-particles
   G4Geantino::GeantinoDefinition();
+  G4ChargedGeantino::ChargedGeantinoDefinition();
+  
+  // gamma
   G4Gamma::GammaDefinition();
-
+  
+  // leptons
   G4Electron::ElectronDefinition();
   G4Positron::PositronDefinition();
 
-  G4Proton::ProtonDefinition();
+  // baryons
+  G4Proton::ProtonDefinition();  
 }
 
@@ -80 +109 @@
 {
   AddTransportation();
-  ConstructEM();
+  emPhysicsList->ConstructProcess();
+
   AddStepMax();
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-#include "G4ComptonScattering.hh"
-#include "G4GammaConversion.hh"
-#include "G4PhotoElectricEffect.hh"
-
-#include "G4MultipleScattering.hh"
-#include "G4CoulombScattering.hh"
-
-#include "G4eIonisation.hh"
-#include "MyMollerBhabhaModel.hh"
-#include "G4eBremsstrahlung.hh"
-#include "G4eplusAnnihilation.hh"
-
-#include "G4hIonisation.hh"
-
-#include "G4EmProcessOptions.hh"
-#include "G4MscStepLimitType.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-
-void PhysicsList::ConstructEM()
-{
-  theParticleIterator->reset();
-  while( (*theParticleIterator)() ){
-    G4ParticleDefinition* particle = theParticleIterator->value();
-    G4ProcessManager* pmanager = particle->GetProcessManager();
-    G4String particleName = particle->GetParticleName();
-    G4int iAlong = 0, iPost = 0; 
-     
-    if (particleName == "gamma") {
-                 
-      pmanager->AddDiscreteProcess(new G4PhotoElectricEffect);
-      pmanager->AddDiscreteProcess(new G4ComptonScattering);         
-      pmanager->AddDiscreteProcess(new G4GammaConversion);
-      
-    } else if (particleName == "e-") {
-
-      if (singleScattering)
-        pmanager->AddProcess(new G4CoulombScattering,  -1, -1,       ++iPost);
-        else    
-        pmanager->AddProcess(new G4MultipleScattering, -1, ++iAlong, ++iPost);
-      
-      G4eIonisation* eIoni = new G4eIonisation();
-      eIoni->SetEmModel(new MyMollerBhabhaModel);             
-      pmanager->AddProcess(eIoni,                      -1, ++iAlong, ++iPost);
-      
-      if (registerBrem)
-        pmanager->AddProcess(new G4eBremsstrahlung,    -1, ++iAlong, ++iPost);      
-       
-    } else if (particleName == "e+") {
-    
-      if (singleScattering)
-        pmanager->AddProcess(new G4CoulombScattering,  -1, -1,       ++iPost);
-        else   
-        pmanager->AddProcess(new G4MultipleScattering, -1, ++iAlong, ++iPost);
-      
-      G4eIonisation* pIoni = new G4eIonisation();
-      pIoni->SetEmModel(new MyMollerBhabhaModel);                   
-      pmanager->AddProcess(pIoni,                      -1, ++iAlong, ++iPost);
-      
-      if (registerBrem) {
-        pmanager->AddProcess(new G4eBremsstrahlung,    -1, ++iAlong, ++iPost);
-        pmanager->AddProcess(new G4eplusAnnihilation,   0, -1,       ++iPost);
-      }
-      
-    } else if (particleName == "proton") {
-    
-      if (singleScattering)
-        pmanager->AddProcess(new G4CoulombScattering,  -1, -1,       ++iPost);
-        else   
-        pmanager->AddProcess(new G4MultipleScattering, -1, ++iAlong, ++iPost);
-        
-      pmanager->AddProcess(new G4hIonisation,          -1, ++iAlong, ++iPost);
-    }
-  }
-  
-  // Em options
-  //
-  G4EmProcessOptions emOptions;
-  
-  //multiple scattering
-  //
-  emOptions.SetMscStepLimitation(fUseDistanceToBoundary);
-  emOptions.SetSkin(2.);
-  
-  //physics tables
-  //
-  emOptions.SetMinEnergy(100*eV);    
-  emOptions.SetMaxEnergy(10*GeV);  
-  emOptions.SetDEDXBinning(800);  
-  emOptions.SetLambdaBinning(800);
-  
-  //energy loss
-  //  
-  emOptions.SetStepFunction(0.2, 10*um);
-  emOptions.SetLinearLossLimit(1.e-6);
-          
-  //build CSDA range
-  //
-  emOptions.SetBuildCSDARange(true);
-  emOptions.SetMaxEnergyForCSDARange(10*GeV);  
-  emOptions.SetDEDXBinningForCSDARange(800);    
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-#include "StepMax.hh"
 
 void PhysicsList::AddStepMax()
@@ -204 +126 @@
       G4ProcessManager* pmanager = particle->GetProcessManager();
 
-      if (stepMaxProcess->IsApplicable(*particle))
+      if (stepMaxProcess->IsApplicable(*particle) && !particle->IsShortLived())
         {
           pmanager ->AddDiscreteProcess(stepMaxProcess);
         }
+  }
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+void PhysicsList::AddPhysicsList(const G4String& name)
+{
+  if (verboseLevel>-1) {
+    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl;
+  }
+
+  if (name == emName) return;
+
+  if (name == "standard_opt0") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new PhysListEmStandard_option0(name,detector);
+    
+  } else if (name == "standard_opt3") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new PhysListEmStandard_option3(name,detector);
+    
+  } else if (name == "standard_GS") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new PhysListEmStandard_GS(name,detector);    
+    
+  } else if (name == "standard_SS") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new PhysListEmStandard_SS(name,detector);    
+  } else {
+
+    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">"
+           << " is not defined"
+           << G4endl;
   }
 }
@@ -227 +190 @@
   SetCutValue(defaultCutValue, "e-");
   SetCutValue(defaultCutValue, "e+");
+  SetCutValue(defaultCutValue, "proton");  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void PhysicsList::SingleCoulombScattering(G4bool flag)
-{
-  singleScattering = flag;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void PhysicsList::RegisterBrem(G4bool flag)
-{
-  registerBrem = flag;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-
-
-

trunk/examples/extended/medical/fanoCavity2/src/PhysicsListMessenger.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: PhysicsListMessenger.cc,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// $Id: PhysicsListMessenger.cc,v 1.2 2009/10/31 18:05:01 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -34 +34 @@
 #include "PhysicsList.hh"
 #include "G4UIdirectory.hh"
-#include "G4UIcmdWithABool.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+#include "G4UIcmdWithAString.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -40 +41 @@
 PhysicsListMessenger::PhysicsListMessenger(PhysicsList* pPhys)
 :pPhysicsList(pPhys)
-{
+{ 
   physDir = new G4UIdirectory("/testem/phys/");
   physDir->SetGuidance("physics list commands");
-  
-  singleScat = new G4UIcmdWithABool("/testem/phys/singleScattering",this);
-  singleScat->SetGuidance("apply single Coulomb scattering process");
-  singleScat->SetParameterName("flag",true);
-  singleScat->SetDefaultValue(true);
-  singleScat->AvailableForStates(G4State_PreInit);
-        
-  brem = new G4UIcmdWithABool("/testem/phys/registerBrem",this);
-  brem->SetGuidance("register Brems in PhysicsList");
-  brem->SetParameterName("flag",true);
-  brem->SetDefaultValue(true);
-  brem->AvailableForStates(G4State_PreInit);    
+
+  pListCmd = new G4UIcmdWithAString("/testem/phys/addPhysics",this);  
+  pListCmd->SetGuidance("Add modula physics list.");
+  pListCmd->SetParameterName("PList",false);
+  pListCmd->AvailableForStates(G4State_PreInit);
 }
 
@@ -61 +55 @@
 PhysicsListMessenger::~PhysicsListMessenger()
 {
-  delete singleScat;
-  delete brem;
-  delete physDir;    
+  delete pListCmd;
+  delete physDir;
 }
 
@@ -70 +63 @@
 void PhysicsListMessenger::SetNewValue(G4UIcommand* command,
                                           G4String newValue)
-{  
-  if (command == singleScat)
-   {pPhysicsList->SingleCoulombScattering(singleScat->GetNewBoolValue(newValue));}
-            
-  if (command == brem)
-   {pPhysicsList->RegisterBrem(brem->GetNewBoolValue(newValue));}      
+{           
+  if( command == pListCmd )
+   { pPhysicsList->AddPhysicsList(newValue);}
 }
 

trunk/examples/extended/medical/fanoCavity2/src/PrimaryGeneratorAction.cc

@@ -25 +25 @@
 //
 // $Id: PrimaryGeneratorAction.cc,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/RunAction.cc

@@ -25 +25 @@
 //
 // $Id: RunAction.cc,v 1.3 2007/11/05 13:19:16 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/StepMax.cc

@@ -25 +25 @@
 //
 // $Id: StepMax.cc,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/StepMaxMessenger.cc

@@ -25 +25 @@
 //
 // $Id: StepMaxMessenger.cc,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/SteppingAction.cc

@@ -25 +25 @@
 //
 // $Id: SteppingAction.cc,v 1.2 2007/10/31 16:16:20 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/SteppingVerbose.cc

@@ -25 +25 @@
 //
 // $Id: SteppingVerbose.cc,v 1.1 2007/10/15 16:20:23 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/src/TrackingAction.cc

@@ -25 +25 @@
 //
 // $Id: TrackingAction.cc,v 1.2 2007/10/31 16:16:20 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/medical/fanoCavity2/stepfunction.mac

@@ -1 @@
-# $Id: stepfunction.mac,v 1.1 2007/10/15 16:29:06 maire Exp $
+# $Id: stepfunction.mac,v 1.2 2009/10/31 18:05:56 maire Exp $
 #
 /control/verbose 2
 /run/verbose 2
+#
+/testem/phys/addPhysics standard_opt3
 #
 /run/initialize